Changeset f83b94a in sasview

Timestamp:

May 24, 2010 5:33:44 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:

7f69d4d

Parents:

5536035

Message:

working on save state

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -2143 +2143 @@
         sizer_save.Add(self.btSave_title)  
         sizer_save.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,80)  
-             
         sizer_save.Add(self.btSave)     
-        
         boxsizer1.Add(sizer_save)
         self.sizer6.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)

sansview/perspectives/fitting/fitting.py

@@ -19 +19 @@
 from copy import deepcopy
 
+import models
+import fitpage
+
 from DataLoader import Loader
 
@@ -36 +39 @@
 from fitpanel import FitPanel
 from fit_thread import FitThread
-import models
-import fitpage
+from pagestate import Reader
 
 DEFAULT_BEAM = 0.005
@@ -76 +78 @@
         self.perspective = []
         #list of panel to send to guiframe
-        self.mypanels=[]
+        self.mypanels = []
         # reference to the current running thread
-        self.calc_2D= None
-        self.calc_1D= None
-        self.calc_fit= None
+        self.calc_2D = None
+        self.calc_1D = None
+        self.calc_fit = None
         
         # Start with a good default
@@ -89 +91 @@
         self.fitproblem_count = None
         #Flag to let the plug-in know that it is running stand alone
-        self.standalone=True
+        self.standalone = True
         ## dictionary of page closed and id 
-        self.closed_page_dict ={}
+        self.closed_page_dict = {}
         ## Fit engine
         self._fit_engine = 'scipy'
         #List of selected data
-        self.selected_data_list=[]
+        self.selected_data_list = []
         ## list of slicer panel created to display slicer parameters and results
-        self.slicer_panels=[]
-        # Log startup
-        logging.info("Fitting plug-in started")   
+        self.slicer_panels = []
         # model 2D view
-        self.model2D_id=None
+        self.model2D_id = None
         #keep reference of the simultaneous fit page
-        self.sim_page=None
+        self.sim_page = None
         #dictionary containing data name and error on dy of that data 
         self.err_dy = {}
-        self.theory_data = None      
-   
+        self.theory_data = None  
+        #Create a reader for fit page's state
+        self.state_reader = Reader(self.set_state)   
+        #append that reader to list of available reader 
+        loader = Loader()
+        loader.associate_file_reader(".fitv", self.state_reader)
+        # Log startup
+        logging.info("Fitting plug-in started") 
         
     def populate_menu(self, id, owner):
@@ -275 +281 @@
             Post initialization call back to close the loose ends
         """
-        # Do not show the fitting perspective immediately and 
-        # let the application show the Welcome Page.
-        #self.parent.set_perspective(self.perspective)
         pass
-
+    
+    def set_state(self, state, datainfo=None):
+        """
+            Call-back method for the fit page state reader.
+            This method is called when a .fitv file is loaded.
+            @param state: PageState object
+        """
+        try: 
+            # Load fitting state
+            page = self.fit_panel.set_state(state)   
+            # Make sure the user sees the fitting panel after loading
+            self.parent.set_perspective(self.perspective)   
+                   
+        except:
+            raise
+        
+    def save_fit_state(self, filepath, fitstate):  
+        """
+            save fit page state into file
+        """
+        self.state_reader.write(filename=filepath, fitstate=fitstate)
+        
     def copy_data(self, item, dy=None):
         """