r19779 - in /branches/relax_disp: gui/wizards/peak_intensity.py test_suite/gui_tests/relax_disp.py -- May 29, 2013 - 20:11

Author: bugman
Date: Wed May 29 20:11:35 2013
New Revision: 19779

URL: http://svn.gna.org/viewcvs/relax?rev=19779&view=rev
Log:
Fixes for the peak intensity loading wizard for the frq.set to 
spectrometer.frequency user function change.


Modified:
    branches/relax_disp/gui/wizards/peak_intensity.py
    branches/relax_disp/test_suite/gui_tests/relax_disp.py

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=19779&r1=19778&r2=19779&view=diff
==============================================================================
--- branches/relax_disp/gui/wizards/peak_intensity.py (original)
+++ branches/relax_disp/gui/wizards/peak_intensity.py Wed May 29 20:11:35 2013
@@ -142,10 +142,10 @@
 
         # Relaxation dispersion pages.
         if self.relax_disp_flag:
-            # The frq.set page.
-            page = uf_store['frq.set'].create_page(self, sync=True)
-            self.page_indices['frq_set'] = self.add_page(page, 
skip_button=True, proceed_on_error=False)
-            page.on_init = self.wizard_update_frq_set
+            # The spectrometer.frequency page.
+            page = uf_store['spectrometer.frequency'].create_page(self, 
sync=True)
+            self.page_indices['spectrometer_frequency'] = 
self.add_page(page, skip_button=True, proceed_on_error=False)
+            page.on_init = self.wizard_update_spectrometer_frequency
 
             # The relax_disp.relax_time page.
             if self.relax_disp_times:
@@ -213,7 +213,7 @@
 
         # Skip to the first dispersion page.
         elif self.relax_disp_flag:
-            return self.page_indices['frq_set']
+            return self.page_indices['spectrometer_frequency']
 
         # Nothing left, so run off the end.
         else:
@@ -242,18 +242,11 @@
 
         # Skip to the first dispersion page.
         elif self.relax_disp_flag:
-            return self.page_indices['frq_set']
+            return self.page_indices['spectrometer_frequency']
 
         # Nothing left, so run off the end.
         else:
             return self._num_pages + 1
-
-
-    def wizard_update_frq_set(self):
-        """Update the frq.set page based on previous data."""
-
-        # Update the spectrum ID.
-        self.wizard_update_ids(page_key='frq_set', arg_key='id')
 
 
     def wizard_update_ids(self, page_key=None, arg_key='spectrum_id', 
index=None):
@@ -335,6 +328,13 @@
 
         # Update the spectrum ID.
         self.wizard_update_ids(page_key='rmsd')
+
+
+    def wizard_update_spectrometer_frequency(self):
+        """Update the spectrometer.frequency page based on previous data."""
+
+        # Update the spectrum ID.
+        self.wizard_update_ids(page_key='spectrometer_frequency', 
arg_key='id')
 
 
 

Modified: branches/relax_disp/test_suite/gui_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/relax_disp.py?rev=19779&r1=19778&r2=19779&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/gui_tests/relax_disp.py Wed May 29 
20:11:35 2013
@@ -175,7 +175,7 @@
         wizard._skip(None)
 
         # Set the spectrometer frequencies.
-        page = wizard.get_page(wizard.page_indices['frq_set'])
+        page = wizard.get_page(wizard.page_indices['spectrometer_frequency'])
         for id, file, cpmg_frq, H_frq in data:
             page.uf_args['id'].SetValue(str_to_gui(id))
             page.uf_args['frq'].SetValue(float_to_gui(H_frq))