Changeset 9318c4e in sasview

Timestamp:

Jul 19, 2016 4:48:06 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:

3a9801f

Parents:

1aad14e

Message:

Remove redundant logic from converter_panel

Location:

src/sas/sasgui/perspectives/file_converter

Files:

• converter_panel.py (modified) (6 diffs)
• meta_panels.py (modified) (1 diff)

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

@@ -50 +50 @@
         self.iq_input = None
         self.output = None
-        self.to_validate = []
 
         self.metadata = {
@@ -60 +59 @@
             'sample': Sample()
         }
-        self.vectors = ['offset', 'orientation', 'pixel_size', 'beam_center']
-        for vector_name in self.vectors:
-            setattr(self.metadata['detector'][0], vector_name, Vector())
 
         self._do_layout()
@@ -128 +124 @@
                 else:
                     self.metadata['run_name'] = {}
-            else:
+            elif run_name != {}:
                 self.metadata['run_name'][run] = run_name.values()[0]
         else:
             self.metadata['run'] = []
             self.metadata['run_name'] = {}
-        if self.metadata['detector'][0].name is None:
-            self.metadata['detector'][0].name = ''
-
-        # Convert vectors from strings to float
-        for vector_name in self.vectors:
-            # Vector of strings or Nones
-            vector = getattr(self.metadata['detector'][0], vector_name)
-            for direction in ['x', 'y', 'z']:
-                value = getattr(vector, direction)
-                if value is not None:
-                    value = float(value)
-                    setattr(vector, direction, value)
-            setattr(self.metadata['detector'][0], vector_name, vector)
 
         for attr, value in self.metadata.iteritems():
@@ -168 +151 @@
             return
 
-        for ctrl in self.to_validate:
-            ctrl_valid = True
-            invalid_control = None
-            if isinstance(ctrl, VectorInput):
-                ctrl_valid, invalid_control = ctrl.Validate()
-            else:
-                if ctrl.GetValue() == '': continue
-                ctrl_valid = check_float(ctrl)
-                invalid_control = ctrl
-            if not ctrl_valid:
-                msg = "{} must be a valid float".format(
-                    invalid_control.GetName().replace('_', ' '))
-                wx.PostEvent(self.parent.manager.parent,
-                    StatusEvent(status=msg, info='error'))
-                return False
-
         return True
 
@@ -214 +181 @@
         value = textbox.GetValue().strip()
 
-        if attr.startswith('detector_'):
-            attr = attr[9:] # Strip detector_
-            is_vector = False
-            for vector_name in self.vectors:
-                if attr.startswith(vector_name): is_vector = True
-            if is_vector:
-                if value == '': value = None
-                direction = attr[-1]
-                attr = attr[:-2]
-                vector = getattr(self.metadata['detector'][0], attr)
-                setattr(vector, direction, value)
-                value = vector
-            setattr(self.metadata['detector'][0], attr, value)
-            return
-
         if value == '':
             self.metadata[attr] = None
@@ -294 +246 @@
         y = 0
         for item in self.metadata.keys():
-            if item == 'detector': continue
+            if item == 'detector' or item == 'sample': continue
             label_txt = item.replace('_', ' ').capitalize()
             label = wx.StaticText(metadata_pane, -1, label_txt,

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

@@ -39 +39 @@
             value = ''
             is_float = False
+        if isinstance(value, list):
+            value = value[0]
         value = str(value)
         if is_float and not '.' in value: value += '.0'