r19923 - in /branches/relax_disp: ./ gui/wizards/peak_intensity.py -- June 06, 2013 - 20:54

Author: bugman
Date: Thu Jun  6 20:54:34 2013
New Revision: 19923

URL: http://svn.gna.org/viewcvs/relax?rev=19923&view=rev
Log:
Merged revisions 19922 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19922 | bugman | 2013-06-06 20:52:35 +0200 (Thu, 06 Jun 2013) | 5 lines
  
  The spectrum.integration_points page in the peak analysis GUI wizard has 
been fixed.
  
  It is only shown when volume integration is selected with no replicated 
spectra.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/wizards/peak_intensity.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 20:54:34 2013
@@ -1,1 +1,1 @@
-/trunk:1-19920
+/trunk:1-19922

Modified: branches/relax_disp/gui/wizards/peak_intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/wizards/peak_intensity.py?rev=19923&r1=19922&r2=19923&view=diff
==============================================================================
--- branches/relax_disp/gui/wizards/peak_intensity.py (original)
+++ branches/relax_disp/gui/wizards/peak_intensity.py Thu Jun  6 20:54:34 2013
@@ -199,7 +199,7 @@
 
         # Go to the spectrum.integration_points page.
         int_method = 
gui_to_str(self.page_intensity.uf_args['int_method'].GetValue())
-        if int_method != 'height':
+        if int_method != 'height' and self.page_error_type.selection == 
'rmsd':
             return self.page_indices['pts']
 
         # Skip to the noe.spectrum_type page.