Changeset bec6cb8 in sasview

Timestamp:

Aug 19, 2016 7:21:53 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:

d3e1870

Parents:

a14fa99

Message:

Allow converting 1D data to NXcanSAS as well as CanSAS xml

File:

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

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

@@ -239 +239 @@
         """
         valid_input = False
-        is_bsl = (self.data_type == 'bsl')
-        dlg = FrameSelectDialog(n_frames, is_bsl)
+        _, ext = os.path.splitext(self.output.GetPath())
+        show_single_btn = (ext == '.h5')
+        dlg = FrameSelectDialog(n_frames, show_single_btn)
         frames = None
         increment = None
@@ -251 +252 @@
                     last_frame = int(dlg.last_input.GetValue())
                     increment = int(dlg.increment_input.GetValue())
-                    if not is_bsl:
+                    if not show_single_btn:
                         single_file = dlg.single_btn.GetValue()
 
@@ -338 +339 @@
                     setattr(datainfo, key, value)
 
-        self.convert_to_cansas(frame_data, output_path, single_file)
+        _, ext = os.path.splitext(output_path)
+        if ext == '.xml':
+            self.convert_to_cansas(frame_data, output_path, single_file)
+        else: # ext == '.h5'
+            w = NXcanSASWriter()
+            w.write(frame_data, output_path)
 
     def on_convert(self, event):
@@ -471 +477 @@
             self.radiation_input.Enable()
             self.metadata_section.Enable()
-            self.output.SetWildcard("CanSAS 1D (*.xml)|*.xml")
+            self.output.SetWildcard("CanSAS 1D (*.xml)|*.xml|NXcanSAS HDF5 File (*.h5)|*.h5")
 
     def radiationtype_changed(self, event):
@@ -560 +566 @@
 
         self.output = FileInput(self,
-            wildcard="CanSAS 1D (*.xml)|*.xml")
+            wildcard="CanSAS 1D (*.xml)|*.xml|NXcanSAS HDF5 File (*.h5)|*.h5")
         input_grid.Add(self.output.GetCtrl(), (y,1), (1,1), wx.EXPAND | wx.ALL, 5)
         y += 1