Changeset c0c9f68e in sasview for sansguiframe/src/sans/guiframe

Timestamp:

Aug 23, 2011 10:25:02 AM (13 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:

846c724

Parents:

09ef5a60

Message:

better focus on plots

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -385 +385 @@
             if self._data_panel is not None and \
                             self.panel_on_focus is not None:
-                panel_name = self.panel_on_focus.window_caption
-                ID = self.panel_on_focus.uid
-                self._data_panel.set_panel_on_focus(ID)
-                #update combo
-                if self.panel_on_focus in self.plot_panels.values():
-                    combo = self._data_panel.cb_plotpanel
-                    combo_title = str(self.panel_on_focus.window_caption)
-                    combo.SetStringSelection(combo_title)
-                    combo.SetToolTip( wx.ToolTip(combo_title )) 
-                elif self.panel_on_focus != self._data_panel:
-                    cpanel = self.panel_on_focus
-                    if self.cpanel_on_focus != cpanel:
-                        self.cpanel_on_focus = self.panel_on_focus
+                self.set_panel_on_focus_helper()
                 #update toolbar
                 self._update_toolbar_helper()
                 #update edit menu
                 self.enable_edit_menu()
-
+    
+    def set_panel_on_focus_helper(self):
+        """
+        Helper for panel on focus with data_panel
+        """
+        panel_name = self.panel_on_focus.window_caption
+        ID = self.panel_on_focus.uid
+        self._data_panel.set_panel_on_focus(ID)
+        #update combo
+        if self.panel_on_focus in self.plot_panels.values():
+            combo = self._data_panel.cb_plotpanel
+            combo_title = str(self.panel_on_focus.window_caption)
+            combo.SetStringSelection(combo_title)
+            combo.SetToolTip( wx.ToolTip(combo_title )) 
+        elif self.panel_on_focus != self._data_panel:
+            cpanel = self.panel_on_focus
+            if self.cpanel_on_focus != cpanel:
+                self.cpanel_on_focus = self.panel_on_focus
+                
     def reset_bookmark_menu(self, panel):
         """
@@ -846 +852 @@
             if len(self.plot_panels) == 1:
                 self.panel_on_focus = p
-                self.set_panel_on_focus(None)
+                self.set_panel_on_focus_helper()
             if self._data_panel is not None and \
                 self._plotting_plugin is not None:
@@ -2534 +2540 @@
         # set focusing panel
         self.panel_on_focus = panel  
-        self.set_panel_on_focus(None)
+        self.set_panel_on_focus_helper()
     
     def set_plot_unfocus(self):