Changeset b07ffca in sasview

Timestamp:

Apr 24, 2013 4:41:38 PM (12 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:

79b550a

Parents:

7aa1685

Message:

minor fixes in focusing graph name in combobox:Data Panel

Files:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (1 diff)
• plottools/src/danse/common/plottools/PlotPanel.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)

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

@@ -805 +805 @@
             wx.PostEvent(self._manager.parent,
                     StatusEvent(status=msg, info=infor))
-            raise
         # inform msg to wx
         wx.PostEvent(self._manager.parent,

plottools/src/danse/common/plottools/PlotPanel.py

@@ -303 +303 @@
         self.color = '#0099f7'
         self.figure.set_edgecolor(self.color)
+        if self.parent and self.window_caption:
+            self.parent.send_focus_to_datapanel(self.window_caption)
         self.draw()
         

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -692 +692 @@
         """
         return
-        
+    
+    def send_focus_to_datapanel(self, name):  
+        """
+        Send focusing on ID to data explorer
+        """
+        if self._data_panel != None:
+            self._data_panel.set_panel_on_focus(name)
+            
     def set_panel_on_focus_helper(self):
         """
         Helper for panel on focus with data_panel
         """
-        ID = self.panel_on_focus.uid
-        if self._data_panel != None:
-            self._data_panel.set_panel_on_focus(ID)
+        caption = self.panel_on_focus.window_caption
+        self.send_focus_to_datapanel(caption)
         #update combo
         if self.panel_on_focus in self.plot_panels.values():
@@ -3093 +3099 @@
         if panel == None:
             return
-        self.set_plot_unfocus()
+        #self.set_plot_unfocus()
         panel.on_set_focus(None)  
         # set focusing panel

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -539 +539 @@
         Display the position of the mouse on the statusbar
         """
+        #self.parent.set_plot_unfocus() 
         self._get_cusor_lines(event)
         ax = event.inaxes
         PlotPanel.onLeftDown(self, event)
-
         if ax != None:
             try: