Changeset 04295ea in sasview for invariantview/perspectives/invariant

Timestamp:

Apr 22, 2011 11:29:20 AM (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:

270e240

Parents:

cefb3fb

Message:

This fixes the problems w/ status file open/close

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (2 diffs)
• invariant_panel.py (modified) (3 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -233 +233 @@
                 msg += " be None in standalone mode"
                 raise RuntimeError, msg
-            
+            # Make sure the user sees the invariant panel after loading
+            #self.parent.set_perspective(self.perspective)
+            self.on_perspective(event=None)
             name = data.meta_data['invstate'].file
             data.meta_data['invstate'].file = name
             data.name = name
             data.filename = name
+
             data = self.parent.create_gui_data(data,None)
             self.__data = data
@@ -247 +250 @@
             self.invariant_panel.is_state_data = True
             
-            # Make sure the user sees the invariant panel after loading
-            #self.parent.set_perspective(self.perspective)
-            self.on_perspective(event=None)
             # Load the invariant states
-            temp_state0 = self.invariant_panel.state.state_list['0']
             self.temp_state = state
-
-            self.invariant_panel.set_state(state=self.temp_state,data=self.__data) 
-            # Must reset the 1st state using the state from file        
-            self.invariant_panel.state.state_list['0'] = temp_state0
+            # Requires to have self.__data and self.temp_state  first.
+            self.on_set_state_helper(None)
+
         except: 
             logging.error("invariant.set_state: %s" % sys.exc_value)

invariantview/perspectives/invariant/invariant_panel.py

@@ -169 +169 @@
         set state when loading it from a .inv/.svs file
         """
+        
         if state == None and data == None:
             self.state = IState()
         elif state == None or data == None: return
         else:
+            new_state = copy.deepcopy(state)
             self.new_state = True
             if not self.set_data(data):
                 return
-            self.state = state 
+
+            self.state = new_state 
             self.state.file = data.name   
 
@@ -188 +191 @@
             self.bookmark_num = len(self.state.bookmark_list)
             total_bookmark_num = self.bookmark_num + 1
+
             for ind in range(1,total_bookmark_num):
                 #bookmark_num = ind
@@ -196 +200 @@
                 self.popUpMenu.Append(id,name,str(''))
                 wx.EVT_MENU(self, id, self._back_to_bookmark) 
-
                 wx.PostEvent(self.parent, AppendBookmarkEvent(title=name, 
                                           hint='',