Changeset 7a219e3e in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 11, 2016 4:36:55 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

54a0989

Parents:

911dbe4

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/07/16 11:48:30)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 04:36:55)

Message:

Move background input below qrange input

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -322 +322 @@
         q_sizer.Add(explanation_label, (0,0), (1,4), wx.LEFT | wx.EXPAND, 5)
 
-        background_label = wx.StaticText(self, -1, "Background:", size=(80,20))
-        q_sizer.Add(background_label, (1,0), (1,1), wx.LEFT | wx.EXPAND, 5)
-
-        self._background_input = ModelTextCtrl(self, -1, size=(50,20),
-            style=wx.TE_PROCESS_ENTER, name='background_input',
-            text_enter_callback=self._on_enter_input)
-        self._background_input.SetToolTipString(("A background value to "
-            "subtract from all intensity values"))
-        q_sizer.Add(self._background_input, (1,1), (1,1),
-            wx.RIGHT | wx.EXPAND, 5)
-
-        background_button = wx.Button(self, wx.NewId(), "Calculate",
-            size=(75, 25))
-        background_button.Bind(wx.EVT_BUTTON, self._compute_background)
-        q_sizer.Add(background_button, (1, 2), (1, 1), wx.RIGHT | wx.EXPAND, 5)
-
         qrange_label = wx.StaticText(self, -1, "Q Range:", size=(50,20))
-        q_sizer.Add(qrange_label, (2,0), (1,1), wx.LEFT | wx.EXPAND, 5)
+        q_sizer.Add(qrange_label, (1,0), (1,1), wx.LEFT | wx.EXPAND, 5)
 
         # Lower Q Range
@@ -353 +337 @@
             "for Guinier back extrapolation"))
 
-        q_sizer.Add(qmin_label, (3, 0), (1, 1), wx.LEFT | wx.EXPAND, 5)
-        q_sizer.Add(qmin_lower, (3, 1), (1, 1), wx.LEFT, 5)
-        q_sizer.Add(qmin_dash_label, (3, 2), (1, 1), wx.CENTER | wx.EXPAND, 5)
-        q_sizer.Add(self._qmin_input, (3, 3), (1, 1), wx.LEFT, 5)
+        q_sizer.Add(qmin_label, (2, 0), (1, 1), wx.LEFT | wx.EXPAND, 5)
+        q_sizer.Add(qmin_lower, (2, 1), (1, 1), wx.LEFT, 5)
+        q_sizer.Add(qmin_dash_label, (2, 2), (1, 1), wx.CENTER | wx.EXPAND, 5)
+        q_sizer.Add(self._qmin_input, (2, 3), (1, 1), wx.LEFT, 5)
 
         # Upper Q range
@@ -375 +359 @@
         self._qmax2_input.SetToolTipString(qmax_tooltip)
 
-        q_sizer.Add(qmax_label, (4, 0), (1, 1), wx.LEFT | wx.EXPAND, 5)
-        q_sizer.Add(self._qmax1_input, (4, 1), (1, 1), wx.LEFT, 5)
-        q_sizer.Add(qmax_dash_label, (4, 2), (1, 1), wx.CENTER | wx.EXPAND, 5)
-        q_sizer.Add(self._qmax2_input, (4,3), (1, 1), wx.LEFT, 5)
+        q_sizer.Add(qmax_label, (3, 0), (1, 1), wx.LEFT | wx.EXPAND, 5)
+        q_sizer.Add(self._qmax1_input, (3, 1), (1, 1), wx.LEFT, 5)
+        q_sizer.Add(qmax_dash_label, (3, 2), (1, 1), wx.CENTER | wx.EXPAND, 5)
+        q_sizer.Add(self._qmax2_input, (3,3), (1, 1), wx.LEFT, 5)
+
+        background_label = wx.StaticText(self, -1, "Background:", size=(80,20))
+        q_sizer.Add(background_label, (4,0), (1,1), wx.LEFT | wx.EXPAND, 5)
+
+        self._background_input = ModelTextCtrl(self, -1, size=(50,20),
+            style=wx.TE_PROCESS_ENTER, name='background_input',
+            text_enter_callback=self._on_enter_input)
+        self._background_input.SetToolTipString(("A background value to "
+            "subtract from all intensity values"))
+        q_sizer.Add(self._background_input, (4,1), (1,1),
+            wx.RIGHT, 5)
+
+        background_button = wx.Button(self, wx.NewId(), "Calculate",
+            size=(75, 20))
+        background_button.Bind(wx.EVT_BUTTON, self._compute_background)
+        q_sizer.Add(background_button, (4, 2), (1, 1), wx.RIGHT, 5)
 
         qbox_sizer.Add(q_sizer, wx.TOP, 0)