Changeset 31b0c47 in sasview

Timestamp:

May 24, 2010 5:50:10 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:

bb70474

Parents:

232c3db

Message:

working on save fit page state

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -170 +170 @@
         self.Update()
         self.Center()
-  
+        
+    def set_state(self, state):
+        """
+            Restore state of the panel
+        """
+        page_is_opened = False
+        if state is not None:
+            page_info = self.get_page_info(data=state.data)
+            for name, panel in self.opened_pages.values():
+                #Don't return any panel is the exact same page is created
+                if name == page_info.window_name:
+                    # the page is still opened
+                    panel.reset_page(state=state)
+                    page_is_opened = True
+            if not page_is_opened:
+                panel = self.add_fit_page(data=state.data)
+                # add data associated to the page created
+                if panel is not None:  
+                    self.manager.store_page(page=panel, data=state.data)
+                    panel.reset_page(state=state)
+                    
     def on_close_page(self, event):
         """

sansview/perspectives/fitting/fitting.py

@@ -617 +617 @@
         return new_data
            
+    def store_page(self, page, data):
+        """
+            Helper to save page reference into the plug-in
+            @param page: page to store
+        """
+        page.set_data(data) 
+        #create a fitproblem storing all link to data,model,page creation
+        if not page in self.page_finder.keys():
+            self.page_finder[page] = FitProblem()
+        self.page_finder[page].add_fit_data(data)
+        
     def add_fit_page(self, data):
         """
@@ -626 +637 @@
             # add data associated to the page created
             if page != None:  
-                page.set_data(data) 
-                #create a fitproblem storing all link to data,model,page creation
-                if not page in self.page_finder.keys():
-                    self.page_finder[page]= FitProblem()
-                ## item is almost the same as data but contains
-                ## axis info for plotting 
-                #self.page_finder[page].add_plotted_data(item)
-                self.page_finder[page].add_fit_data(data)
-
+                self.store_page(page=page, data=data)
                 wx.PostEvent(self.parent, StatusEvent(status="Page Created",
-                                                                info="info"))
+                                               info="info"))
             else:
                 msg = "Page was already Created"
@@ -643 +646 @@
             msg = "Creating Fit page: %s"%sys.exc_value
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
-            return
-
-        
+       
     def _onEVT_SLICER_PANEL(self, event):
         """