Changeset d4d78c9 in sasview

Timestamp:

Apr 20, 2011 7:39:00 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:

2a62d5c

Parents:

1258aa3

Message:

fixed history and status problem; inv file still to go

Location:

invariantview/perspectives/invariant

Files:

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

invariantview/perspectives/invariant/invariant.py

@@ -17 +17 @@
 import copy
 import logging
-
 
 from sans.guiframe.dataFitting import Data1D
@@ -210 +209 @@
         current_plottable = self.__data
 
-        if issubclass(current_plottable.__class__, LoaderData1D):
+        if issubclass(current_plottable.__class__, Data1D):
             self.state_reader.write(filepath, current_plottable, state)
         else:

invariantview/perspectives/invariant/invariant_panel.py

@@ -623 +623 @@
         : param event: undo button event
         """
-        if event != None: 
-            event.Skip()
         if self.state.state_num < 0:
             return
@@ -630 +628 @@
         # get the previous state_num
         pre_state_num = int(self.state.saved_state['state_num']) - 1
+
         self.get_state_by_num(state_num=str(pre_state_num))
         
@@ -639 +638 @@
         self.is_power_out = False  
         self._info_state_num()
-        
+
         
     def on_redo(self,event=None):
@@ -647 +646 @@
         : param event: redo button event
         """
-        if event != None:
-            event.Skip()
         self.is_power_out = True
         # get the next state_num
@@ -732 +729 @@
         self.state.saved_state = current_state
         self.state.state_num = state_num
-           
+
         
     def get_bookmark_by_num(self, num=None):
@@ -855 +852 @@
         self._set_undo_flag(True)
         self._set_redo_flag(False)
-        event.Skip()
+        #event.Skip()
                    
     def _set_compute_state(self,state=None):
@@ -943 +940 @@
         # check if this event is from do/undo button
         if self.state.saved_state['is_time_machine'] or self.new_state:
-            event.Skip()
+            #event.Skip()
             return
         
@@ -979 +976 @@
             pass
 
-        event.Skip()
+        #event.Skip()
         self._set_undo_flag(True)
         self._set_redo_flag(False)
@@ -1001 +998 @@
         except:
             pass
-        if event != None: event.Skip()\
+        #if event != None: event.Skip()
 
     def _get_input_list(self):