Changeset 489bb46 in sasview for src/sas/sasgui

Timestamp:

Aug 8, 2016 5:01:52 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:

9b7c596

Parents:

05595c4

Message:

Move data type input to top and fix radiation type layout

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (2 diffs)

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -397 +397 @@
         y = 0
 
-        q_label = wx.StaticText(self, -1, "Q-Axis Data: ")
-        input_grid.Add(q_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
-
-        self.q_input = wx.FilePickerCtrl(self, -1,
-            size=(_STATICBOX_WIDTH-80, -1),
-            message="Chose the Q-Axis data file.")
-        input_grid.Add(self.q_input, (y,1), (1,1), wx.ALL, 5)
-        y += 1
-
-        iq_label = wx.StaticText(self, -1, "Intensity-Axis Data: ")
-        input_grid.Add(iq_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
-
-        self.iq_input = wx.FilePickerCtrl(self, -1,
-            size=(_STATICBOX_WIDTH-80, -1),
-            message="Chose the Intensity-Axis data file.")
-        input_grid.Add(self.iq_input, (y,1), (1,1), wx.ALL, 5)
-        y += 1
-
         data_type_label = wx.StaticText(self, -1, "Input Format: ")
         input_grid.Add(data_type_label, (y,0), (1,1),
@@ -432 +414 @@
         y += 1
 
+        q_label = wx.StaticText(self, -1, "Q-Axis Data: ")
+        input_grid.Add(q_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.q_input = wx.FilePickerCtrl(self, -1,
+            size=(_STATICBOX_WIDTH-80, -1),
+            message="Chose the Q-Axis data file.")
+        input_grid.Add(self.q_input, (y,1), (1,1), wx.ALL, 5)
+        y += 1
+
+        iq_label = wx.StaticText(self, -1, "Intensity-Axis Data: ")
+        input_grid.Add(iq_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.iq_input = wx.FilePickerCtrl(self, -1,
+            size=(_STATICBOX_WIDTH-80, -1),
+            message="Chose the Intensity-Axis data file.")
+        input_grid.Add(self.iq_input, (y,1), (1,1), wx.ALL, 5)
+        y += 1
+
         radiation_label = wx.StaticText(self, -1, "Radiation Type: ")
-        input_grid.Add(radiation_label, (y,0), (1,1), wx.ALL, 5)
+        input_grid.Add(radiation_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
         radiation_input = wx.ComboBox(self, -1,
             choices=["Neutron", "X-Ray", "Muon", "Electron"],
             name="radiation", style=wx.CB_READONLY, value="Neutron")
         radiation_input.Bind(wx.EVT_COMBOBOX, self.radiationtype_changed)
-        input_grid.Add(radiation_input, (y,1), (1,1))
+        input_grid.Add(radiation_input, (y,1), (1,1), wx.ALL, 5)
         y += 1