Changeset 55775e8 in sasview

Timestamp:

Jul 20, 2016 10:41:34 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:

3ea9371

Parents:

13b9a63

Message:

Move radiation type to required inputs

Location:

src/sas/sasgui/perspectives/file_converter

Files:

• converter_panel.py (modified) (5 diffs)
• meta_panels.py (modified) (2 diffs)

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

@@ -67 +67 @@
 
         self.metadata['detector'][0].name = ''
+        self.metadata['source'].radiation = 'neutron'
 
         self._do_layout()
@@ -218 +219 @@
         self.data_type = dtype
 
+    def radiationtype_changed(self, event):
+        event.Skip()
+        rtype = event.GetEventObject().GetValue().lower()
+        self.metadata['source'].radiation = rtype
+
     def metadata_changed(self, event):
         event.Skip()
@@ -283 +289 @@
         y += 1
 
+        radiation_label = wx.StaticText(self, -1, "Radiation Type: ")
+        input_grid.Add(radiation_label, (y,0), (1,1), wx.ALL, 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))
+        y += 1
+
         output_label = wx.StaticText(self, -1, "Output File: ")
         input_grid.Add(output_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
@@ -288 +303 @@
         self.output = wx.FilePickerCtrl(self, -1,
             size=(_STATICBOX_WIDTH-80, -1),
-            message="Chose the Intensity data file.",
+            message="Chose where to save the output file.",
             style=wx.FLP_SAVE | wx.FLP_OVERWRITE_PROMPT | wx.FLP_USE_TEXTCTRL,
             wildcard="*.xml")
@@ -317 +332 @@
         windows = ['detector', 'sample', 'source']
         for item in self.metadata.keys():
+            # Don't make fields for properties that have their own windows
             if item in windows: continue
             label_txt = item.replace('_', ' ').capitalize()

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

@@ -333 +333 @@
         y += 1
 
-        radiation_label = wx.StaticText(self, -1, "Radiation: ")
-        input_grid.Add(radiation_label, (y,0), (1,1), wx.ALL, 5)
-        radiation_input = wx.ComboBox(self, -1,
-            choices=["neutron", "x-ray", "muon", "electron"],
-            name="radiation", style=wx.CB_READONLY)
-        radiation_input.Bind(wx.EVT_COMBOBOX, self.on_change)
-        input_grid.Add(radiation_input, (y,1), (1,1))
-        y += 1
-
         size_label = wx.StaticText(self, -1, "Beam Size (mm): ")
         input_grid.Add(size_label, (y,0), (1,1), wx.ALL, 5)
@@ -393 +384 @@
         y += 1
 
-
         name_input.SetValue(self.get_property_string("name"))
-        radiation_input.SetValue(self.get_property_string("radiation"))
         size_input.SetValue(self.metadata.beam_size)
         shape_input.SetValue(self.get_property_string("beam_shape"))