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

Timestamp:

Jul 14, 2016 11:59:05 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:

2a7722b

Parents:

af84162

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/14/16 11:38:21)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/14/16 11:59:05)

Message:

Abstract MetadataPanel? from DetectorPanel?

File:

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

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.perspectives.file_converter.meta_panels import MetadataWindow
+from sas.sasgui.perspectives.file_converter.meta_panels import DetectorPanel
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.dataFitting import Data1D
@@ -42 +43 @@
         self.base = base
         self.parent = parent
-        self.detector_frame = None
+        self.meta_frames = []
 
         self.q_input = None
@@ -183 +184 @@
 
     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)
+        if self.meta_frames != []:
+            for frame in self.meta_frames:
+                frame.panel.on_close()
+        detector_frame = MetadataWindow(DetectorPanel,
+            parent=self.parent.manager.parent, manager=self,
+            metadata=self.metadata['detector'][0], title='Detector Metadata')
+        self.meta_frames.append(detector_frame)
+        self.parent.manager.put_icon(detector_frame)
+        detector_frame.Show(True)
 
     def metadata_changed(self, event):