r14716 - in /1.3/gui/analyses: auto_noe.py auto_rx_base.py -- September 20, 2011 - 15:58

Author: bugman
Date: Tue Sep 20 15:58:45 2011
New Revision: 14716

URL: http://svn.gna.org/viewcvs/relax?rev=14716&view=rev
Log:
Reverted r14715 as this does not fix the Mac OS X problem!

The command used was:
svn merge -r14715:r14714 .

.....
  r14715 | bugman | 2011-09-20 15:47:11 +0200 (Tue, 20 Sep 2011) | 5 lines
  Changed paths:
     M /1.3/gui/analyses/auto_noe.py
     M /1.3/gui/analyses/auto_rx_base.py
  
  Fixes for the peak list wizards for the NOE and Rx auto-analyses for Mac OS 
X.
  
  The read only combo boxes are incompatible with GetValue() on Mac OS X!
.....


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=14716&r1=14715&r2=14716&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Tue Sep 20 15:58: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.GetStringSelection()):
+        if 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].GetStringSelection()):
+        if 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.GetStringSelection()):
+        if 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.GetStringSelection()):
+        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=14716&r1=14715&r2=14716&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Tue Sep 20 15:58: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.GetStringSelection()):
+        if 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].GetStringSelection()):
+        if 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.GetStringSelection()):
+        if 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.GetStringSelection()):
+        if not gui_to_str(page.spectrum_id.GetValue()):
             page.spectrum_id.SetStringSelection(str_to_gui(id))