Changeset 75fbd17 in sasview for sansview/perspectives/fitting

Timestamp:

Feb 9, 2011 2:04:24 AM (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:

c83a5af

Parents:

8240eab

Message:

working on save state

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (10 diffs)
• pagestate.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -131 +131 @@
         #Menu for fitting
         self.menu1 = wx.Menu()
-           #menu for model
-        menu2 = wx.Menu()
-        self.menu_mng.populate_menu(menu2, owner)
-        id2 = wx.NewId()
-        owner.Bind(models.EVT_MODEL,self._on_model_menu)
+        
         #Set park engine
         id3 = wx.NewId()
@@ -156 +152 @@
         wx.EVT_MENU(owner, id1, self.on_add_sim_page)
        
+        #menu for model
+        menu2 = wx.Menu()
+        self.menu_mng.populate_menu(menu2, owner)
+        id2 = wx.NewId()
+        owner.Bind(models.EVT_MODEL,self._on_model_menu)
+      
         self.fit_panel.set_owner(owner)
         self.fit_panel.set_model_list(self.menu_mng.get_model_list())
@@ -231 +233 @@
         """
         self.parent = parent
-        self.parent.Bind(EVT_FITSTATE_UPDATE, self.on_set_state_helper)
+        #self.parent.Bind(EVT_FITSTATE_UPDATE, self.on_set_state_helper)
         # Creation of the fit panel
         self.fit_panel = FitPanel(self.parent, -1)
@@ -251 +253 @@
         #Create reader when fitting panel are created
         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)
         loader.associate_file_reader(".svs", self.state_reader)
+        from sans.perspectives.calculator.sld_panel import SldPanel
         #Send the fitting panel to guiframe
         self.mypanels.append(self.fit_panel) 
-      
+        self.mypanels.append(SldPanel(parent=self.parent, base=self.parent))
         return self.mypanels
     
@@ -286 +288 @@
             wx.PostEvent(self.parent, NewPlotEvent(plot=data, 
                                                    title=str(data.title)))
-   
             
     def set_state(self, state=None, datainfo=None, format=None):
@@ -296 +297 @@
         : param datainfo: data
         """
+        state = self.state_reader.get_state()
         if state != None:
             # store fitting state in temp_state
@@ -305 +307 @@
         # state file format
         self.sfile_ext = format
-
-    def on_set_state_helper(self,event=None):
+        
+        self.on_set_state_helper(event=None)
+
+    def  on_set_state_helper(self,event=None):
         """
         Set_state_helper. This actually sets state after plotting data from state file.
@@ -325 +329 @@
             if state.formfactorcombobox != None:
                 #set state
+                data = self.parent.create_gui_data(state.data)
+                data.group_id = state.data.group_id
+                wx.PostEvent(self.parent, NewPlotEvent(plot=data,
+                                        title=data.title))
                 page = self.fit_panel.set_state(state)   
             else:
+                wx.PostEvent(self.parent, NewPlotEvent(plot=data,
+                                        title=data.title))
                 #just set data because set_state won't work
-                page_info = self.fit_panel.get_page_info(data=state.data)
+                data = self.parent.create_gui_data(state.data)
+                data.group_id = state.data.group_id
+                page_info = self.fit_panel.get_page_info(data=data)
                 panel = self.fit_panel.add_page(page_info)
-                self.store_page(page=panel, data=state.data)
+                self.store_page(page=panel, data=data)
                 self.mypanels.append(panel) 
                 
+               
             # get ready for the next set_state
             self.state_index += 1
@@ -342 +355 @@
                 #self.state_index = 0
                 # Make sure the user sees the fitting panel after loading
-                self.parent.set_perspective(self.perspective) 
+                #self.parent.set_perspective(self.perspective) 
+                self.on_perspective(event=None)
         except:
             self.state_index==0
@@ -1382 +1396 @@
                 return
             x = data.x
-            
-            if qmin == None :
-                qmin == DEFAULT_QMIN
-
-            if qmax == None:
-                qmax == DEFAULT_QMAX 
-                
+            if qmin == DEFAULT_QMIN :
+                qmin = min(data.x)
+            if qmax == DEFAULT_QMAX:
+                qmax = max(data.x) 
         if not enable1D:
             return 

sansview/perspectives/fitting/pagestate.py

@@ -631 +631 @@
         ## CanSAS format flag
         self.cansas = cansas
+        self.state = None
+    def get_state(self):
+        return self.state
         
     def read(self, path):
@@ -1170 +1173 @@
                     state.data.group_id = name
                     #store state in fitting
-                    self.call_back(state=state, datainfo=output[ind],format=ext)
+                    #self.call_back(state=state, datainfo=output[ind],format=ext)
+                    self.state= state
                 return output
               
         except:
-            self.call_back(format=ext)
+            #self.call_back(format=ext)
+            self.state= state
             raise