Changeset f2b3f28 in sasview

Timestamp:

Jul 13, 2016 7:13:41 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:

36f4debb

Parents:

ff790b3

Message:

Allow user to input some CanSAS metadata

File:

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

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

@@ -12 +12 @@
 from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader
+from sas.sascalc.dataloader.data_info import Detector
 
 # Panel size
@@ -42 +43 @@
         self.output = None
 
+        self.metadata = {
+            'title': None,
+            'run': None,
+            'run_name': None,
+            'instrument': None,
+            'detector': None,
+        }
+
         self._do_layout()
         self.SetAutoLayout(True)
@@ -85 +94 @@
             return
 
+        output_path = self.output.GetPath()
         data = Data1D(x=qdata, y=iqdata)
-        self.convert_to_cansas(data, self.output.GetPath())
+        data.filename = output_path.split('\\')[-1]
+
+        if self.metadata['run'] is not None:
+            run = self.metadata['run']
+            run_name = self.metadata['run_name']
+            self.metadata['run'] = [run]
+            if run_name is not None:
+                self.metadata['run_name'] = { run: run_name }
+        if self.metadata['detector'] is not None:
+            name = self.metadata['detector']
+            detector = Detector()
+            detector.name = name
+            self.metadata['detector'] = [detector]
+
+        for attr, value in self.metadata.iteritems():
+            setattr(data, attr, value)
+
+        self.convert_to_cansas(data, output_path)
         wx.PostEvent(self.parent.manager.parent,
             StatusEvent(status="Conversion completed."))
 
+    def metadata_changed(self, event):
+        event.Skip()
+        textbox = event.GetEventObject()
+        attr = textbox.GetName()
+        value = textbox.GetValue().strip()
+        if value == '':
+            self.metadata[attr] = None
+        else:
+            self.metadata[attr] = value
+
+
     def _do_layout(self):
-        vbox = wx.GridBagSizer(wx.VERTICAL)
+        vbox = wx.BoxSizer(wx.VERTICAL)
 
         instructions = ("Select the 1 column ASCII files containing the Q Axis"
@@ -99 +137 @@
             size=(_STATICBOX_WIDTH+40, -1))
         instruction_label.Wrap(_STATICBOX_WIDTH+40)
-        vbox.Add(instruction_label, (0,0), (1,1), wx.TOP | wx.LEFT | wx.RIGHT, 5)
+        vbox.Add(instruction_label, flag=wx.TOP | wx.LEFT | wx.RIGHT, border=5)
 
         section = wx.StaticBox(self, -1)
@@ -139 +177 @@
         section_sizer.Add(input_grid)
 
-        vbox.Add(section_sizer, (1,0), (1,1), wx.ALL, 5)
+        vbox.Add(section_sizer, flag=wx.ALL, border=5)
+
+        metadata_section = wx.CollapsiblePane(self, -1, "Metadata",
+            size=(_STATICBOX_WIDTH+40, -1))
+
+        metadata_grid = wx.GridBagSizer(5, 5)
+
+        y = 0
+        for item in self.metadata.keys():
+            label = wx.StaticText(metadata_section.GetPane(), -1, item,
+                style=wx.ALIGN_CENTER_VERTICAL)
+            input_box = wx.TextCtrl(metadata_section.GetPane(), name=item,
+                size=(_STATICBOX_WIDTH-80, -1))
+            input_box.Bind(wx.EVT_TEXT, self.metadata_changed)
+            metadata_grid.Add(label, (y,0), (1,1),
+                wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+            metadata_grid.Add(input_box, (y,1), (1,1), wx.EXPAND)
+            y += 1
+
+        metadata_section.GetPane().SetSizer(metadata_grid)
+
+        vbox.Add(metadata_section, proportion=0, flag=wx.ALL, border=5)
 
         vbox.Fit(self)