Changeset 27f3831 in sasview for invariantview

Timestamp:

Feb 4, 2011 3:19:09 PM (13 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:

a45037aa

Parents:

f036c692

Message:

binding invirant button with guiframe toolbar

Location:

invariantview/perspectives/invariant

Files:

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

invariantview/perspectives/invariant/invariant.py

@@ -291 +291 @@
         
         
-        
     def plot_theory(self, data=None, name=None):
         """

invariantview/perspectives/invariant/invariant_panel.py

@@ -65 +65 @@
         kwds["style"] = wx.FULL_REPAINT_ON_RESIZE
         ScrolledPanel.__init__(self, parent=parent, *args, **kwds)
-        PanelBase.__init__(self)
+        PanelBase.__init__(self, parent)
         self.SetupScrolling()
         #Font size 
@@ -197 +197 @@
             if num > 0 :
                 self._undo_enable()
+                self._set_undo_flag(True)
             if num < len(state.state_list) - 1:
                 self._redo_enable()
+                self._set_redo_flag(True)
                 
             # get bookmarks
@@ -524 +526 @@
             self._set_compute_state(state='compute')
             self.button_bookmark.Enable(True)
+            self._set_bookmark_flag(True)
             msg= "\n\nStarting a new invariant computation..."            
             wx.PostEvent(self.parent, StatusEvent(status=msg))
@@ -627 +630 @@
             if not self.button_report.IsEnabled():
                 self.button_report.Enable(True)
+                self._set_preview_flag(True)
             if not self.button_save.IsEnabled():
                 self.button_save.Enable(True)
+                self._set_save_flag(True)
             wx.PostEvent(self.parent,
                 StatusEvent(status='\nFinished invariant computation...'))
-           
-
-    def undo(self,event=None):
+            
+    def on_undo(self,event=None):
         """
         Go back to the previous state
@@ -650 +654 @@
         if float(pre_state_num) <= 0:
             self._undo_disable()
+            self._set_undo_flag(False)
         else:
             self._undo_enable()
+            self._set_undo_flag(True)
 
         self._redo_enable()
+        self._set_redo_flag(True)
         self.is_power_out = False  
         self._info_state_num()
         
         
-    def redo(self,event=None):
+    def on_redo(self,event=None):
         """
         Go forward to the previous state
@@ -674 +681 @@
         if float(next_state_num)+2 > len(self.state.state_list):
             self._redo_disable()
+            self._set_redo_flag(False)
         else:
             self._redo_enable()
+            self._set_redo_flag(FTrue)
         
         self._undo_enable()
+        self._set_undo_flag(True)
         self.is_power_out = False
         self._info_state_num()
         
-    def report(self, event=None):
+    def on_preview(self, event=None):
         """
         Invoke report dialog panel
@@ -821 +831 @@
         self._reset_output()
         self.button_undo.Disable()
+        self._set_undo_flag(False)
         self.button_redo.Disable()
+        self._set_redo_flag(False)
         self.button_bookmark.Disable()
+        self._set_bookmark_flag(False)
         self.button_report.Disable()
+        self._set_preview_flag(False)
         self.button_save.Disable() 
+        self._set_save_flag(False)
         self.button_calculate.SetFocus()
         #self.SetupScrolling()
@@ -872 +887 @@
         event.Skip()
         self._undo_enable()
+        self._set_undo_flag(True)
         self._redo_disable()
+        self._set_redo_flag(False)
             
     def _set_compute_state(self,state=None):
@@ -914 +931 @@
         # Enable the undo button if it was not
         self._undo_enable()
+        self._set_undo_flag(True)
         self._redo_disable()
-        
+        self._set_redo_flag(False)
         
     def _reset_state_list(self, data=None):
@@ -994 +1012 @@
         event.Skip()
         self._undo_enable()
+        self._set_undo_flag(True)
         self._redo_disable()
+        self._set_redo_flag(False)
         self.button_bookmark.Enable(True)
+        self._set_bookmark_flag(True)
         self.button_report.Disable()
+        self._set_preview_flag(False)
        
         
@@ -1041 +1063 @@
         self.popUpMenu.AppendItem(self._bmark)
         self._bmark.Enable(True)
-        wx.EVT_MENU(self, id, self._on_bookmark)
+        wx.EVT_MENU(self, id, self.on_bookmark)
         self.popUpMenu.AppendSeparator()
         self.Bind(wx.EVT_CONTEXT_MENU, self._on_context_menu)
         
-    def _on_bookmark(self,event):
+    def on_bookmark(self,event):
         """
         Save the panel state in memory and add the list on
@@ -1101 +1123 @@
         self.state.state_num = state_num
         self._undo_enable()
+        self._set_undo_flag(True)
         self._info_bookmark_num(event)
         
@@ -1136 +1159 @@
         date= str( month)+"/"+str(day)+"/"+str(year)
         return my_time, date
-    
+      
     def _undo_enable(self):
         """
@@ -1165 +1188 @@
             self.button_redo.Disable()
             
-    def _on_save_button(self, evt=None): 
+    def on_save(self, evt=None): 
         """
         Save invariant state into a file
@@ -1371 +1394 @@
         if event != None: 
             self.button_bookmark.Enable(True)
+            self._set_bookmark_flag(True)
             self.button_report.Disable()
+            self._set_preview_flag(False)
             print "enable fit==>event!=None"
 
@@ -1390 +1415 @@
         if event != None: 
             self.button_bookmark.Enable(True)
+            self._set_bookmark_flag(True)
             self.button_report.Disable()
+            self._set_preview_flag(False)
             
         if self.enable_low_cbox.GetValue():
@@ -1417 +1444 @@
         if event != None: 
             self.button_bookmark.Enable(True)
+            self._set_bookmark_flag(True)
             self.button_report.Disable()
+            self._set_preview_flag(False)
         if self.guinier.GetValue():
             self.power_law_low.SetValue(False)
@@ -1518 +1547 @@
         if event != None: 
             self.button_bookmark.Enable(True)
+            self._set_bookmark_flag(True)
             self.button_report.Disable()
+            self._set_preview_flag(False)
         if self.fix_enable_high.IsEnabled():
             if self.fix_enable_high.GetValue():
@@ -1534 +1565 @@
         if event != None: 
             self.button_bookmark.Enable(True)
+            self._set_bookmark_flag(True)
             self.button_report.Disable()
+            self._set_preview_flag(False)
         if self.enable_high_cbox.GetValue():
             self.npts_high_tcl.Enable()
@@ -1828 +1861 @@
         
         #self.button_undo.SetBackgroundColour('#c2e6f8')
-        self.Bind(wx.EVT_BUTTON, self.undo, id=id)
+        self.Bind(wx.EVT_BUTTON, self.on_undo, id=id)
         self._undo_disable()
         #redo button
@@ -1835 +1868 @@
         self.button_redo = wx.BitmapButton(self, id,wx.Bitmap(self.redo_png))
         self.button_redo.SetToolTipString("Redo")
-        self.Bind(wx.EVT_BUTTON, self.redo, id=id)
+        self.Bind(wx.EVT_BUTTON, self.on_redo, id=id)
         self._redo_disable()   
+        self._set_redo_flag(False)
         #bookmark button
         id = wx.NewId()
@@ -1844 +1878 @@
         hint_msg = "Bookmark: right-click on the panel to retrieve it"
         self.button_bookmark.SetToolTipString(hint_msg)
-        self.Bind(wx.EVT_BUTTON, self._on_bookmark, id=id)
+        self.Bind(wx.EVT_BUTTON, self.on_bookmark, id=id)
         #report button
         id = wx.NewId()
@@ -1852 +1886 @@
         hint_msg = "Report the result of the computation"
         self.button_report.SetToolTipString(hint_msg)
-        self.Bind(wx.EVT_BUTTON, self.report, id=id)
+        self.Bind(wx.EVT_BUTTON, self.on_preview, id=id)
         #self.button_report.Disable()   
+        #self._set_preview_flag(False)   
         #save button
         id = wx.NewId()
@@ -1860 +1895 @@
                                            name='Save_invariant')
         self.button_save.SetToolTipString("Save as a file")
-        self.Bind(wx.EVT_BUTTON, self._on_save_button, id=id)   
+        self.Bind(wx.EVT_BUTTON, self.on_save, id=id)   
         self.button_save.Disable()  
+        self._set_save_flag(False)
         self.save_button_sizer.AddMany([((PANEL_WIDTH/2,20), 1 ,
                                          wx.EXPAND|wx.ADJUST_MINSIZE,0),