Changeset ca88b2e in sasview

Timestamp:

Feb 2, 2009 7:28:47 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:

6b44403

Parents:

26bf293

Message:

working on history panel

Location:

guiframe

Files:

• calcthread.py (added)
• gui_manager.py (modified) (6 diffs)
• history.py (added)
• local_perspectives/plotting/AnnulusSlicer.py (modified) (1 diff)
• model_thread.py (added)
• state.py (added)
• stateManager.py (added)

guiframe/gui_manager.py

@@ -36 +36 @@
     
 from sans.guicomm.events import EVT_STATUS,Model2DPanelEvent
-
+import history
 import warnings
 warnings.simplefilter("ignore")
@@ -220 +220 @@
         ## Default welcome panel
         self.defaultPanel    = DefaultPanel(self, -1, style=wx.RAISED_BORDER)
-
+        
+        # History panel
+        self.histPanel     = history.HistoryPanel(self, style=wx.RAISED_BORDER)
         # self.build_gui()
        
@@ -347 +349 @@
         # It also sets the size of the application windows
         self.panels["default"] = self.defaultPanel
+         # History panel
+        self.panels["historyPanel"] = self.histPanel  
+        
         self._mgr.AddPane(self.defaultPanel, wx.aui.AuiPaneInfo().
                               Name("default").
@@ -354 +359 @@
                               MinSize(wx.Size(self._window_width, self._window_height)).
                               Show())
+        self._mgr.AddPane(self.histPanel, wx.aui.AuiPaneInfo().
+                          Name("historyPanel").Caption("History").
+                          #Float().
+                          Bottom().
+                          Dock().
+                          TopDockable().
+                          BottomDockable().
+                          LeftDockable().
+                          RightDockable().
+                          MinimizeButton().
+                          Hide().
+                          #Show().
+                          BestSize(wx.Size(500,600)).
+                          MinSize(wx.Size(200,150)))
 
         # Add the panels to the AUI manager
@@ -478 +497 @@
         
         id = wx.NewId()
+        filemenu.Append(id, '&History', 'Register previous States')
+        wx.EVT_MENU(self, id, self._onHistoryPanel)
+        
+        id = wx.NewId()
         filemenu.Append(id,'&Quit', 'Exit') 
         wx.EVT_MENU(self, id, self.Close)
@@ -600 +623 @@
                 
             self._mgr.Update()
+    def _onHistoryPanel(self, event):
+        print "on history"
+        if not self._mgr.GetPane("historyPanel").IsShown():
+            self._mgr.GetPane("historyPanel").Show()
+        self._mgr.Update()
+        return
         
     def _on_open(self, event):

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -47 +47 @@
         self.outer_circle = RingInteractor(self, self.base.subplot, zorder=zorder+1, r=self.qmax/1.8,sign=self.sign)
         self.outer_circle.qmax = self.qmax*1.2
-        #self.outer_circle.set_cursor(self.base.qmax/1.8, 0)
-        
-                      
+       
         self.update()
         self._post_data()