Changeset 05595c4 in sasview for src/sas

Timestamp:

Aug 8, 2016 4:57:45 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:

489bb46

Parents:

535e181

Message:

Finish implementing 2D BSL loader

Location:

src/sas/sasgui/perspectives/file_converter

Files:

• converter_panel.py (modified) (9 diffs)
• frame_select_dialog.py (modified) (3 diffs)

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

@@ -5 +5 @@
 import wx
 import sys
+import os
 import numpy as np
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -21 +22 @@
 from sas.sasgui.guiframe.utils import check_float
 from sas.sasgui.perspectives.file_converter.cansas_writer import CansasWriter
+from sas.sascalc.dataloader.readers.red2d_reader import Reader as Red2DWriter
 from sas.sasgui.perspectives.file_converter.bsl_loader import BSLLoader as OTOKOLoader
 from sas.sascalc.file_converter.bsl_loader import BSLLoader
@@ -136 +138 @@
     def ask_frame_range(self, n_frames):
         valid_input = False
-        dlg = FrameSelectDialog(n_frames)
+        is_bsl = (self.data_type == 'bsl')
+        dlg = FrameSelectDialog(n_frames, is_bsl)
         frames = None
         increment = None
@@ -147 +150 @@
                     last_frame = int(dlg.last_input.GetValue())
                     increment = int(dlg.increment_input.GetValue())
-                    single_file = dlg.single_btn.GetValue()
+                    if not is_bsl:
+                        single_file = dlg.single_btn.GetValue()
+
                     if last_frame < 0 or first_frame < 0:
                         msg = "Frame values must be positive"
@@ -154 +159 @@
                     elif first_frame > last_frame:
                         msg = "First frame must be less than last frame"
-                    elif last_frame > n_frames:
+                    elif last_frame >= n_frames:
                         msg = "Last frame must be less than {}".format(n_frames)
                     else:
@@ -189 +194 @@
                     params = self.ask_frame_range(loader.n_frames)
                     frames = params['frames']
-                data = []
+                data = {}
+
                 for frame in frames:
                     loader.frame = frame
-                    data.append(loader.load_data())
-                data = data[0]
+                    data[frame] = loader.load_data()
+
+                # TODO: Tidy this up
+                # Prepare axes values (arbitrary scale)
                 data_x = []
                 data_y = range(loader.n_pixels) * loader.n_rasters
-                data_i = data.reshape((loader.n_pixels*loader.n_rasters,1))
                 for i in range(loader.n_rasters):
                     data_x += [i] * loader.n_pixels
-                import pdb; pdb.set_trace()
-                data_info = Data2D(data=data_i, qx_data=data_x, qy_data=data_y)
-                from sas.sascalc.dataloader.readers.red2d_reader import Reader as Writer2D
-                writer = Writer2D()
-                writer.write(self.output.GetPath(), data_info)
+
+                file_path = self.output.GetPath()
+                filename = os.path.split(file_path)[-1]
+                file_path = os.path.split(file_path)[0]
+                for i, frame in data.iteritems():
+                    # If more than 1 frame is being exported, append the frame
+                    # number to the filename
+                    if len(data) > 1:
+                        frame_filename = filename.split('.')
+                        frame_filename[0] += str(i+1)
+                        frame_filename = '.'.join(frame_filename)
+                    else:
+                        frame_filename = filename
+
+                    data_i = frame.reshape((loader.n_pixels*loader.n_rasters,1))
+                    data_info = Data2D(data=data_i, qx_data=data_x, qy_data=data_y)
+                    writer = Red2DWriter()
+                    writer.write(os.path.join(file_path, frame_filename), data_info)
+
                 wx.PostEvent(self.parent.manager.parent,
                     StatusEvent(status="Conversion completed."))
@@ -217 +238 @@
         increment = 1
         single_file = True
+        n_frames = iqdata.shape[0]
         # Standard file has 3 frames: SAS, calibration and WAS
-        if iqdata.shape[0] > 3:
+        if n_frames > 3:
             # File has multiple frames
-            params = self.ask_frame_range(frames[0])
+            params = self.ask_frame_range(n_frames)
             frames = params['frames']
             increment = params['inc']
@@ -333 +355 @@
         self.data_type = dtype
         if dtype == 'bsl':
+            self.q_input.SetPath("")
             self.q_input.Disable()
         else:
@@ -425 +448 @@
             message="Chose where to save the output file.",
             style=wx.FLP_SAVE | wx.FLP_OVERWRITE_PROMPT | wx.FLP_USE_TEXTCTRL,
-            wildcard="*.xml")
+            wildcard="CanSAS 1D (*.xml)|*.xml|Red2D (*.dat)|*.dat")
         input_grid.Add(self.output, (y,1), (1,1), wx.ALL, 5)
         y += 1

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

@@ -3 +3 @@
 class FrameSelectDialog(wx.Dialog):
 
-    def __init__(self, n_frames):
+    def __init__(self, n_frames, is_bsl=False):
         wx.Dialog.__init__(self, None, title="Select Frames")
 
@@ -40 +40 @@
         y += 1
 
-        export_label = wx.StaticText(self, -1, "Export each frame to:")
-        sizer.Add(export_label, (y,0), (1,1), wx.LEFT | wx.RIGHT | wx.TOP, 5)
-        y += 1
+        if not is_bsl:
+            export_label = wx.StaticText(self, -1, "Export each frame to:")
+            sizer.Add(export_label, (y,0), (1,1), wx.LEFT | wx.RIGHT | wx.TOP, 5)
+            y += 1
 
-        self.single_btn = wx.RadioButton(self, -1, label="The same file",
-            style=wx.RB_GROUP)
-        sizer.Add(self.single_btn, (y,0), (1,1),
-            wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
+            self.single_btn = wx.RadioButton(self, -1, label="The same file",
+                style=wx.RB_GROUP)
+            sizer.Add(self.single_btn, (y,0), (1,1),
+                wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
 
-        multiple_btn = wx.RadioButton(self, -1, label="Multiple files")
-        sizer.Add(multiple_btn, (y,1), (1,1),
-            wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
-        y += 1
+            multiple_btn = wx.RadioButton(self, -1, label="Multiple files")
+            sizer.Add(multiple_btn, (y,1), (1,1),
+                wx.LEFT | wx.RIGHT | wx.BOTTOM, 5)
+            y += 1
 
         done_btn = wx.Button(self, wx.ID_OK)
@@ -63 +64 @@
 
         size = self.GetSize()
-        size.height += 35
+        if not is_bsl:
+            size.height += 35
         self.SetSize(size)