Changeset 35488b2 in sasview

Timestamp:

Aug 9, 2016 12:13:13 PM (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:

0b1a677

Parents:

514a00e

Message:

Perform BSL file conversion on a separate thread

Location:

src/sas

Files:

• sascalc/file_converter/convert_bsl_thread.py (added)
• sasgui/perspectives/file_converter/converter_panel.py (modified) (10 diffs)

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

@@ -19 +19 @@
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sascalc.dataloader.data_info import Data2D
 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.sascalc.file_converter.convert_bsl_thread import ConvertBSLThread
 from sas.sasgui.perspectives.file_converter.otoko_loader import OTOKOLoader
-from sas.sascalc.file_converter.bsl_loader import BSLLoader
 from sas.sascalc.dataloader.data_info import Detector
 from sas.sascalc.dataloader.data_info import Sample
@@ -58 +56 @@
         self.parent = parent
         self.meta_frames = []
+        self.bsl_thread = None
 
         # GUI inputs
@@ -64 +63 @@
         self.output = None
         self.radiation_input = None
+        self.convert_btn = None
         self.metadata_section = None
 
@@ -115 +115 @@
                 writer.write(destination, [frame_data],
                     sasentry_attrs=entry_attrs)
-
-    def convert_to_red2d(self, filepath, x, y, frame_data):
-        """
-        Writes Data2D objects to Red2D .dat files. If more than one frame is
-        provided, the frame number will be appended to the filename of each
-        file written.
-
-        :param filepath: The filepath to write to
-        :param x: The x column of the data
-        :param y: The y column of the data
-        :param frame_data: A dictionary of the form frame_number: data, where
-        data is a 2D numpy array containing the intensity data
-        """
-        filename = os.path.split(filepath)[-1]
-        filepath = os.path.split(filepath)[0]
-        writer = Red2DWriter()
-
-        for i, frame in frame_data.iteritems():
-            # If more than 1 frame is being exported, append the frame
-            # number to the filename
-            if len(frame_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((len(x),1))
-            data_info = Data2D(data=data_i, qx_data=x, qy_data=y)
-            writer.write(os.path.join(filepath, frame_filename), data_info)
 
     def extract_ascii_data(self, filename):
@@ -212 +182 @@
 
         return qdata, iqdata
-
-    def extract_bsl_data(self, filename):
-        """
-        Extracts data from a 2D BSL file
-
-        :param filename: The header file to extract the data from
-        :return x_data: A 1D array containing all the x coordinates of the data
-        :return y_data: A 1D array containing all the y coordinates of the data
-        :return frame_data: A dictionary of the form frame_number: data, where
-        data is a 2D numpy array containing the intensity data
-        """
-        loader = BSLLoader(filename)
-        frames = [0]
-        should_continue = True
-
-        if loader.n_frames > 1:
-            params = self.ask_frame_range(loader.n_frames)
-            frames = params['frames']
-        elif loader.n_rasters == 1 and loader.n_frames == 1:
-            message = ("The selected file is an OTOKO file. Please select the "
-            "'OTOKO 1D' option if you wish to convert it.")
-            dlg = wx.MessageDialog(self,
-            message,
-            'Error!',
-            wx.OK | wx.ICON_WARNING)
-            dlg.ShowModal()
-            should_continue = False
-            dlg.Destroy()
-        else:
-            message = ("The selected data file only has 1 frame, it might be"
-                " a multi-frame OTOKO file.\nContinue conversion?")
-            dlg = wx.MessageDialog(self,
-            message,
-            'Warning!',
-            wx.YES_NO | wx.ICON_WARNING)
-            should_continue = (dlg.ShowModal() == wx.ID_YES)
-            dlg.Destroy()
-
-        if not should_continue:
-            return None, None, None
-
-        frame_data = {}
-
-        for frame in frames:
-            loader.frame = frame
-            frame_data[frame] = loader.load_data()
-
-        # TODO: Tidy this up
-        # Prepare axes values (arbitrary scale)
-        x_data = []
-        y_data = range(loader.n_pixels) * loader.n_rasters
-        for i in range(loader.n_rasters):
-            x_data += [i] * loader.n_pixels
-
-        return x_data, y_data, frame_data
 
     def ask_frame_range(self, n_frames):
@@ -320 +235 @@
             return
 
+        if self.bsl_thread is not None and self.bsl_thread.isrunning():
+            self.bsl_thread.stop()
+            self.conversion_complete(success=False)
+            return
+
         self.sample.ID = self.title
 
@@ -329 +249 @@
                 qdata, iqdata = self.extract_otoko_data(self.q_input.GetPath())
             else: # self.data_type == 'bsl'
-                x_data, y_data, frame_data = self.extract_bsl_data(
-                    self.iq_input.GetPath())
-
-                if x_data == None and y_data == None and frame_data == None:
-                    wx.PostEvent(self.parent.manager.parent,
-                        StatusEvent(status="Conversion cancelled."))
-                    return
-
-                file_path = self.output.GetPath()
-                self.convert_to_red2d(file_path, x_data, y_data, frame_data)
-
-                wx.PostEvent(self.parent.manager.parent,
-                    StatusEvent(status="Conversion completed."))
+                self.bsl_thread = ConvertBSLThread(self, self.iq_input.GetPath(),
+                    self.output.GetPath(), updatefn=self.conversion_update,
+                    completefn=self.conversion_complete)
+                self.bsl_thread.queue()
+                self.convert_btn.SetLabel("Stop Conversion")
                 return
 
@@ -408 +320 @@
             StatusEvent(status="Conversion completed."))
 
+    def conversion_update(self, msg="", exception=None):
+        if exception is not None:
+            msg = str(exception)
+            wx.PostEvent(self.parent.manager.parent,
+                StatusEvent(status=msg, info='error'))
+        else:
+            wx.PostEvent(self.parent.manager.parent,
+                StatusEvent(status=msg))
+
+    def conversion_complete(self, success=True):
+        self.convert_btn.SetLabel("Convert")
+        msg = "Conversion "
+        if success:
+            msg += "completed"
+        else:
+            msg += "failed"
+        wx.PostEvent(self.parent.manager.parent,
+            StatusEvent(status=msg))
+
+
     def on_help(self, event):
         """
@@ -424 +356 @@
             msg += "n Intensity input file."
         elif self.output.GetPath() == '':
-            msg += "destination for the converted file."
+            msg += " destination for the converted file."
         if msg != "You must select a":
             wx.PostEvent(self.parent.manager.parent,
@@ -597 +529 @@
         y += 1
 
-        convert_btn = wx.Button(self, wx.ID_OK, "Convert")
-        input_grid.Add(convert_btn, (y,0), (1,1), wx.ALL, 5)
-        convert_btn.Bind(wx.EVT_BUTTON, self.on_convert)
+        self.convert_btn = wx.Button(self, wx.ID_OK, "Stop Converstion")
+        self.convert_btn.SetLabel("Convert")
+        input_grid.Add(self.convert_btn, (y,0), (1,1), wx.ALL, 5)
+        self.convert_btn.Bind(wx.EVT_BUTTON, self.on_convert)
 
         help_btn = wx.Button(self, -1, "HELP")