Changeset de0df2c in sasview

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?

Location:

src/sas/sasgui/perspectives/file_converter

Files:

• converter_panel.py (modified) (3 diffs)
• meta_panels.py (moved) (moved from src/sas/sasgui/perspectives/file_converter/detector_panel.py) (7 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):

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

@@ -20 +20 @@
     FONT_VARIANT = 1
 
-class DetectorPanel(ScrolledPanel, PanelBase):
+class MetadataPanel(ScrolledPanel, PanelBase):
 
-    def __init__(self, parent, detector, base=None, *args, **kwargs):
+    def __init__(self, parent, metadata, base=None, *args, **kwargs):
         ScrolledPanel.__init__(self, parent, *args, **kwargs)
         PanelBase.__init__(self)
@@ -28 +28 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
 
-        if detector.name is None:
-            detector.name = ''
-
         self.base = base
         self.parent = parent
-        self.detector = detector
         self._to_validate = []
         self._vectors = []
-
-        self._do_layout()
-        self.SetAutoLayout(True)
-        self.Layout()
+        self.metadata = metadata
 
     def on_change(self, event):
@@ -45 +38 @@
         value = ctrl.GetValue()
         if value == '': value = None
-        setattr(self.detector, ctrl.GetName(), value)
+        setattr(self.metadata, ctrl.GetName(), value)
 
     def on_close(self, event=None):
@@ -65 +58 @@
                     StatusEvent(status=msg, info='error'))
                 return
-            setattr(self.detector, vector_in.GetName(), vector_in.GetValue())
+            setattr(self.metadata, vector_in.GetName(), vector_in.GetValue())
 
+class DetectorPanel(MetadataPanel):
+
+    def __init__(self, parent, detector, base=None, *args, **kwargs):
+        MetadataPanel.__init__(self, parent, detector, base, *args, **kwargs)
+
+        if detector.name is None:
+            detector.name = ''
+
+        self._do_layout()
+        self.SetAutoLayout(True)
+        self.Layout()
+
+    def on_close(self, event=None):
+        MetadataPanel.on_close(self, event)
+
+        self.parent.manager.metadata['detector'] = [self.metadata]
         self.parent.on_close(event)
 
@@ -140 +149 @@
         vbox.Add(section_sizer, flag=wx.ALL, border=10)
 
-        name_input.SetValue(self.detector.name)
-        distance = self.detector.distance
+        name_input.SetValue(self.metadata.name)
+        distance = self.metadata.distance
         if distance is None: distance = ''
         elif '.' not in distance: distance += '.0'
         distance_input.SetValue(str(distance))
-        offset_input.SetValue(self.detector.offset)
-        orientation_input.SetValue(self.detector.orientation)
-        pixel_input.SetValue(self.detector.pixel_size)
-        beam_input.SetValue(self.detector.beam_center)
-        slit_len = self.detector.slit_length
+        offset_input.SetValue(self.metadata.offset)
+        orientation_input.SetValue(self.metadata.orientation)
+        pixel_input.SetValue(self.metadata.pixel_size)
+        beam_input.SetValue(self.metadata.beam_center)
+        slit_len = self.metadata.slit_length
         if slit_len is None: slit_len = ''
         elif '.' not in slit_len: slit_len += '.0'
@@ -157 +166 @@
         self.SetSizer(vbox)
 
-class DetectorWindow(widget.CHILD_FRAME):
+class MetadataWindow(widget.CHILD_FRAME):
 
-    def __init__(self, parent=None, title='Detector Metadata', base=None,
-        manager=None, size=(PANEL_SIZE, PANEL_SIZE*0.8), detector=None,
+    def __init__(self, PanelClass, parent=None, title='', base=None,
+        manager=None, size=(PANEL_SIZE, PANEL_SIZE*0.8), metadata=None,
          *args, **kwargs):
         kwargs['title'] = title
@@ -167 +176 @@
 
         self.manager = manager
-        self.panel = DetectorPanel(self, detector, base=None)
+        self.panel = PanelClass(self, metadata, base=None)
         self.Bind(wx.EVT_CLOSE, self.on_close)
 
     def on_close(self, event):
         if self.manager is not None:
-            self.manager.detector_frame = None
-            self.manager.metadata['detector'] = [self.panel.detector]
+            self.manager.meta_frames.remove(self)
         self.Destroy()