Changeset 940aca7 in sasview for fittingview/src/sans/perspectives/fitting/basepage.py

Timestamp:

May 19, 2012 10:17:02 AM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

baa915c

Parents:

d225e32

Message:

Merge 2.1.1 into trunk

File:

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

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

@@ -113 +113 @@
         self.enable2D = False
         self.is_mac = ON_MAC
-        
+        self.formfactorbox = None
+        self.structurebox = None
         ##list of model parameters. each item must have same length
         ## each item related to a given parameters
@@ -882 +883 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
+            
+            #model combobox: complex code because of mac's silent error
+            if self.structurebox != None:
+                if self.structurebox.IsShown():
+                    self.state.structurecombobox = 'None'
+                    s_select = self.structurebox.GetSelection()
+                    if s_select > 0:
+                        self.state.structurecombobox = self.structurebox.\
+                        GetString(s_select)
+            if self.formfactorbox != None:
+                f_select = self.formfactorbox.GetSelection()
+                if f_select > 0:
+                        self.state.formfactorcombobox = self.formfactorbox.\
+                        GetString(f_select)
+                        
         #save radiobutton state for model selection
         self.state.shape_rbutton = self.shape_rbutton.GetValue()
@@ -887 +903 @@
         self.state.struct_rbutton = self.struct_rbutton.GetValue()
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
-        #model combobox
-        self.state.structurebox = self.structurebox.GetLabel()
-        self.state.formfactorbox = self.formfactorbox.GetLabel()
         
         self.state.enable2D = copy.deepcopy(self.enable2D)
@@ -1231 +1244 @@
             structfactor_pos = 0
             for ind_struct in range(self.structurebox.GetCount()):
-                if self.structurebox.GetString(ind_struct) == (state.structurecombobox) > 0:
+                if self.structurebox.GetString(ind_struct) == (state.structurecombobox):
                     structfactor_pos = int(ind_struct)
                     break
@@ -1428 +1441 @@
         self.state.struct_rbutton = self.struct_rbutton.GetValue()
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
-        self.state.structurebox = self.structurebox.GetLabel()
-        self.state.formfactorbox = self.formfactorbox.GetLabel()
+        self.state.structurecombobox = self.structurebox.GetLabel()
+        self.state.formfactorcombobox = self.formfactorbox.GetLabel()
        
         ## post state to fit panel