Changeset 503cc34 in sasview for src/sas

Timestamp:

Jul 20, 2016 10:00:51 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:

7c8ddb83

Parents:

91807fc

Message:

Refactor metadata dict into private variables

Location:

src/sas/sasgui/perspectives/file_converter

Files:

• converter_panel.py (modified) (10 diffs)
• meta_panels.py (modified) (3 diffs)

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

@@ -56 +56 @@
         self.data_type = "ascii"
 
-        self.metadata = {
-            'title': None,
-            'run': None,
-            'run_name': None,
-            'instrument': None,
-            'detector': [Detector()],
-            'sample': Sample(),
-            'source': Source()
-        }
-
-        self.metadata['detector'][0].name = ''
-        self.metadata['source'].radiation = 'neutron'
+        self.title = None
+        self.run = None
+        self.run_name = None
+        self.instrument = None
+        self.detector = Detector()
+        self.sample = Sample()
+        self.source = Source()
+        self.properties = ['title', 'run', 'run_name', 'instrument']
+
+        self.detector.name = ''
+        self.source.radiation = 'neutron'
 
         self._do_layout()
@@ -106 +105 @@
             return
 
-        self.metadata['sample'].ID = self.metadata['title']
+        self.sample.ID = self.title
 
         try:
@@ -128 +127 @@
         data.filename = output_path.split('\\')[-1]
 
-        if self.metadata['run'] is not None:
-            run = self.metadata['run']
-            run_name = self.metadata['run_name']
+        if self.run is not None:
+            run = self.run
+            run_name = self.run_name
 
             if not isinstance(run, list) and run is not None:
-                self.metadata['run'] = [run]
+                self.run = [run]
             else:
                 run = run[0]
@@ -139 +138 @@
             if not isinstance(run_name, dict):
                 if run_name is not None:
-                    self.metadata['run_name'] = { run: run_name }
+                    self.run_name = { run: run_name }
                 else:
-                    self.metadata['run_name'] = {}
+                    self.run_name = {}
             elif run_name != {}:
-                self.metadata['run_name'][run] = run_name.values()[0]
+                self.run_name[run] = run_name.values()[0]
         else:
-            self.metadata['run'] = []
-            self.metadata['run_name'] = {}
-
-        for attr, value in self.metadata.iteritems():
-            if value is not None:
-                setattr(data, attr, value)
+            self.run = []
+            self.run_name = {}
+
+        metadata = {
+            'title': self.title,
+            'run': self.run,
+            'run_name': self.run_name,
+            'intrument': self.instrument,
+            'detector': [self.detector],
+            'sample': self.sample,
+            'source': self.source
+        }
+
+        for key, value in metadata.iteritems():
+            setattr(data, key, value)
 
         self.convert_to_cansas(data, output_path)
@@ -183 +191 @@
         detector_frame = MetadataWindow(DetectorPanel,
             parent=self.parent.manager.parent, manager=self,
-            metadata=self.metadata['detector'][0], title='Detector Metadata')
+            metadata=self.detector, title='Detector Metadata')
         self.meta_frames.append(detector_frame)
         self.parent.manager.put_icon(detector_frame)
@@ -194 +202 @@
         sample_frame = MetadataWindow(SamplePanel,
             parent=self.parent.manager.parent, manager=self,
-            metadata=self.metadata['sample'], title='Sample Metadata')
+            metadata=self.sample, title='Sample Metadata')
         self.meta_frames.append(sample_frame)
         self.parent.manager.put_icon(sample_frame)
@@ -205 +213 @@
         source_frame = MetadataWindow(SourcePanel,
             parent=self.parent.manager.parent, manager=self,
-            metadata=self.metadata['source'], title="Source Metadata")
+            metadata=self.source, title="Source Metadata")
         self.meta_frames.append(source_frame)
         self.parent.manager.put_icon(source_frame)
@@ -224 +232 @@
         event.Skip()
         rtype = event.GetEventObject().GetValue().lower()
-        self.metadata['source'].radiation = rtype
+        self.source.radiation = rtype
 
     def metadata_changed(self, event):
@@ -232 +240 @@
         value = textbox.GetValue().strip()
 
-        if value == '':
-            self.metadata[attr] = None
-        else:
-            self.metadata[attr] = value
+        if value == '': value = None
+
+        setattr(self, attr, value)
 
 
@@ -332 +339 @@
 
         y = 0
-        windows = ['detector', 'sample', 'source']
-        for item in self.metadata.keys():
-            # Don't make fields for properties that have their own windows
-            if item in windows: continue
+        for item in self.properties:
             label_txt = item.replace('_', ' ').capitalize()
             label = wx.StaticText(metadata_pane, -1, label_txt,

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

@@ -92 +92 @@
             return
 
-        self.parent.manager.metadata['detector'] = [self.metadata]
+        self.parent.manager.detector = self.metadata
         self.parent.on_close(event)
 
@@ -194 +194 @@
             return
 
-        self.parent.manager.metadata['sample'] = self.metadata
+        self.parent.manager.sample = self.metadata
         self.parent.on_close(event)
 
@@ -305 +305 @@
             return
 
-        self.parent.manager.metadata['source'] = self.metadata
+        self.parent.manager.source = self.metadata
         self.parent.on_close(event)