Changeset fe496eeb in sasview for sansview/perspectives/fitting

Timestamp:

Jun 9, 2009 3:56:59 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

240b9966

Parents:

330573d

Message:

working on saving option undo and redo

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpanel.py (modified) (3 diffs)

sansview/perspectives/fitting/basepage.py

@@ -142 +142 @@
         """
         print "enable redo"
-        event = NextStateEvent(page= sent)
+        event = NextStateEvent(page= self)
         wx.PostEvent(self.parent, event)
         
@@ -576 +576 @@
     
     
-    def reset_page_helper(self, state):
+    def reset_page_helper(self, state, forward=False):
         """
             Use page_state and change the state of existing page

sansview/perspectives/fitting/fitpanel.py

@@ -72 +72 @@
         
     def getNextItem(self):
-        position = self.iterator.next()
+        position = self.iterator.next(max= len(self)-1)
         if position >= len(self):
             return None
@@ -172 +172 @@
         self.Bind(basepage.EVT_PAGE_INFO, self._onGetstate)
         self.Bind(basepage.EVT_PREVIOUS_STATE, self._onUndo)
-        #(NextStateEvent, EVT_NEXT_STATE)   = wx.lib.neweve
+        self.Bind(basepage.EVT_NEXT_STATE, self._onRedo)
+       
         # increment number for model name
         self.count=0
@@ -406 +407 @@
             else:
                 state = self.fit_page_name[page.window_name].getPreviousItem()
+                page._redo.Enable(True)
             page.reset_page(state)
-                
-          
+        
+    def _onRedo(self, event ): 
+        """
+            return the next state available
+        """       
+        page = event.page 
+        if page.window_name in self.fit_page_name:
+            length= len(self.fit_page_name[page.window_name])
+            if self.fit_page_name[page.window_name].getCurrentPosition()== length -1:
+                state = None
+                page._redo.Enable(False)
+            else:
+                state = self.fit_page_name[page.window_name].getNextItem()
+            page.reset_page(state)  
                 
     def _help_add_model_page(self,model,page_title="Model", qmin=0.0001,