r14074 - /branches/gui_testing/gui/user_functions/spectrum.py -- August 02, 2011 - 17:08

Author: bugman
Date: Tue Aug  2 17:08:26 2011
New Revision: 14074

URL: http://svn.gna.org/viewcvs/relax?rev=14074&view=rev
Log:
Reverted r14054 as this fix actually broke things.

The command used was:
svn merge -r14054:14053 .

.....
r14054 | bugman | 2011-08-02 10:57:39 +0200 (Tue, 02 Aug 2011) | 5 lines
Changed paths:
   M /branches/gui_testing/gui/user_functions/spectrum.py

Fix for the spectrum.replicated user function page on Mac OS X.

GetValue() cannot be used on a ComboBox when nothing is selected on a Mac!
.....


Modified:
    branches/gui_testing/gui/user_functions/spectrum.py

Modified: branches/gui_testing/gui/user_functions/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/spectrum.py?rev=14074&r1=14073&r2=14074&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/spectrum.py (original)
+++ branches/gui_testing/gui/user_functions/spectrum.py Tue Aug  2 17:08:26 
2011
@@ -355,16 +355,11 @@
 
         # Get the values.
         val = []
-        if self.spectrum_id1.GetSelection() != wx.NOT_FOUND:
-            val.append(gui_to_str(self.spectrum_id1.GetValue()))
-        if self.spectrum_id2.GetSelection() != wx.NOT_FOUND:
-            val.append(gui_to_str(self.spectrum_id2.GetValue()))
-        if self.spectrum_id3.GetSelection() != wx.NOT_FOUND:
-            val.append(gui_to_str(self.spectrum_id3.GetValue()))
-        if self.spectrum_id4.GetSelection() != wx.NOT_FOUND:
-            val.append(gui_to_str(self.spectrum_id4.GetValue()))
-        if self.spectrum_id5.GetSelection() != wx.NOT_FOUND:
-            val.append(gui_to_str(self.spectrum_id5.GetValue()))
+        val.append(gui_to_str(self.spectrum_id1.GetValue()))
+        val.append(gui_to_str(self.spectrum_id2.GetValue()))
+        val.append(gui_to_str(self.spectrum_id3.GetValue()))
+        val.append(gui_to_str(self.spectrum_id4.GetValue()))
+        val.append(gui_to_str(self.spectrum_id5.GetValue()))
 
         # The ID list.
         spectrum_ids = []