Changeset 9fdf302 in sasview

Timestamp:

Nov 29, 2016 5:25:14 AM (7 years ago)

Author:

wojciech

Children:

2e63860

Parents:

16c1297

Message:

Boxsizer instead of FlexGridSizer? introduced

File:

• src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (8 diffs)

src/sas/sasgui/perspectives/fitting/gpu_options.py

@@ -43 +43 @@
 
         clinfo = self._get_clinfo()
+
         self.panel1 = wx.Panel(self, -1)
         static_box1 = wx.StaticBox(self.panel1, -1, "Available OpenCL Options:")
 
-        rows = len(clinfo)
-
-        flexsizer = wx.FlexGridSizer(rows, 1, hgap=20, vgap=10)
+        boxsizer = wx.BoxSizer(orient=wx.VERTICAL)
         self.option_button = {}
         for index, fitter in enumerate(clinfo):
@@ -58 +57 @@
                 self.option_button[fitter] = "None"
             self.Bind(wx.EVT_RADIOBUTTON, self.OnRadio, id=button.GetId())
-            flexsizer.Add(button, 0, 0)
+            boxsizer.Add(button, 0, 0)
 
         fit_hsizer = wx.StaticBoxSizer(static_box1, orient=wx.VERTICAL)
-        fit_hsizer.Add(flexsizer, 0, wx.ALL, 5)
+        fit_hsizer.Add(boxsizer, 0, wx.ALL, 5)
 
         self.panel1.SetSizer(fit_hsizer)
@@ -72 +71 @@
 
         help_btn = wx.Button(self, wx.ID_HELP, 'Help')
-        #help_btn = wx.Button(self, wx.ID_ANY, 'Help')
         help_btn.SetToolTipString("Help on the GPU options")
 
         self.Bind(wx.EVT_BUTTON, self.OnAccept, accept_btn)
-        #self.Bind(wx.EVT_BUTTON, self.OnCancel, cancel_btn)
         if help is not None:
             self.Bind(wx.EVT_BUTTON, self.OnHelp, help_btn)
@@ -82 +79 @@
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
-        # Create the button sizer that will put the buttons in a row, right
-        # justified, and with a fixed amount of space between them.  This
-        # emulates the Windows convention for placing a set of buttons at the
-        # bottom right of the window.
         btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
         btn_sizer.Add((10,20), 1)  # stretchable whitespace
         btn_sizer.Add(accept_btn, 0)
-        #btn_sizer.Add((10,20), 0)  # non-stretchable whitespace
-        #btn_sizer.Add(cancel_btn, 0)
-        #btn_sizer.Add((10,20), 0)  # non-stretchable whitespace
         btn_sizer.Add((10,20), 0)  # non-stretchable whitespace
         btn_sizer.Add(help_btn, 0)
@@ -98 +88 @@
         self.vbox.Add(btn_sizer, 0, wx.EXPAND|wx.ALL, 10)
 
-        # Finalize the sizer and establish the dimensions of the dialog box.
-        # The minimum width is explicitly set because the sizer is not able to
-        # take into consideration the width of the enclosing frame's title.
         self.SetSizer(self.vbox)
-        #self.vbox.SetMinSize((size[0], -1))
         self.vbox.Fit(self)
 
@@ -128 +114 @@
     def OnAccept(self, event):
         """
-        Save the current fitter and options to the fit config.
+        Close window on accpetance
         """
         event.Skip()
@@ -134 +120 @@
     def OnHelp(self, event):
         """
-        Provide help on the selected fitter.
+        Provide help on opencl options.
         """
         _TreeLocation = "user/gpu_computations.html"
@@ -143 +129 @@
     def OnClose(self, event):
         """
-        Don't close the window, just hide it.
+        Close window
         """
         event.Skip()