r13626 - /branches/gui_testing/gui/analyses/auto_noe.py -- July 14, 2011 - 17:04

Author: bugman
Date: Thu Jul 14 17:04:07 2011
New Revision: 13626

URL: http://svn.gna.org/viewcvs/relax?rev=13626&view=rev
Log:
The spectrum.integration_points uf page only appears in the NOE peak 
intensity wizard if needed.

If heights are used, this page is skipped.


Modified:
    branches/gui_testing/gui/analyses/auto_noe.py

Modified: branches/gui_testing/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=13626&r1=13625&r2=13626&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Thu Jul 14 17:04:07 2011
@@ -333,8 +333,8 @@
         self.page_indices = {}
 
         # The spectrum.read_intensities page.
-        page = Read_intensities_page(self.wizard, self.gui)
-        self.page_indices['read'] = self.wizard.add_page(page)
+        self.page_intensity = Read_intensities_page(self.wizard, self.gui)
+        self.page_indices['read'] = self.wizard.add_page(self.page_intensity)
 
         # Error type selection page.
         self.page_error_type = Error_type_page(self.wizard, self.gui)
@@ -433,7 +433,13 @@
         """
 
         # Go to the spectrum.integration_points page.
-        return self.page_indices['pts']
+        int_method = gui_to_str(self.page_intensity.int_method.GetValue())
+        if int_method != 'height':
+            return self.page_indices['pts']
+
+        # Skip to the noe.spectrum_type page.
+        else:
+            return self.page_indices['spectrum_type']
 
 
     def wizard_page_after_rmsd(self):
@@ -444,7 +450,13 @@
         """
 
         # Go to the spectrum.integration_points page.
-        return self.page_indices['pts']
+        int_method = gui_to_str(self.page_intensity.int_method.GetValue())
+        if int_method != 'height':
+            return self.page_indices['pts']
+
+        # Skip to the noe.spectrum_type page.
+        else:
+            return self.page_indices['spectrum_type']