Changeset fe498b83 in sasview for src/sas/sasgui/perspectives

Timestamp:

Aug 19, 2016 5:20:16 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:

edf0e06

Parents:

ac370c5

Message:

Refactor to make use of x_bins and y_bins

File:

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

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

@@ -224 +224 @@
 
         if not should_continue:
-            return None, None, None
-
-        frame_data = {}
-
-        for frame in frames:
-            loader.frame = frame
-            frame_data[frame] = loader.load_data()
-
-        # Prepare axes values (arbitrary scale)
-        x_data = loader.n_rasters * range(1,loader.n_pixels+1)
-        y_data = [loader.n_pixels * [i] for i in range(1, loader.n_rasters+1)]
-        y_data = np.reshape(y_data, (1, loader.n_pixels*loader.n_rasters))[0]
-
-        return (x_data, y_data), (loader.n_rasters, loader.n_pixels), frame_data
+            return None
+
+        frame_data = loader.load_frames(frames)
+
+        return frame_data
 
     def ask_frame_range(self, n_frames):
@@ -300 +291 @@
             else: # self.data_type == 'bsl'
 
-                (x, y), dimensions, frame_data = \
-                    self.extract_bsl_data(self.iq_input.GetPath())
-                if x == None and y == None and frame_data == None:
+                dataset = self.extract_bsl_data(self.iq_input.GetPath())
+                if dataset is None:
                     # Cancelled by user
                     return
 
-                dataset = []
-                for i_data in frame_data.values():
-                    i_data = np.reshape(i_data, (1, i_data.size))[0]
-                    data2d = Data2D(data=i_data, qx_data=x, qy_data=y)
-                    dataset.append(data2d)
                 w = NXcanSASWriter()
-                dimensions = [dimensions] * len(dataset)
-                w.write(dataset, self.output.GetPath(), dimensions=dimensions)
+                w.write(dataset, self.output.GetPath())
 
                 wx.PostEvent(self.parent.manager.parent,