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

Timestamp:

Mar 29, 2015 11: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/sld_panel.py (modified) (5 diffs)

src/sas/perspectives/calculator/sld_panel.py

@@ -30 +30 @@
 #SLD panel size 
 if sys.platform.count("win32") > 0:
+    PANEL_TOP = 0
     _STATICBOX_WIDTH = 350
     PANEL_SIZE = 400
     FONT_VARIANT = 0
 else:
+    PANEL_TOP = 60
     _STATICBOX_WIDTH = 380
     PANEL_SIZE = 410
@@ -59 +61 @@
         self.base = base
         self.wavelength = WAVELENGTH
+        self.parent = parent
         #layout attribute
         self.compound_ctl = None
@@ -290 +293 @@
         self.Bind(wx.EVT_BUTTON, self.on_help, id=id)
 
+        self.button_close = wx.Button(self, wx.ID_CANCEL, 'Close')
+        self.button_close.Bind(wx.EVT_BUTTON, self.on_close)
+        self.button_close.SetToolTipString("Close this window.")
+
         sizer_button.Add((150, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         sizer_button.Add(self.button_calculate, 0, wx.RIGHT | wx.ADJUST_MINSIZE, 20)
         sizer_button.Add(self.button_help, 0, wx.RIGHT | wx.ADJUST_MINSIZE, 20)
+        sizer_button.Add(self.button_close, 0, wx.RIGHT | wx.ADJUST_MINSIZE, 20)
         sizer3.Add(sizer_button)
         #---------layout----------------
@@ -320 +328 @@
         _doc_viewer = DocumentationWindow(self, -1, \
              _TreeLocation, "General Scattering Calculator Help")
+
+    def on_close(self, event):
+        """
+        close the window containing this panel
+        """
+        self.parent.Close()
 
     def calculate_xray_sld(self, element):
@@ -482 +496 @@
         self.panel = SldPanel(self, base=base)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((20, 10))
+        self.SetPosition((wx.LEFT, PANEL_TOP))
         self.Show(True)