Changeset cce182ae in sasview for fittingview

Timestamp:

Apr 5, 2012 5:18:50 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0aca693

Parents:

5559171

Message:

trying to fix mac fitpanel problem

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -898 +898 @@
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
         #model combobox
-        self.state.structurebox = self.structurebox.GetValue()#.GetSelection()
-        self.state.formfactorbox = self.formfactorbox.GetValue()#.GetSelection()
+        self.state.structurebox = self.structurebox.GetLabel()#.GetSelection()
+        self.state.formfactorbox = self.formfactorbox.GetLabel()#.GetSelection()
         
         self.state.enable2D = copy.deepcopy(self.enable2D)
@@ -1069 +1069 @@
             formfactor_pos = 0
             for ind_form in range(self.formfactorbox.GetCount()):
-                if self.formfactorbox.GetString(ind_form).count(state.formfactorcombobox)>0:
+                if self.formfactorbox.GetString(ind_form) == \
+                                        state.formfactorcombobox:
                     formfactor_pos = int(ind_form)
                     break
@@ -1081 +1082 @@
             structfactor_pos = 0
             for ind_struct in range(self.structurebox.GetCount()):
-                if self.structurebox.GetString(ind_struct).count(state.structurecombobox)>0:
+                if self.structurebox.GetString(ind_struct) == \
+                                        state.structurecombobox:
                     structfactor_pos = int(ind_struct)
                     break
@@ -1447 +1449 @@
         self.state.struct_rbutton = self.struct_rbutton.GetValue()
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
-        self.state.structurebox= self.structurebox.GetValue()#.GetCurrentSelection()
-        self.state.formfactorbox = self.formfactorbox.GetValue()#.GetCurrentSelection()
+        self.state.structurebox= self.structurebox.GetLabel()#.GetCurrentSelection()
+        self.state.formfactorbox = self.formfactorbox.GetLabel()#.GetCurrentSelection()
        
         #self._undo.Enable(True)