Changeset af84162 in sasview for src/sas/sasgui/perspectives/file_converter/converter_widgets.py

Timestamp:

Jul 14, 2016 11:00:04 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:

de0df2c

Parents:

3331e11

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/14/16 10:55:32)

git-committer:

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

Message:

Move detector metadata input to its own window

File:

• src/sas/sasgui/perspectives/file_converter/converter_widgets.py (modified) (7 diffs)

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

@@ -25 +25 @@
         self.control_name = control_name
         self._callback = callback
+        self._name = control_name
+
         self.labels = labels
         self.z_enabled = z_enabled
@@ -40 +42 @@
         return self._sizer
 
+    def GetName(self):
+        return self._name
+
     def GetValue(self):
         """
@@ -48 +53 @@
         v = Vector()
         if not self.Validate(): return v
-        for direction, control in self._inputs:
+        for direction, control in self._inputs.iteritems():
             try:
                 value = float(control.GetValue())
@@ -57 +62 @@
         return v
 
+    def SetValue(self, vector):
+        directions = ['x', 'y']
+        if self.z_enabled: directions.append('z')
+        for direction in directions:
+            value = getattr(vector, direction)
+            if value is None: value = ''
+            self._inputs[direction].SetValue(str(value))
+
     def Validate(self):
         """
         Validate the contents of the inputs
 
-        :return control_valid: Whether or not the inputs are valid
-        :return invalid_control: The control that is not valid
+        :return all_valid: Whether or not the inputs are valid
+        :return invalid_ctrl: A control that is not valid
             (or None if all are valid)
         """
+        all_valid = True
+        invalid_ctrl = None
         for control in self._inputs.values():
             if control.GetValue() == '': continue
@@ -70 +85 @@
             control_valid = check_float(control)
             if not control_valid:
-                return False, control
-        return True, None
+                all_valid = False
+                invalid_ctrl = control
+        return all_valid, invalid_ctrl
 
 
@@ -85 +101 @@
         x_input.Bind(wx.EVT_TEXT, self._callback)
 
-        self._sizer.AddSpacer((15, -1))
+        self._sizer.AddSpacer((10, -1))
 
         y_label = wx.StaticText(self.parent, -1, self.labels[1],
@@ -97 +113 @@
 
         if self.z_enabled:
-            self._sizer.AddSpacer((15, -1))
+            self._sizer.AddSpacer((10, -1))
 
             z_label = wx.StaticText(self.parent, -1, self.labels[2],