Changeset 0a2fdca in sasview for guiframe/data_panel.py

Timestamp:

Apr 12, 2011 1:00:08 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:

a1a252e

Parents:

f69b5830

Message:

fixing plot panel and control panels focusing problems

File:

• guiframe/data_panel.py (modified) (5 diffs)

guiframe/data_panel.py

@@ -255 +255 @@
         wx.EVT_BUTTON(self, self.bt_remove.GetId(), self.on_remove)
         
-        self.tctrl_perspective = wx.StaticText(self, -1, 'No Active Application')
+        self.tctrl_perspective = wx.StaticText(self, -1, 
+                            'No Active Application',
+                        style=wx.SUNKEN_BORDER|wx.ALIGN_LEFT)
         self.tctrl_perspective.SetToolTipString("Active Application")
-        self.tctrl_plotpanel = wx.StaticText(self, -1, 'No Plot panel on focus')
-        self.tctrl_plotpanel.SetToolTipString("Active Plot Panel")
+        perspective_font = self.tctrl_perspective.GetFont()
+        perspective_font.SetWeight(wx.BOLD)
+        self.tctrl_perspective.SetFont(perspective_font)
+        self.tctrl_perspective.SetClientSize((80,20))
+        self.cb_plotpanel = wx.ComboBox(self, -1, 
+                                style=wx.CB_READONLY|wx.CB_SORT)
+        wx.EVT_COMBOBOX(self.cb_plotpanel,-1, self._on_plot_selection)
+        self.cb_plotpanel.Append('None')
+        self.cb_plotpanel.SetStringSelection('None')
+
+        #self.tctrl_plotpanel = wx.StaticText(self, -1, 'No Plot panel on focus')
+        #self.tctrl_plotpanel.SetToolTipString("Active Plot Panel")
     
         ix = 0
@@ -272 +284 @@
                              wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
-        self.sizer3.Add(self.tctrl_plotpanel,(iy, ix),(1,1),
+        self.sizer3.Add(self.cb_plotpanel,(iy, ix),(1,1),
                           wx.EXPAND|wx.ADJUST_MINSIZE, 0)  
         ix = 0          
@@ -624 +636 @@
         append plot to plot panel on focus
         """
+        self._on_plot_selection()
         data_id, theory_id, state_id = self.set_data_helper()
         self.parent.plot_data(data_id=data_id,  
@@ -662 +675 @@
         """
         self.tctrl_perspective.SetLabel(str(name))
+        #perspective_font = self.tctrl_perspective.GetFont()
+        #perspective_font.SetWeight(wx.BOLD)
+        self.tctrl_perspective.SetClientSize((80,20))#SetFont(perspective_font)
      
     def set_panel_on_focus(self, name):
@@ -667 +683 @@
         set the plot panel on focus
         """
-        self.tctrl_plotpanel.SetLabel(str(name))
+        for key, value in self.parent.plot_panels.iteritems():
+            name_plot_panel = str(value.window_caption)
+            if name_plot_panel not in self.cb_plotpanel.GetItems():
+                self.cb_plotpanel.Append(name_plot_panel, value)
+            self.cb_plotpanel.SetStringSelection(name_plot_panel)
+
  
+    def _on_plot_selection(self, event = None):
+        """
+        On source combobox selection
+        """
+        if event != None:
+            combo = event.GetEventObject()
+            event.Skip()
+        else:
+            combo = self.cb_plotpanel
+        selection = combo.GetSelection()
+
+        if combo.GetValue() != 'None':
+            panel = combo.GetClientData(selection)
+            self.parent.on_set_plot_focus(panel)   
+