Changeset d5419f7f in sasview for src/sas

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.

Location:

src/sas/perspectives/calculator

Files:

• data_operator.py (modified) (4 diffs)
• density_panel.py (modified) (6 diffs)
• gen_scatter_panel.py (modified) (3 diffs)
• kiessig_calculator_panel.py (modified) (2 diffs)
• resolution_calculator_panel.py (modified) (3 diffs)
• sld_panel.py (modified) (5 diffs)
• slit_length_calculator_panel.py (modified) (2 diffs)

src/sas/perspectives/calculator/data_operator.py

@@ -1 +1 @@
 """
-GUI for the data operation
+GUI for the data operations panel (sum and multiply)
 """
 import wx
@@ -17 +17 @@
 #Control panel width 
 if sys.platform.count("win32") > 0:
+    PANEL_TOP = 0
     PANEL_WIDTH = 790
     PANEL_HEIGTH = 370
@@ -23 +24 @@
     ON_MAC = False
 else:
+    PANEL_TOP = 60
     _BOX_WIDTH = 230
     PANEL_WIDTH = 900
@@ -963 +965 @@
         self.panel = DataOperPanel(parent=self)
         wx.EVT_CLOSE(self, self.OnClose)
-        self.SetPosition((25, 10))
+        self.SetPosition((wx.LEFT, PANEL_TOP))
         self.Show()
 

src/sas/perspectives/calculator/density_panel.py

@@ -18 +18 @@
 #Density panel size 
 if sys.platform.count("win32") > 0:
+    PANEL_TOP = 0
     _STATICBOX_WIDTH = 410
     _BOX_WIDTH = 200
@@ -23 +24 @@
     FONT_VARIANT = 0
 else:
+    PANEL_TOP = 60
     _STATICBOX_WIDTH = 430
     _BOX_WIDTH = 200
@@ -49 +51 @@
         # Object that receive status event
         self.base = base
+        self.parent = parent
         # chemeical formula, string
         self.compound = ''
@@ -211 +214 @@
         self.Bind(wx.EVT_BUTTON, self.on_help, id=id)
 
-        sizer_button.Add((150, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        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((100, 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)
@@ -379 +388 @@
              _TreeLocation, "Density/Volume Calculator Help")
 
+    def on_close(self, event):
+        """
+        close the window containing this panel
+        """
+        self.parent.Close()
+
     def clear_outputs(self):
         """
@@ -415 +430 @@
         self.panel = DensityPanel(self, base=base)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((25, 10))
+        self.SetPosition((wx.LEFT, PANEL_TOP))
         self.Show(True)
 

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):

src/sas/perspectives/calculator/kiessig_calculator_panel.py

@@ -22 +22 @@
 #Slit length panel size
 if sys.platform.count("win32") > 0:
+    PANEL_TOP = 0
     PANEL_WIDTH = 500
     PANEL_HEIGHT = 230
     FONT_VARIANT = 0
 else:
+    PANEL_TOP = 60
     PANEL_WIDTH = 560
     PANEL_HEIGHT = 230
@@ -228 +230 @@
         self.panel = KiessigThicknessCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((25, 10))
+        self.SetPosition((wx.LEFT, PANEL_TOP))
         self.Show(True)
         

src/sas/perspectives/calculator/resolution_calculator_panel.py

@@ -39 +39 @@
 #Slit length panel size
 if sys.platform.count("win32") > 0:
+    PANEL_TOP = 0
     PANEL_WIDTH = 525
     PANEL_HEIGHT = 653
@@ -44 +45 @@
     IS_WIN = True
 else:
+    PANEL_TOP = 60
     PANEL_WIDTH = 540
     PANEL_HEIGHT = 662
@@ -1335 +1337 @@
         self.panel = ResolutionCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
-        self.SetPosition((25, 10))
+        self.SetPosition((wx.LEFT, PANEL_TOP))
         self.Show(True)
 

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)
 

src/sas/perspectives/calculator/slit_length_calculator_panel.py

@@ -25 +25 @@
 #Slit length panel size 
 if sys.platform.count("win32") > 0:
+    PANEL_TOP = 0
     PANEL_WIDTH = 500
     PANEL_HEIGHT = 210
     FONT_VARIANT = 0
 else:
+    PANEL_TOP = 60
     PANEL_WIDTH = 530
     PANEL_HEIGHT = 210
@@ -293 +295 @@
         self.panel = SlitLengthCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((25, 10))
+        self.SetPosition((wx.LEFT, PANEL_TOP))
         self.Show(True)