Changeset 164d64f in sasview

Timestamp:

Apr 5, 2014 9:07:59 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

38d4102

Parents:

7e44299

Message:

Fix FTOL dialog size

File:

• src/sans/perspectives/fitting/ftol_dialog.py (modified) (2 diffs)

src/sans/perspectives/fitting/ftol_dialog.py

@@ -36 +36 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
         # build layout
-        panel = wx.Panel(self, -1)
         vbox = wx.BoxSizer(wx.VERTICAL)
-        wx.StaticBox(panel, -1, 'FTol selection (Leastsq)', (5, 6), (PANEL_WIDTH * 0.9, PANEL_HEIGHT * 0.7))
-        self.default_bt = wx.RadioButton(panel, -1, 'SansView Default (5e-05)', (15, 30), style=wx.RB_GROUP)
+        title_text = wx.StaticText(self, id=wx.NewId(), label='FTol selection (Leastsq)')
+        self.default_bt = wx.RadioButton(self, -1, 'SansView Default (5e-05)', (15, 30), style=wx.RB_GROUP)
         self.default_bt.SetValue(True)
         self.default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.sci_default_bt = wx.RadioButton(panel, -1, 'Scipy Default (1.49012e-08)', (15, 55))
+        self.sci_default_bt = wx.RadioButton(self, -1, 'Scipy Default (1.49012e-08)', (15, 55))
         self.sci_default_bt.SetValue(False)
         self.sci_default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.high_bt = wx.RadioButton(panel, -1, '1e-06', (15, 80))
+        self.high_bt = wx.RadioButton(self, -1, '1e-06', (15, 80))
         self.high_bt.SetValue(False)
         self.high_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.mid_bt = wx.RadioButton(panel, -1, '1e-05', (15, 105))
+        self.mid_bt = wx.RadioButton(self, -1, '1e-05', (15, 105))
         self.mid_bt.SetValue(False)
         self.mid_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.low_bt = wx.RadioButton(panel, -1, '1e-04', (15, 130))
+        self.low_bt = wx.RadioButton(self, -1, '1e-04', (15, 130))
         self.low_bt.SetValue(False)
         self.low_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.custom_bt = wx.RadioButton(panel, -1, 'Custom', (15, 155))
+        self.custom_bt = wx.RadioButton(self, -1, 'Custom', (15, 155))
         self.custom_bt.SetValue(False)
         self.custom_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.custombox = wx.TextCtrl(panel, -1, '', (95, 155))
+        self.custombox = wx.TextCtrl(self, -1, '', (95, 155))
         self.custombox.Disable()
         
@@ -65 +64 @@
         hbox.Add(okButton, 1, wx.RIGHT, 5)
         hbox.Add(closeButton, 1, wx.RIGHT, 5)
-        vbox.Add(panel, 1, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 10)
-        vbox.Add(hbox, 1, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 10)
+        
+        vbox.Add(title_text, 0, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 10)
+        vbox.Add(self.default_bt, 0, wx.LEFT, 20)
+        vbox.Add(self.sci_default_bt, 0, wx.LEFT, 20)
+        vbox.Add(self.high_bt, 0, wx.LEFT, 20)
+        vbox.Add(self.mid_bt, 0, wx.LEFT, 20)
+        vbox.Add(self.low_bt, 0, wx.LEFT, 20)
+        vbox.Add(self.custom_bt, 0, wx.LEFT, 20)
+        vbox.Add(self.custombox, 0, wx.LEFT, 60)
+        vbox.Add(hbox, 0, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 10)
         
         self.SetSizer(vbox)