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

Timestamp:

Jul 21, 2016 10:47:25 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:

94f4518

Parents:

8976865

Message:

Support loading BSL/OTOKO files with multiple frames

File:

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

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

@@ -14 +14 @@
 from sas.sasgui.perspectives.file_converter.meta_panels import SamplePanel
 from sas.sasgui.perspectives.file_converter.meta_panels import SourcePanel
+from sas.sasgui.perspectives.file_converter.frame_select_dialog import FrameSelectDialog
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
@@ -105 +106 @@
         return np.array(data, dtype=np.float32)
 
+    def ask_frame_range(self, n_frames):
+        valid_input = False
+        dlg = FrameSelectDialog(n_frames)
+        frames = None
+        increment = None
+        while not valid_input:
+            if dlg.ShowModal() == wx.ID_OK:
+                msg = ""
+                try:
+                    first_frame = int(dlg.first_input.GetValue())
+                    last_frame = int(dlg.last_input.GetValue())
+                    increment = int(dlg.increment_input.GetValue())
+                    if last_frame < 0 or first_frame < 0:
+                        msg = "Frame values must be positive"
+                    elif increment < 1:
+                        msg = "Increment must be greater than or equal to 1"
+                    elif first_frame > last_frame:
+                        msg = "First frame must be less than last frame"
+                    elif last_frame > n_frames:
+                        msg = "Last frame must be less than {}".format(n_frames)
+                    else:
+                        valid_input = True
+                except:
+                    valid_input = False
+                    msg = "Please enter valid integer values"
+
+                if not valid_input:
+                    wx.PostEvent(self.parent.manager.parent,
+                        StatusEvent(status=msg))
+            else:
+                return [], 0
+        frames = range(first_frame, last_frame + increment,
+            increment)
+        return frames, increment
+
     def on_convert(self, event):
         if not self.validate_inputs():
@@ -120 +156 @@
                 bsl_data = loader.load_bsl_data()
                 qdata = bsl_data.q_axis.data[0]
-                iqdata = bsl_data.data_axis.data[0]
+                iqdata = bsl_data.data_axis.data
+                frames = [iqdata.shape[0]]
+                increment = 1
+                if frames[0] > 3:
+                    frames, increment = self.ask_frame_range(frames[0])
+                    if frames == []: return
         except Exception as ex:
             msg = str(ex)
@@ -128 +169 @@
 
         output_path = self.output.GetPath()
-        data = Data1D(x=qdata, y=iqdata)
-        data.filename = output_path.split('\\')[-1]
 
         if self.run is None:
@@ -148 +187 @@
         }
 
+        frame_data = []
+        for i in frames:
+            data = Data1D(x=qdata, y=iqdata[i])
+            frame_data.append(data)
+        # Only need to set metadata on first Data1D object
+        frame_data[0].filename = output_path.split('\\')[-1]
         for key, value in metadata.iteritems():
-            setattr(data, key, value)
-
-        self.convert_to_cansas(data, output_path)
+            setattr(frame_data[0], key, value)
+
+        self.convert_to_cansas(frame_data, output_path)
         wx.PostEvent(self.parent.manager.parent,
             StatusEvent(status="Conversion completed."))