Changeset ff790b3 in sasview for src/sas

Timestamp:

Jul 13, 2016 7:03:20 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:

f2b3f28

Parents:

5afe77f

Message:

Check that imported data files only have 1 column

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (1 diff)

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

@@ -52 +52 @@
     def extract_data(self, filename):
         data = np.loadtxt(filename, dtype=str)
+
+        if len(data.shape) != 1:
+            msg = "Error reading {}: Only one column of data is allowed"
+            raise Exception(msg.format(filename.split('\\')[-1]))
 
         is_float = True