Changeset 4da35bc in sasview

Timestamp:

Aug 8, 2010 5:24:15 PM (15 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)

Files:

• guiframe/data_loader.py (modified) (3 diffs)
• invariantview/perspectives/invariant/invariant.py (modified) (5 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (4 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (1 diff)

guiframe/data_loader.py

@@ -8 +8 @@
 from DataLoader.loader import Loader
 from load_thread import DataReader
+from sans.perspectives.invariant import InvStateUpdateEvent
+from perspectives.fitting import FitStateUpdateEvent
 
 from sans.guicomm.events import NewPlotEvent, StatusEvent
@@ -232 +234 @@
                         new_plot.group_id = existing_panel.group_id
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
-        
+        wx.PostEvent(parent,InvStateUpdateEvent())
+        wx.PostEvent(parent,FitStateUpdateEvent())
     ## the output of the loader is a list , some xml files contain more than one data
     else:
+        
         i=1
         for item in output:
             try:
-                msg = "Loading 1D data: %s"%str(item.run[0])
-                wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
-                try:
-                    dx = item.dx
-                    dxl = item.dxl
-                    dxw = item.dxw
-                except:
-                    dx = None
-                    dxl = None
-                    dxw = None
-    
-                new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy)
+                ## Creating a Data2D with output
+                if hasattr(item,'data'):
+                    msg = "Loading 2D data: %s"%item.filename
+                    wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
+                    new_plot = Data2D(image=None, err_image=None)
+              
+                else:
+                    msg = "Loading 1D data: %s"%str(item.run[0])
+                    wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
+                    try:
+                        dx = item.dx
+                        dxl = item.dxl
+                        dxw = item.dxw
+                    except:
+                        dx = None
+                        dxl = None
+                        dxw = None
+        
+                    new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy)
+                    
+                    new_plot.dxl = dxl
+                    new_plot.dxw = dxw
+                    
+                item.clone_without_data(clone=new_plot)    
                 new_plot.copy_from_datainfo(item)
-                item.clone_without_data(clone=new_plot)
-                new_plot.dxl = dxl
-                new_plot.dxw = dxw
-                
                 name = parse_name(name=str(item.run[0]), expression="_")
                 #if not name in parent.indice_load_data.keys():
@@ -290 +302 @@
                             new_plot.group_id = existing_panel.group_id
                 wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
+                wx.PostEvent(parent,InvStateUpdateEvent())
+                wx.PostEvent(parent,FitStateUpdateEvent())
                 i+=1
             except:
-                raise
+                pass

invariantview/perspectives/invariant/invariant.py

@@ -26 +26 @@
 from DataLoader.loader import Loader
 from invariant_panel import InvariantPanel
+(InvStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
 
 class Plugin:
@@ -47 +48 @@
         #  for your plug-in. This defines your plug-in "perspective"
         self.perspective = []
-        
-        self.state_reader = None   
+        #default state objects
+        self.state_reader = None 
+        self.temp_state = None 
+        self.__data = None 
         """
         # Create a CanSAS/Pr reader
@@ -95 +98 @@
         #add error back to the data
         self.parent.Bind(ERR_DATA, self._on_data_error)
-        
+        self.parent.Bind(EVT_STATE_UPDATE, self.on_set_state_helper)
         
         self.invariant_panel = InvariantPanel(parent=self.parent)
@@ -266 +269 @@
         :param state: State object
         """
+        self.temp_state = None
         try:
             if datainfo is None:
@@ -282 +286 @@
             # Make sure the user sees the invariant panel after loading
             self.parent.set_perspective(self.perspective)
-            self.invariant_panel.set_state(state=temp_state,data=self.__data)         
+            self.temp_state = temp_state
+            #self.invariant_panel.set_state(state=temp_state,data=self.__data)         
 
         except:
             logging.error("invariant.set_state: %s" % sys.exc_value)
-
+            
+    def on_set_state_helper(self,event=None):
+        """
+        """
+        self.invariant_panel.set_state(state=self.temp_state,data=self.__data)
+        self.temp_state = None
         
     def plot_theory(self, data=None, name=None):

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: