Changeset 9bc499b6 in sasview for sansview/perspectives/fitting

Timestamp:

May 24, 2010 3:10:15 PM (15 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:

9c38ed4

Parents:

6c2d1a1

Message:

working on save state

File:

• sansview/perspectives/fitting/basepage.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -130 +130 @@
         self.popUpMenu.AppendItem(self._keep)
         self._keep.Enable(True)
-        wx.EVT_MENU(self, id, self.onSave)
+        wx.EVT_MENU(self, id, self.on_bookmark)
         self.popUpMenu.AppendSeparator()
     
@@ -548 +548 @@
             ## reset state of checkbox,textcrtl  and  regular parameters value
             self.reset_page(previous_state)      
-                  
-    def onSave(self, event):
+         
+    def on_save_state(self, event):   
+        """
+            Save the current state into file
+        """      
+    def on_bookmark(self, event):
         """
             save history of the data and model
@@ -732 +736 @@
             self.state.disp_list= copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-        #if hasattr(self,self.engine_type)> 0:
-            #self.state.engine_type = self.engine_type.clone() 
+        if hasattr(self, "engine_type"):
+            self.state.engine_type = copy.deepcopy(self.engine_type)
+            
         self.state.enable2D = copy.deepcopy(self.enable2D)
         self.state.values= copy.deepcopy(self.values)
@@ -825 +830 @@
         if self.data !=None:
             from DataLoader.qsmearing import smear_selection
-            self.smearer= smear_selection( self.data )
+            self.smearer= smear_selection(self.data)
         self.enable2D= state.enable2D
         self.engine_type = state.engine_type
@@ -2137 +2142 @@
         self.btSave_title = wx.StaticText(self, -1, 'Save the current Model')
         self.btSave = wx.Button(self,wx.NewId(),'Save')
-        self.btSave.Bind(wx.EVT_BUTTON, self.onSave,id= self.btSave.GetId())
+        self.btSave.Bind(wx.EVT_BUTTON, self.on_save_state,id= self.btSave.GetId())
         self.btSave.SetToolTipString("Save the current Model")