Changeset 9e9f848 in sasview

Timestamp:

Aug 9, 2016 4:41:12 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:

5451a78

Parents:

ba65aff

Message:

When exporting to multiple files, append frame number to filenames

File:

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

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

@@ -85 +85 @@
         self.Layout()
 
-    def convert_to_cansas(self, frame_data, filename, single_file):
+    def convert_to_cansas(self, frame_data, filepath, single_file):
         """
         Saves an array of Data1D objects to a single CanSAS file with multiple
@@ -91 +91 @@
         <SasData> element.
 
-        :param frame_data: The Data1D object to save
-        :param filename: Where to save the CanSAS file
+        :param frame_data: If single_file is true, an array of Data1D objects.
+        If single_file is false, a dictionary of the form frame_number: Data1D.
+        :param filepath: Where to save the CanSAS file
         :param single_file: If true, array is saved as a single file, if false,
         each item in the array is saved to it's own file
@@ -100 +101 @@
         if self.run_name is not None:
             entry_attrs = { 'name': self.run_name }
+        
         if single_file:
-            writer.write(filename, frame_data,
+            writer.write(filepath, frame_data,
                 sasentry_attrs=entry_attrs)
         else:
-            # strip extension from filename
-            ext = "." + filename.split('.')[-1]
-            name = filename.replace(ext, '')
-            for i in range(len(frame_data)):
-                # TODO: Change i to actual frame number, not consecutive numbers
-                # (maybe use info in params from frame select dialog, ie
-                # increment. Alternatively, change frame_data to a dictionary
-                # with the frame number as key and use frame_data.iteritems()
-                # (would need to update CansasWriter to deal with this)
-                f_name = name + str(i) + ext
-                writer.write(f_name, [frame_data[i]],
+            # Folder and base filename
+            [group_path, group_name] = os.path.split(filepath)
+            ext = "." + group_name.split('.')[-1] # File extension
+            for frame_number, frame_data in frame_data.iteritems():
+                # Append frame number to base filename
+                filename = group_name.replace(ext, str(frame_number)+ext)
+                destination = os.path.join(group_path, filename)
+                writer.write(destination, [frame_data],
                     sasentry_attrs=entry_attrs)
 
@@ -315 +314 @@
         }
 
-        frame_data = []
+        frame_data = {}
         for i in frames:
             data = Data1D(x=qdata, y=iqdata[i])
-            frame_data.append(data)
+            frame_data[i] = data
         if single_file:
             # Only need to set metadata on first Data1D object
+            frame_data = frame_data.values() # Don't need to know frame numbers
             frame_data[0].filename = output_path.split('\\')[-1]
             for key, value in metadata.iteritems():
@@ -326 +326 @@
         else:
             # Need to set metadata for all Data1D objects
-            for datainfo in frame_data:
+            for datainfo in frame_data.values():
                 datainfo.filename = output_path.split('\\')[-1]
                 for key, value in metadata.iteritems():