Changeset 4da35bc in sasview for invariantview

Timestamp:

Aug 8, 2010 7: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)

File:

• invariantview/perspectives/invariant/invariant.py (modified) (5 diffs)

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):