Changeset c8deee5 in sasview

Timestamp:

Feb 2, 2011 3:53:14 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:

35f2f49

Parents:

6d3d5ff

Message:

working on save state fitting

Location:

sansview

Files:

• perspectives/fitting/basepage.py (modified) (1 diff)
• perspectives/fitting/fitpanel.py (modified) (14 diffs)
• perspectives/fitting/fitting.py (modified) (4 diffs)
• welcome_panel.py (modified) (3 diffs)

sansview/perspectives/fitting/basepage.py

@@ -356 +356 @@
         self.state.event_owner = owner
         
+    def get_state(self):
+        """
+        """
+        return self.state
     def get_data(self):
         """

sansview/perspectives/fitting/fitpanel.py

@@ -137 +137 @@
         self.data = data
         self.model= model
-        self.manager= manager
+        self._manager= manager
         self.event_owner= event_owner
         self.model_list_box = model_list_box
@@ -169 +169 @@
         PanelBase.__init__(self)
     
-        self.manager = None
+        self._manager = None
         self.parent = parent
         self.event_owner = None
@@ -198 +198 @@
         self.Center()
         
+    def get_data(self):
+        """
+        get the data in the current page
+        """
+        pos = self.GetSelection()
+        selected_page = self.GetPage(pos)
+        return selected_page.get_data()
+    
+    def get_state(self):
+        """
+         return the state of the current selected page
+        """
+        pos = self.GetSelection()
+        selected_page = self.GetPage(pos)
+        return selected_page.get_state()
+    
     def add_default_pages(self):
         """
@@ -247 +263 @@
                 # add data associated to the page created
                 if panel is not None:  
-                    self.manager.store_page(page=panel, data=state.data)
+                    self._manager.store_page(page=panel, data=state.data)
                     panel.reset_page(state=state)
                     panel.save_current_state()
@@ -258 +274 @@
             #close all panels only when svs file opened
             self.close_all()
-            self.manager.mypanels = []
+            self._manager.mypanels = []
                        
     def on_close_page(self, event=None):
@@ -299 +315 @@
         
         """
-        self.manager = manager
+        self._manager = manager
 
         
@@ -332 +348 @@
         """
         from simfitpage import SimultaneousFitPage
-        page_finder= self.manager.get_page_finder()
+        page_finder= self._manager.get_page_finder()
         self.sim_page = SimultaneousFitPage(self,page_finder=page_finder, id=-1)
         
         self.AddPage(self.sim_page,caption="Simultaneous Fit",select=True)
-        self.sim_page.set_manager(self.manager)
+        self.sim_page.set_manager(self._manager)
         return self.sim_page
         
@@ -358 +374 @@
         page_info = PageInfo(data=data, name=name)
         page_info.event_owner = self.event_owner 
-        page_info.manager = self.manager
+        page_info.manager = self._manager
         page_info.window_name = name
         page_info.window_caption = name
@@ -371 +387 @@
         from fitpage import FitPage
         panel = FitPage(parent=self, page_info=page_info)
+        panel.set_manager(self._manager)
         self.AddPage(page=panel, caption=page_info.window_name, select=True)
         self.opened_pages[page_info.type] = [page_info.window_name, panel]
@@ -381 +398 @@
         from fitpage import FitPage
         panel = FitPage(parent=self, page_info=page_info)
+        panel.set_manager(self._manager)
         self.AddPage(page=panel, caption=page_info.window_name, select=True)
         index = self.GetPageIndex(panel)
@@ -440 +458 @@
                 #delete the previous theory page and add a new one
                 name, panel = self.opened_pages[type]
-                #self.manager.reset_plot_panel(panel.get_data())
+                #self._manager.reset_plot_panel(panel.get_data())
                 #delete the existing page and replace it
                 index = self.GetPageIndex(panel)
@@ -503 +521 @@
         ## removing sim_page
         if selected_page == self.sim_page :
-            self.manager.sim_page=None 
+            self._manager.sim_page=None 
             return
         
@@ -509 +527 @@
         state = selected_page.createMemento()
         page_name = selected_page.window_name
-        page_finder = self.manager.get_page_finder() 
+        page_finder = self._manager.get_page_finder() 
         fitproblem = None
         ## removing fit page
@@ -524 +542 @@
                 if flag and selected_page.window_name == name:
                     if type.lower() in ['theory1d', 'theory2d']:
-                        self.manager.remove_plot(selected_page, theory=True)
+                        self._manager.remove_plot(selected_page, theory=True)
                     else:
-                        self.manager.remove_plot(selected_page, theory=False)
+                        self._manager.remove_plot(selected_page, theory=False)
                     break 
             del page_finder[selected_page]

sansview/perspectives/fitting/fitting.py

@@ -112 +112 @@
         #Create a reader for fit page's state
         self.state_reader = None 
+        self._extensions = '.fitv'
         self.temp_state = []
         self.state_index = 0
@@ -246 +247 @@
         #Create reader when fitting panel are created
         self.state_reader = Reader(self.set_state)   
+       
         #append that reader to list of available reader 
         loader = Loader()
@@ -281 +283 @@
             wx.PostEvent(self.parent, NewPlotEvent(plot=data, 
                                                    title=str(data.title)))
+   
             
     def set_state(self, state=None, datainfo=None, format=None):
@@ -300 +303 @@
         self.sfile_ext = format
 
-    def  on_set_state_helper(self,event=None):
+    def on_set_state_helper(self,event=None):
         """
         Set_state_helper. This actually sets state after plotting data from state file.

sansview/welcome_panel.py

@@ -19 +19 @@
 import local_config as config
 
+from sans.guiframe.panel_base import PanelBase
 #Font size width 
 if sys.platform.count("win32")>0:
@@ -25 +26 @@
     FONT_VARIANT = 1 
  
-class WelcomePanel(wx.aui.AuiNotebook):
+class WelcomePanel(wx.aui.AuiNotebook, PanelBase):
     """
         Panel created like about box  as a welcome page
@@ -43 +44 @@
         
         wx.aui.AuiNotebook.__init__(self, parent, *args, **kwds)
+        PanelBase.__init__(self)
         #For sansview the parent is guiframe
         self.parent = parent