Changeset 55bc56bc in sasview for src/sas/sasgui/perspectives/file_converter/converter_panel.py

Timestamp:

Jul 19, 2016 11:08:42 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:

bf23693

Parents:

a027549

Message:

Add source metadata

File:

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

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

@@ -13 +13 @@
 from sas.sasgui.perspectives.file_converter.meta_panels import DetectorPanel
 from sas.sasgui.perspectives.file_converter.meta_panels import SamplePanel
+from sas.sasgui.perspectives.file_converter.meta_panels import SourcePanel
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -20 +21 @@
 from sas.sascalc.dataloader.data_info import Detector
 from sas.sascalc.dataloader.data_info import Sample
+from sas.sascalc.dataloader.data_info import Source
 from sas.sascalc.dataloader.data_info import Vector
 
@@ -59 +61 @@
             'instrument': None,
             'detector': [Detector()],
-            'sample': Sample()
+            'sample': Sample(),
+            'source': Source()
         }
 
@@ -186 +189 @@
         sample_frame.Show(True)
 
+    def show_source_window(self, event):
+        if self.meta_frames != []:
+            for frame in self.meta_frames:
+                frame.panel.on_close()
+        source_frame = MetadataWindow(SourcePanel,
+            parent=self.parent.manager.parent, manager=self,
+            metadata=self.metadata['source'], title="Source Metadata")
+        self.meta_frames.append(source_frame)
+        self.parent.manager.put_icon(source_frame)
+        source_frame.Show(True)
+
     def on_collapsible_pane(self, event):
         self.Freeze()
@@ -289 +303 @@
 
         y = 0
+        windows = ['detector', 'sample', 'source']
         for item in self.metadata.keys():
-            if item == 'detector' or item == 'sample': continue
+            if item in windows: continue
             label_txt = item.replace('_', ' ').capitalize()
             label = wx.StaticText(metadata_pane, -1, label_txt,
@@ -317 +332 @@
         y += 1
 
+        source_label = wx.StaticText(metadata_pane, -1, "Source: ")
+        metadata_grid.Add(source_label, (y,0), (1,1), wx.ALL | wx.EXPAND, 5)
+        source_btn = wx.Button(metadata_pane, -1, "Enter Source Metadata")
+        source_btn.Bind(wx.EVT_BUTTON, self.show_source_window)
+        metadata_grid.Add(source_btn, (y,1), (1,1), wx.ALL | wx.EXPAND, 5)
+        y += 1
+
         metadata_pane.SetSizer(metadata_grid)