r14717 - in /1.3/gui/analyses: auto_noe.py auto_rx_base.py -- September 20, 2011 - 16:00

Author: bugman
Date: Tue Sep 20 16:00:45 2011
New Revision: 14717

URL: http://svn.gna.org/viewcvs/relax?rev=14717&view=rev
Log:
A second attempt at fixing the broken NOE and Rx auto-analysis peak list 
wizards on Mac OS X.

This time the combo box selection is first checked, and then GetValue() is 
called.


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=14717&r1=14716&r2=14717&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Tue Sep 20 16:00:45 2011
@@ -442,7 +442,7 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['pts'])
-        if not gui_to_str(page.spectrum_id.GetValue()):
+        if page.spectrum_id.GetSelection() != 1 and not 
gui_to_str(page.spectrum_id.GetValue()):
             page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
@@ -457,7 +457,7 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['repl'])
-        if not gui_to_str(page.spectrum_id_boxes[0].GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and not 
gui_to_str(page.spectrum_id_boxes[0].GetValue()):
             page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
 
 
@@ -472,7 +472,7 @@
 
         # Set the ID in the spectrum.baseplane_rmsd page.
         page = self.wizard.get_page(self.page_indices['rmsd'])
-        if not gui_to_str(page.spectrum_id.GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and not 
gui_to_str(page.spectrum_id.GetValue()):
             page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
@@ -487,7 +487,7 @@
 
         # Set the ID in the noe.spectrum_type page.
         page = self.wizard.get_page(self.page_indices['spectrum_type'])
-        if not gui_to_str(page.spectrum_id.GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and 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=14717&r1=14716&r2=14717&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Tue Sep 20 16:00:45 2011
@@ -470,7 +470,7 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['pts'])
-        if not gui_to_str(page.spectrum_id.GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and not 
gui_to_str(page.spectrum_id.GetValue()):
             page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
@@ -485,7 +485,7 @@
 
         # Set the ID in the spectrum.replicated page.
         page = self.wizard.get_page(self.page_indices['repl'])
-        if not gui_to_str(page.spectrum_id_boxes[0].GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and not 
gui_to_str(page.spectrum_id_boxes[0].GetValue()):
             page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
 
 
@@ -500,7 +500,7 @@
 
         # Set the ID in the spectrum.baseplane_rmsd page.
         page = self.wizard.get_page(self.page_indices['rmsd'])
-        if not gui_to_str(page.spectrum_id.GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and not 
gui_to_str(page.spectrum_id.GetValue()):
             page.spectrum_id.SetStringSelection(str_to_gui(id))
 
 
@@ -515,7 +515,7 @@
 
         # Set the ID in the relax_fit.relax_time page.
         page = self.wizard.get_page(self.page_indices['relax_time'])
-        if not gui_to_str(page.spectrum_id.GetValue()):
+        if page.spectrum_id.GetSelection() != -1 and not 
gui_to_str(page.spectrum_id.GetValue()):
             page.spectrum_id.SetStringSelection(str_to_gui(id))