r14689 - in /1.3/gui/analyses: auto_noe.py auto_rx_base.py -- September 19, 2011 - 11:43

Author: bugman
Date: Mon Sep 19 11:43:05 2011
New Revision: 14689

URL: http://svn.gna.org/viewcvs/relax?rev=14689&view=rev
Log:
Fixes and improvements for the peak list wizards in the NOE and Rx 
auto-analyses.

The integration points page is now correctly set up.  And the spectrum ID is 
now only set if the
field is blank, preventing a reversion of the user selected value.


Modified:
    1.3/gui/analyses/auto_noe.py
    1.3/gui/analyses/auto_rx_base.py

Modified: 1.3/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_noe.py?rev=14689&r1=14688&r2=14689&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Mon Sep 19 11:43:05 2011
@@ -442,7 +442,8 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['pts'])
-        page.spectrum_id1.SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id.GetValue()):
+            page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
     def wizard_update_repl(self):
@@ -456,7 +457,8 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['repl'])
-        page.spectrum_id1.SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id_boxes[0].GetValue()):
+            page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
 
 
     def wizard_update_rmsd(self):
@@ -470,7 +472,8 @@
 
         # Set the ID in the spectrum.baseplane_rmsd page.
         page = self.wizard.get_page(self.page_indices['rmsd'])
-        page.spectrum_id.SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id.GetValue()):
+            page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
     def wizard_update_spectrum_type(self):
@@ -484,7 +487,8 @@
 
         # Set the ID in the noe.spectrum_type page.
         page = self.wizard.get_page(self.page_indices['spectrum_type'])
-        page.spectrum_id.SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id.GetValue()):
+            page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
 

Modified: 1.3/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_rx_base.py?rev=14689&r1=14688&r2=14689&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Mon Sep 19 11:43:05 2011
@@ -470,7 +470,8 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['pts'])
-        page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id.GetValue()):
+            page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
     def wizard_update_repl(self):
@@ -484,7 +485,8 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['repl'])
-        page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id_boxes[0].GetValue()):
+            page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
 
 
     def wizard_update_rmsd(self):
@@ -498,7 +500,8 @@
 
         # Set the ID in the spectrum.baseplane_rmsd page.
         page = self.wizard.get_page(self.page_indices['rmsd'])
-        page.spectrum_id.SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id.GetValue()):
+            page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
     def wizard_update_relax_time(self):
@@ -512,7 +515,8 @@
 
         # Set the ID in the relax_fit.relax_time page.
         page = self.wizard.get_page(self.page_indices['relax_time'])
-        page.spectrum_id.SetStringSelection(str_to_gui(id))
+        if not gui_to_str(page.spectrum_id.GetValue()):
+            page.spectrum_id.SetStringSelection(str_to_gui(id))