Changeset 58fc26c in sasview

Timestamp:

Oct 17, 2011 1:48:53 PM (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:

4679e16

Parents:

6085557

Message:

fixed unstable c_panel focusing problem

Files:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -298 +298 @@
         if self._manager is not None:
             wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self))
-            if self._manager.menu1 != None:
-                chain_menu = self._manager.menu1.FindItemById(\
-                                                        self._manager.id_reset_flag)
-                chain_menu.Enable(self.batch_on)
-                sim_menu = self._manager.menu1.FindItemById(self._manager.id_simfit)
-                sim_menu.Enable(not self.batch_on and self.data.is_data\
-                                and (self.model!=None))
+            self.on_tap_focus()
                
-
+    def on_tap_focus(self):
+        """
+        Update menu1 on cliking the page tap
+        """
+        if self._manager.menu1 != None:
+            chain_menu = self._manager.menu1.FindItemById(\
+                                                    self._manager.id_reset_flag)
+            chain_menu.Enable(self.batch_on)
+            sim_menu = self._manager.menu1.FindItemById(self._manager.id_simfit)
+            sim_menu.Enable(not self.batch_on and self.data.is_data\
+                            and (self.model!=None)) 
+    
     class ModelTextCtrl(wx.TextCtrl):
         """

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -599 +599 @@
             cpanel = self.panel_on_focus
             if self.cpanel_on_focus != cpanel:
-                #cpanel.on_set_focus(None)
+                cpanel.on_tap_focus()
                 self.cpanel_on_focus = self.panel_on_focus