Changeset 2a7722b in sasview

Timestamp:

Jul 14, 2016 12:19:22 PM (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:

1aad14e

Parents:

de0df2c

Message:

Start adding sample metadata window

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

@@ -12 +12 @@
 from sas.sasgui.perspectives.file_converter.meta_panels import MetadataWindow
 from sas.sasgui.perspectives.file_converter.meta_panels import DetectorPanel
+from sas.sasgui.perspectives.file_converter.meta_panels import SamplePanel
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -17 +18 @@
 from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader
 from sas.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Sample
 from sas.sascalc.dataloader.data_info import Vector
 
@@ -55 +57 @@
             'run_name': None,
             'instrument': None,
-            'detector': [Detector()]
+            'detector': [Detector()],
+            'sample': Sample()
         }
         self.vectors = ['offset', 'orientation', 'pixel_size', 'beam_center']
@@ -194 +197 @@
         detector_frame.Show(True)
 
+    def show_sample_window(self, event):
+        if self.meta_frames != []:
+            for frame in self.meta_frames:
+                frame.panel.on_close()
+        sample_frame = MetadataWindow(SamplePanel,
+            parent=self.parent.manager.parent, manager=self,
+            metadata=self.metadata['sample'], title='Sample Metadata')
+        self.meta_frames.append(sample_frame)
+        self.parent.manager.put_icon(sample_frame)
+        sample_frame.Show(True)
+
     def metadata_changed(self, event):
         event.Skip()
@@ -300 +314 @@
         y += 1
 
+        sample_label = wx.StaticText(metadata_pane, -1, "Sample: ")
+        metadata_grid.Add(sample_label, (y,0), (1,1), wx.ALL | wx.EXPAND, 5)
+        sample_btn = wx.Button(metadata_pane, -1, "Enter Sample Metadata")
+        metadata_grid.Add(sample_btn, (y,1), (1,1), wx.ALL | wx.EXPAND, 5)
+        sample_btn.Bind(wx.EVT_BUTTON, self.show_sample_window)
+        y += 1
+
         metadata_pane.SetSizer(metadata_grid)
 

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

@@ -63 +63 @@
 
     def __init__(self, parent, detector, base=None, *args, **kwargs):
-        MetadataPanel.__init__(self, parent, detector, base, *args, **kwargs)
-
         if detector.name is None:
             detector.name = ''
+
+        MetadataPanel.__init__(self, parent, detector, base, *args, **kwargs)
 
         self._do_layout()
@@ -166 +166 @@
         self.SetSizer(vbox)
 
+class SamplePanel(MetadataPanel):
+
+    def __init__(self, parent, sample, base=None, *args, **kwargs):
+        MetadataPanel.__init__(self, parent, sample, base, *args, **kwargs)
+
+        self._do_layout()
+        self.SetAutoLayout(True)
+        self.Layout()
+
+    def on_close(self, event=None):
+        MetadataPanel.on_close(self, event)
+
+        self.parent.manager.metadata['sample'] = self.metadata
+        self.parent.on_close(event)
+
+    def _do_layout(self):
+        vbox = wx.BoxSizer(wx.VERTICAL)
+
+        section = wx.StaticBox(self, -1, "Sample")
+        section_sizer = wx.StaticBoxSizer(section, wx.VERTICAL)
+        section_sizer.SetMinSize((_STATICBOX_WIDTH, -1))
+
+        input_grid = wx.GridBagSizer(5, 5)
+
+        y = 0
+        name_label = wx.StaticText(self, -1, "Name: ")
+        input_grid.Add(name_label, (y,0), (1,1), wx.ALL, 5)
+        name_input = wx.TextCtrl(self, -1, name="name")
+        input_grid.Add(name_input, (y,1), (1,1))
+        name_input.Bind(wx.EVT_TEXT, self.on_change)
+        y += 1
+
+        id_label = wx.StaticText(self, -1, "ID: ")
+        input_grid.Add(id_label, (y,0), (1,1), wx.ALL, 5)
+        id_input = wx.TextCtrl(self, -1, name="ID")
+        input_grid.Add(id_input, (y,1), (1,1))
+        id_input.Bind(wx.EVT_TEXT, self.on_change)
+        y += 1
+
+        thickness_label = wx.StaticText(self, -1, "Thickness (mm): ")
+        input_grid.Add(thickness_label, (y,0), (1,1), wx.ALL, 5)
+        thickness_input = wx.TextCtrl(self, -1, name="thickness")
+        input_grid.Add(thickness_input, (y,1), (1,1))
+        thickness_input.Bind(wx.EVT_TEXT, self.on_change)
+        self._to_validate.append(thickness_input)
+        y += 1
+
+        name_input.SetValue(self.metadata.name)
+        id_input.SetValue(self.metadata.ID)
+        thickness = self.metadata.thickness
+        if thickness is None:
+            thickness = ''
+        thickness_input.SetValue(str(thickness))
+
+        done_btn = wx.Button(self, -1, "Done")
+        input_grid.Add(done_btn, (y,0), (1,1), wx.ALL, 5)
+        done_btn.Bind(wx.EVT_BUTTON, self.on_close)
+
+        section_sizer.Add(input_grid)
+        vbox.Add(section_sizer, flag=wx.ALL, border=10)
+
+        vbox.Fit(self)
+        self.SetSizer(vbox)
+
 class MetadataWindow(widget.CHILD_FRAME):