Changeset f69b5830 in sasview

Timestamp:

Apr 11, 2011 2:04:21 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:

0a2fdca

Parents:

4d1dce4

Message:

fixed plotpanel focusing

Location:

guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• panel_base.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -202 +202 @@
         panel_name = 'No panel on focus'
         application_name = 'No Selected Application'
-        if self.panel_on_focus is not None and self._data_panel is not None:
-            panel_name = self.panel_on_focus.window_caption
-            self._data_panel.set_panel_on_focus(panel_name)
-            #update toolbar
-            self._update_toolbar_helper()
-            #update edit menu
-            self.enable_edit_menu()
+        if self.panel_on_focus is not None:
+            for ID in self.panels.keys():
+                if self.panel_on_focus != self.panels[ID]:
+                    self.panels[ID].on_kill_focus(None)
+
+            if self._data_panel is not None:
+                panel_name = self.panel_on_focus.window_caption
+                self._data_panel.set_panel_on_focus(panel_name)
+                #update toolbar
+                self._update_toolbar_helper()
+                #update edit menu
+                self.enable_edit_menu()
 
     def build_gui(self):
@@ -241 +246 @@
         self.SetStatusBar(self.sb)
         # Add panel
-        default_flag = wx.aui.AUI_MGR_DEFAULT| wx.aui.AUI_MGR_ALLOW_ACTIVE_PANE
+        default_flag = wx.aui.AUI_MGR_DEFAULT#| wx.aui.AUI_MGR_ALLOW_ACTIVE_PANE
         self._mgr = wx.aui.AuiManager(self, flags=default_flag)
         self._mgr.SetDockSizeConstraint(0.5, 0.5)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -228 +228 @@
             position = "x: %8.3g    y: %8.3g" % (event.xdata, event.ydata)
             wx.PostEvent(self.parent, StatusEvent(status=position))
-            
+        
+        self.on_set_focus(None)    
         #post nd event to notify guiframe that this panel is on focus
         wx.PostEvent(self.parent, PanelOnFocusEvent(panel=self))

guiframe/panel_base.py

@@ -327 +327 @@
         if self.parent is not None:
             wx.PostEvent(self.parent, PanelOnFocusEvent(panel=self))
-        
+            
+    def on_kill_focus(self, event=None):
+        """
+        The  derivative class is on unfocus if implemented
+        """
+        pass
+                
     def get_data(self):
         """