Changeset af84162 in sasview

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

Location:

src/sas/sasgui/perspectives/file_converter

Files:

• converter_panel.py (modified) (4 diffs)
• converter_widgets.py (modified) (7 diffs)
• detector_panel.py (added)

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

@@ -10 +10 @@
 from sas.sasgui.perspectives.calculator import calculator_widgets as widget
 from sas.sasgui.perspectives.file_converter.converter_widgets import VectorInput
+from sas.sasgui.perspectives.file_converter.detector_panel import DetectorWindow
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -41 +42 @@
         self.base = base
         self.parent = parent
+        self.detector_frame = None
 
         self.q_input = None
@@ -180 +182 @@
         return True
 
+    def show_detector_window(self, event):
+        if self.detector_frame is not None:
+            self.detector_frame.panel.on_close()
+            return
+        self.detector_frame = DetectorWindow(self.parent.manager.parent,
+            manager=self, detector=self.metadata['detector'][0])
+        self.parent.manager.put_icon(self.detector_frame)
+        self.detector_frame.Show(True)
 
     def metadata_changed(self, event):
@@ -282 +292 @@
             "Detector:")
         metadata_grid.Add(detector_label, (y, 0), (1,1), wx.ALL | wx.EXPAND, 5)
+        detector_btn = wx.Button(metadata_pane, -1, "Enter Detector Metadata")
+        metadata_grid.Add(detector_btn, (y, 1), (1,1), wx.ALL | wx.EXPAND, 5)
+        detector_btn.Bind(wx.EVT_BUTTON, self.show_detector_window)
         y += 1
-
-        name_label = wx.StaticText(metadata_pane, -1, "Name: ")
-        metadata_grid.Add(name_label, (y, 1), (1,1))
-
-        name_input = wx.TextCtrl(metadata_pane,
-            name="detector_name", size=(_STATICBOX_WIDTH-80-55, -1))
-        metadata_grid.Add(name_input, (y, 2), (1,1))
-        name_input.Bind(wx.EVT_TEXT, self.metadata_changed)
-        y += 1
-
-        distance_label = wx.StaticText(metadata_pane, -1,
-            "Distance (mm): ")
-        metadata_grid.Add(distance_label, (y, 1), (1,1))
-
-        distance_input = wx.TextCtrl(metadata_pane, -1,
-            name="detector_distance", size=(50,-1))
-        metadata_grid.Add(distance_input, (y,2), (1,1))
-        self.to_validate.append(distance_input)
-        distance_input.Bind(wx.EVT_TEXT, self.metadata_changed)
-        y += 1
-
-        offset_label = wx.StaticText(metadata_pane, -1,
-            "Offset (m): ")
-        metadata_grid.Add(offset_label, (y,1), (1,1))
-
-        offset_input = VectorInput(metadata_pane, "detector_offset",
-            callback=self.metadata_changed)
-        self.to_validate.append(offset_input)
-        metadata_grid.Add(offset_input.GetSizer(), (y,2), (1,1), wx.BOTTOM, 5)
-        y += 1
-
-        orientation_label = wx.StaticText(metadata_pane, -1,
-            u"Orientation (\xb0): ")
-        metadata_grid.Add(orientation_label, (y, 1), (1, 1))
-
-        orientation_input = VectorInput(metadata_pane, "detector_orientation",
-            callback=self.metadata_changed, z_enabled=True,
-            labels=["Roll: ", "Pitch: ", "Yaw: "])
-        self.to_validate.append(orientation_input)
-        metadata_grid.Add(orientation_input.GetSizer(),
-            (y,2), (1,1), wx.BOTTOM, 5)
-        y += 1
-
-        pixel_label = wx.StaticText(metadata_pane, -1, "Pixel Size (mm): ")
-        metadata_grid.Add(pixel_label, (y,1), (1,1))
-
-        pixel_input = VectorInput(metadata_pane, "detector_pixel_size",
-             callback=self.metadata_changed)
-        self.to_validate.append(pixel_input)
-        metadata_grid.Add(pixel_input.GetSizer(), (y,2), (1,1), wx.BOTTOM, 5)
-        y += 1
-
-        beam_label = wx.StaticText(metadata_pane, -1, "Beam Center (mm): ")
-        metadata_grid.Add(beam_label, (y,1), (1,1))
-        beam_input = VectorInput(metadata_pane, "detector_beam_center",
-            callback=self.metadata_changed)
-        self.to_validate.append(beam_input)
-        metadata_grid.Add(beam_input.GetSizer(), (y,2), (1,1), wx.BOTTOM, 5)
-        y += 1
-
-        slit_label = wx.StaticText(metadata_pane, -1, "Slit Length (mm): ")
-        metadata_grid.Add(slit_label, (y,1), (1,1))
-        slit_input = wx.TextCtrl(metadata_pane, -1, size=(50,-1),
-            name="detector_slit_length")
-        self.to_validate.append(slit_input)
-        slit_input.Bind(wx.EVT_TEXT, self.metadata_changed)
-        metadata_grid.Add(slit_input, (y,2), (1,1), wx.BOTTOM, 5)
 
         metadata_pane.SetSizer(metadata_grid)

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],