Changeset d40038e in sasview

Timestamp:

Apr 2, 2012 4:00:29 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:

66798ce

Parents:

07dfdb8

Message:

fix: ticket #10

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (4 diffs)
• fitpage.py (modified) (2 diffs)
• pagestate.py (modified) (1 diff)

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

@@ -895 +895 @@
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
         #model combobox
-        self.state.structurebox = self.structurebox.GetSelection()
-        self.state.formfactorbox = self.formfactorbox.GetSelection()
+        self.state.structurebox = self.structurebox.GetValue()#.GetSelection()
+        self.state.formfactorbox = self.formfactorbox.GetValue()#.GetSelection()
         
         self.state.enable2D = copy.deepcopy(self.enable2D)
@@ -1060 +1060 @@
         self._show_combox_helper()
         #select the current model
-        self.formfactorbox.Select(int(state.formfactorcombobox))
-        self.structurebox.SetSelection(state.structurecombobox )
+        try:
+            # to support older version
+            formfactor_pos = int(state.formfactorcombobox)
+        except:
+            formfactor_pos = 0
+            for ind_form in range(self.formfactorbox.GetCount()):
+                if self.formfactorbox.GetString(ind_form).count(state.formfactorcombobox)>0:
+                    formfactor_pos = int(ind_form)
+                    break
+            
+        self.formfactorbox.Select(formfactor_pos)
+        
+        try:
+            # to support older version
+            structfactor_pos = int(state.structurecombobox)
+        except:
+            structfactor_pos = 0
+            for ind_struct in range(self.structurebox.GetCount()):
+                if self.structurebox.GetString(ind_struct).count(state.structurecombobox)>0:
+                    structfactor_pos = int(ind_struct)
+                    break
+                
+        self.structurebox.SetSelection(structfactor_pos)
+        
         if state.multi_factor != None:
             self.multifactorbox.SetSelection(state.multi_factor)
@@ -1206 +1228 @@
         self._show_combox_helper()
         #select the current model
-        self.formfactorbox.Select(int(state.formfactorcombobox))
-        self.structurebox.SetSelection(state.structurecombobox )
+        try:
+            # to support older version
+            formfactor_pos = int(state.formfactorcombobox)
+        except:
+            formfactor_pos = 0
+            for ind_form in range(self.formfactorbox.GetCount()):
+                if self.formfactorbox.GetString(ind_form).count(state.formfactorcombobox)>0:
+                    formfactor_pos = int(ind_form)
+                    break
+            
+        self.formfactorbox.Select(formfactor_pos)
+        
+        try:
+            # to support older version
+            structfactor_pos = int(state.structurecombobox)
+        except:
+            structfactor_pos = 0
+            for ind_struct in range(self.structurebox.GetCount()):
+                if self.structurebox.GetString(ind_struct).count(state.structurecombobox)>0:
+                    structfactor_pos = int(ind_struct)
+                    break
+            
+        self.structurebox.SetSelection(structfactor_pos)
+
         if state.multi_factor != None:
             self.multifactorbox.SetSelection(state.multi_factor)
@@ -1398 +1442 @@
         self.state.struct_rbutton = self.struct_rbutton.GetValue()
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
-        self.state.structurebox= self.structurebox.GetCurrentSelection()
-        self.state.formfactorbox = self.formfactorbox.GetCurrentSelection()
+        self.state.structurebox= self.structurebox.GetValue()#.GetCurrentSelection()
+        self.state.formfactorbox = self.formfactorbox.GetValue()#.GetCurrentSelection()
        
         #self._undo.Enable(True)

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

@@ -1251 +1251 @@
         self.state.slit_smearer = self.slit_smearer.GetValue()
     
-        self.state.structurecombobox = self.structurebox.GetCurrentSelection()
-        self.state.formfactorcombobox = self.formfactorbox.GetCurrentSelection()
+        self.state.structurecombobox = self.structurebox.GetValue()#.GetCurrentSelection()
+        self.state.formfactorcombobox = self.formfactorbox.GetValue()#.GetCurrentSelection()
         self.enable_fit_button()
         if self.model != None:
@@ -1263 +1263 @@
                     self._set_bookmark_flag(True)
                     self._keep.Enable(True)
-            #self._set_save_flag(True)
+                    self._set_save_flag(True)
             # Reset smearer, model and data
             if not copy_flag:

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

@@ -45 +45 @@
                       ["plugin_rbutton", "plugin_rbutton","bool"],
                       ["struct_rbutton", "struct_rbutton", "bool"],
-                      ["formfactorcombobox", "formfactorcombobox", "float"],
-                      ["structurecombobox", "structurecombobox", "float"],
+                      ["formfactorcombobox", "formfactorcombobox", "string"],
+                      ["structurecombobox", "structurecombobox", "string"],
                       ["multi_factor","multi_factor","float"],
                       ["enable_smearer","enable_smearer","bool"],