Changeset 8b633dd in sasview

Timestamp:

Jul 14, 2016 6:32:49 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:

3331e11

Parents:

c9a519f

Message:

Complete detector metadata fields

File:

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

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

@@ -54 +54 @@
             'detector': [Detector()]
         }
-        self.vectors = ['offset', 'orientation', 'pixel_size']
+        self.vectors = ['offset', 'orientation', 'pixel_size', 'beam_center']
         for vector_name in self.vectors:
             setattr(self.metadata['detector'][0], vector_name, Vector())
@@ -287 +287 @@
 
         distance_label = wx.StaticText(metadata_pane, -1,
-            "Distance (mm):")
+            "Distance (mm): ")
         metadata_grid.Add(distance_label, (y, 1), (1,1))
 
@@ -319 +319 @@
         y += 1
 
-        pixel_label = wx.StaticText(metadata_pane, -1, "Pixel Size (mm):")
+        pixel_label = wx.StaticText(metadata_pane, -1, "Pixel Size (mm): ")
         metadata_grid.Add(pixel_label, (y,1), (1,1))
 
@@ -326 +326 @@
         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)