Changeset 9c1f463 in sasview for invariantview

Timestamp:

Jul 26, 2010 9:13:23 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:

3641881

Parents:

cb274d9e

Message:

fixed conflict w/new data-manager

File:

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

invariantview/perspectives/invariant/invariant.py

@@ -47 +47 @@
         #  for your plug-in. This defines your plug-in "perspective"
         self.perspective = []
+        
+        # is this data from *.inv file?
+        self.is_state_data = False
         
         self.state_reader = None   
@@ -235 +238 @@
         if data is None:
             return 
-        # Store reference to data
-        self.__data = data
-        # Set the data set to be user for invariant calculation
-        self.invariant_panel.set_current_data(data=data)
+        if self.is_state_data:
+            self.is_state_data = False
+        else:
+            # Store reference to data
+            self.__data = data
+            # Set the data set to be user for invariant calculation
+            self.invariant_panel.set_current_data(data=data)
         
     def save_file(self, filepath, state=None):
@@ -281 +287 @@
             self.parent.set_perspective(self.perspective)
             # set state
-            self.invariant_panel.set_state(state=temp_state,data=self.__data)              
+            self.invariant_panel.set_state(state=temp_state,data=self.__data)
+            self.is_state_data = True            
 
         except: