Changeset cefb3fb in sasview

Timestamp:

Apr 21, 2011 8:33:56 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:

04295ea

Parents:

d38d0042

Message:

fixed history from inv file

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_panel.py (modified) (7 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -251 +251 @@
             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=state,data=self.__data)         
-           
+
+            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
         except: 
             logging.error("invariant.set_state: %s" % sys.exc_value)

invariantview/perspectives/invariant/invariant_panel.py

@@ -81 +81 @@
         self.bookmark_num = 0
         
-        #self._set_bookmark_menu()
+        self._set_bookmark_menu()
         #Init state
         self.set_state()
@@ -136 +136 @@
             self._set_preview_flag(False)
             self._reset_state_list()
-            
+            self._set_bookmark_flag(True)
         return True  
     
@@ -187 +187 @@
             # get bookmarks
             self.bookmark_num = len(self.state.bookmark_list)
-
             total_bookmark_num = self.bookmark_num + 1
             for ind in range(1,total_bookmark_num):
@@ -198 +197 @@
                 wx.EVT_MENU(self, id, self._back_to_bookmark) 
 
+                wx.PostEvent(self.parent, AppendBookmarkEvent(title=name, 
+                                          hint='',
+                                          handler=self._back_to_bookmark))
+
             self.get_state_by_num(state_num=str(num))
             
@@ -204 +207 @@
             # when loaded from a inv file)
             self.state.data = self._data
-
+            self._set_preview_flag(False)
             self.new_state = False 
             self.is_state_data = False
@@ -604 +607 @@
             self.state.timestamp= self._get_time_stamp()
             msg = self.state.__str__()
-            #self.state.set_report_string()
+            self.state.set_report_string()
             self.is_power_out = False
             wx.PostEvent(self.parent, StatusEvent(status = msg ))
@@ -1051 +1054 @@
         
         # append it to menu
-        #id = wx.NewId()
-        #self.popUpMenu.Append(id,name,str(msg))
-        #wx.EVT_MENU(self, id, self._back_to_bookmark)
+        id = wx.NewId()
+        self.popUpMenu.Append(id,name,str(msg))
+        wx.EVT_MENU(self, id, self._back_to_bookmark)
         state = self.state.clone_state()
         comp_state = copy.deepcopy(self.state.state_list[str(compute_num)])