Changeset e3d1423 in sasview

Timestamp:

Jun 21, 2010 3:32:20 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3ad91de

Parents:

43db4a8

Message:

work on save state

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• pagestate.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -62 +62 @@
         self.npts = None
         ## default fitengine type
-        self.engine_type = None
+        self.engine_type = 'scipy'
         ## smear default
         self.smearer = None
@@ -113 +113 @@
         ## check that the fit range is correct to plot the model again
         self.fitrange= True
-
-        
-        
-        
         ## Create memento to save the current state
         self.state= PageState(parent= self.parent,model=self.model, data=self.data)
@@ -721 +717 @@
         Store current state
         """
-        if hasattr(self, "engine_type"):
-            self.state.engine_type = copy.deepcopy(self.engine_type)
+        self.state.engine_type = copy.deepcopy(self.engine_type)
         ## save model option
         if self.model!= None:
@@ -919 +914 @@
         self.disp_cb_dict = state.disp_cb_dict
         self.disp_list = state.disp_list
-
+      
         ## set the state of the radio box
         self.shape_rbutton.SetValue(state.shape_rbutton )
         self.shape_indep_rbutton.SetValue(state.shape_indep_rbutton)
-        self.struct_rbutton.SetValue(state.struct_rbutton )
+        self.struct_rbutton.SetValue(state.struct_rbutton)
         self.plugin_rbutton.SetValue(state.plugin_rbutton)
         
@@ -929 +924 @@
         self._show_combox_helper()
         #select the current model
+        self.formfactorbox.Select(int(state.formfactorcombobox))
         self.structurebox.SetSelection(state.structurecombobox )
-        self.formfactorbox.SetSelection(state.formfactorcombobox)
+       
         #reset the fitting engine type
         self.engine_type = state.engine_type
         #draw the pnael according to the new model parameter 
         self._on_select_model(event=None)
-  
+       
         if self.manager !=None:
             self.manager._on_change_engine(engine=self.engine_type)
@@ -1795 +1791 @@
             self.structurebox.Enable()
             self.text2.Enable()
-        #if self.data.__class__.__name__ =="Data2D":
-            #self.smear_description_2d.Show(True)
-            
         s_id = self.structurebox.GetCurrentSelection()
         struct_factor = self.structurebox.GetClientData( s_id )
@@ -1811 +1804 @@
                 self.model = None
                 return self.model
-        
         ## post state to fit panel
         self.state.parameters =[]

sansview/perspectives/fitting/pagestate.py

@@ -37 +37 @@
                       ["name", "name", "string"],
                       ["data_name", "data_name", "string"]]
-list_of_state_attributes = [["qmin", "qmin", "float"],
+list_of_state_attributes = [["engine_type", "engine_type", "string"],
+                       ["qmin", "qmin", "float"],
                       ["qmax", "qmax", "float"],
                       ["npts", "npts", "float"],
@@ -105 +106 @@
         elif item[2] == "bool":
             try:
-                exec "value = bool(node.get(item[0]).strip())"
-                return value
+                return node.get(item[0]).strip() == "True"
+                
             except:
                 return None