Changeset d5419f7f in sasview for src/sas/perspectives/calculator/gen_scatter_panel.py

Timestamp:

Mar 29, 2015 9:05:43 PM (9 years ago)

Author:

butler

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:

a3f125f0

Parents:

60dca65c

Message:

• Fixed problem with mac vs pc positioning of tool panels for now -

opened ticket to completely rethink panels in mac vs pc

• Added close button/activated close method for tool panels that did not

have it. Tool panels are now much more consistant.

File:

• src/sas/perspectives/calculator/gen_scatter_panel.py (modified) (3 diffs)

src/sas/perspectives/calculator/gen_scatter_panel.py

@@ -47 +47 @@
     FONT_VARIANT = 0
 else:
-    PANEL_TOP = 40
+    PANEL_TOP = 60
     PANEL_WIDTH = 620
     PANEL_HEIGHT = 370
@@ -379 +379 @@
         self.orient_combo = self._fill_orient_combo()
         self.orient_combo.Show(False)
+
         self.bt_compute = wx.Button(self, wx.NewId(), 'Compute')
         self.bt_compute.Bind(wx.EVT_BUTTON, self.on_compute)
         self.bt_compute.SetToolTipString("Compute 2D Scattering Pattern.")
+
         self.bt_help = wx.Button(self, wx.NewId(), 'HELP')
         self.bt_help.Bind(wx.EVT_BUTTON, self.on_help)
         self.bt_help.SetToolTipString("Help on Scatter Calculator")
+
+        self.bt_close = wx.Button(self, wx.ID_CANCEL, 'Close')
+        self.bt_close.Bind(wx.EVT_BUTTON, self.on_panel_close)
+        self.bt_close.SetToolTipString("Close this window")
+
         self.button_sizer.AddMany([(self.time_text , 0, wx.LEFT, 20),
                                    (self.orient_combo , 0, wx.LEFT, 20),
                                    (self.bt_compute, 0, wx.LEFT, 20),
-                                   (self.bt_help, 0, wx.LEFT, 5)])
+                                   (self.bt_help, 0, wx.LEFT, 20),
+                                   (self.bt_close, 0, wx.LEFT, 5)])
 
     def estimate_ctime(self):
@@ -1212 +1220 @@
     def on_panel_close(self, event):
         """
-        On Close SLD panel
-        """
-        #Not implemented   
+        close the window containing this panel
+        """
+        self.parent.Close()
 
 class OmfPanel(ScrolledPanel, PanelBase):