Changeset 4da35bc in sasview for sansview/perspectives/fitting

Timestamp:

Aug 8, 2010 5:24:15 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

ef16f59

Parents:

028a0e8

Message:

improved theoryplot display from (inv file)

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (4 diffs)
• pagestate.py (modified) (1 diff)

sansview/perspectives/fitting/fitting.py

@@ -51 +51 @@
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
-
+(FitStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
 from fitpage import Chi2UpdateEvent
 
@@ -117 +117 @@
         #Create a reader for fit page's state
         self.state_reader = None 
+        self.temp_state = []
         # Log startup
         logging.info("Fitting plug-in started") 
@@ -235 +236 @@
         """
         self.parent = parent
+        self.parent.Bind(EVT_STATE_UPDATE, self.on_set_state_helper)
         # Creation of the fit panel
         self.fit_panel = FitPanel(self.parent, -1)
@@ -302 +304 @@
         #return
         #working on reading state
+        self.temp_state = []
         try: 
+            # state
             # Load fitting state
-            page = self.fit_panel.set_state(state)   
+            self.temp_state.append(state) 
             # Make sure the user sees the fitting panel after loading
-            self.parent.set_perspective(self.perspective)   
+            #self.parent.set_perspective(self.perspective)   
                    
         except:
             raise
         
+    def  on_set_state_helper(self,event=None):
+        """
+        """
+        if self.temp_state == None:
+            return
+        # Load fitting state
+        for index in range(len(self.temp_state)):
+            page = self.fit_panel.set_state(self.temp_state[index]) 
+            # Make sure the user sees the fitting panel after loading
+            self.parent.set_perspective(self.perspective)  
+             
+        self.temp_state = []   
+                 
     def save_fit_state(self, filepath, fitstate):  
         """

sansview/perspectives/fitting/pagestate.py

@@ -1158 +1158 @@
                     #    exec 'output[%d].run = [output[%d].filename]'% (ind,ind)
                     self.call_back(state=state, datainfo=output[ind])
-                    return output[ind]
+                return output[ind]
               
         except: