Changeset edf0e06 in sasview

Timestamp:

Aug 19, 2016 6:06:49 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:

9f4d891

Parents:

fe498b83

Message:

Refactor converter_panel.on_convert

File:

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

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

@@ -276 +276 @@
         return { 'frames': frames, 'inc': increment, 'file': single_file }
 
-    def on_convert(self, event):
-        """Called when the Convert button is clicked"""
-        if not self.validate_inputs():
-            return
-
-        self.sample.ID = self.title
-
-        try:
-            if self.data_type == 'ascii':
-                qdata = self.extract_ascii_data(self.q_input.GetPath())
-                iqdata = np.array([self.extract_ascii_data(self.iq_input.GetPath())])
-            elif self.data_type == 'otoko':
-                qdata, iqdata = self.extract_otoko_data(self.q_input.GetPath())
-            else: # self.data_type == 'bsl'
-
-                dataset = self.extract_bsl_data(self.iq_input.GetPath())
-                if dataset is None:
-                    # Cancelled by user
-                    return
-
-                w = NXcanSASWriter()
-                w.write(dataset, self.output.GetPath())
-
-                wx.PostEvent(self.parent.manager.parent,
-                    StatusEvent(status="Conversion completed."))
-                return
-
-        except Exception as ex:
-            msg = str(ex)
-            wx.PostEvent(self.parent.manager.parent,
-                StatusEvent(status=msg, info='error'))
-            return
-
+    def get_metadata(self):
+        # Prepare the metadata for writing to a file
+        if self.run is None:
+            self.run = []
+        elif not isinstance(self.run, list):
+            self.run = [self.run]
+
+        if self.title is None:
+            self.title = ''
+
+        metadata = {
+            'title': self.title,
+            'run': self.run,
+            'instrument': self.instrument,
+            'detector': [self.detector],
+            'sample': self.sample,
+            'source': self.source
+        }
+
+        return metadata
+
+    def convert_1d_data(self, qdata, iqdata):
+        """
+        Formats a 1D array of q_axis data and a 2D array of I axis data (where
+        each row of iqdata is a separate row), into an array of Data1D objects
+        """
         frames = []
         increment = 1
@@ -326 +319 @@
 
         output_path = self.output.GetPath()
-
-        # Prepare the metadata for writing to a file
-        if self.run is None:
-            self.run = []
-        elif not isinstance(self.run, list):
-            self.run = [self.run]
-
-        if self.title is None:
-            self.title = ''
-
-        metadata = {
-            'title': self.title,
-            'run': self.run,
-            'instrument': self.instrument,
-            'detector': [self.detector],
-            'sample': self.sample,
-            'source': self.source
-        }
+        metadata = self.get_metadata()
 
         frame_data = {}
@@ -362 +338 @@
                     setattr(datainfo, key, value)
 
-
         self.convert_to_cansas(frame_data, output_path, single_file)
+
+    def on_convert(self, event):
+        """Called when the Convert button is clicked"""
+        if not self.validate_inputs():
+            return
+
+        self.sample.ID = self.title
+
+        try:
+            if self.data_type == 'ascii':
+                qdata = self.extract_ascii_data(self.q_input.GetPath())
+                iqdata = np.array([self.extract_ascii_data(self.iq_input.GetPath())])
+                self.convert_1d_data(qdata, iqdata)
+            elif self.data_type == 'otoko':
+                qdata, iqdata = self.extract_otoko_data(self.q_input.GetPath())
+                self.convert_1d_data(qdata, iqdata)
+            else: # self.data_type == 'bsl'
+                dataset = self.extract_bsl_data(self.iq_input.GetPath())
+                if dataset is None:
+                    # Cancelled by user
+                    return
+
+                metadata = self.get_metadata()
+                for key, value in metadata.iteritems():
+                    setattr(dataset[0], key, value)
+
+                w = NXcanSASWriter()
+                w.write(dataset, self.output.GetPath())
+        except Exception as ex:
+            msg = str(ex)
+            wx.PostEvent(self.parent.manager.parent,
+                StatusEvent(status=msg, info='error'))
+            return
+
         wx.PostEvent(self.parent.manager.parent,
             StatusEvent(status="Conversion completed."))
@@ -454 +463 @@
             self.q_input.SetPath("")
             self.q_input.Disable()
-            self.radiation_input.Disable()
-            self.metadata_section.Collapse()
-            self.on_collapsible_pane(None)
-            self.metadata_section.Disable()
+            # self.radiation_input.Disable()
+            # self.metadata_section.Collapse()
+            # self.on_collapsible_pane(None)
+            # self.metadata_section.Disable()
             self.output.SetWildcard("NXcanSAS HDF5 File (*.h5)|*.h5")
         else: