Changeset ef9d209 in sasview

Timestamp:

Aug 26, 2011 2:42:32 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

8285a93

Parents:

dcbd4e2c

Message:

added csv format: but read floats only but not strings

File:

• sansdataloader/src/sans/dataloader/readers/ascii_reader.py (modified) (2 diffs)

sansdataloader/src/sans/dataloader/readers/ascii_reader.py

@@ -35 +35 @@
     type = ["ASCII files (*.txt)|*.txt",
             "ASCII files (*.dat)|*.dat",
-            "ASCII files (*.abs)|*.abs"]
+            "ASCII files (*.abs)|*.abs",
+            "CSV files (*.csv)|*.csv"]
     ## List of allowed extensions
-    ext = ['.txt', '.TXT', '.dat', '.DAT', '.abs', '.ABS']  
+    ext = ['.txt', '.TXT', '.dat', '.DAT', '.abs', '.ABS', 'csv', 'CSV']  
     
     ## Flag to bypass extension check
@@ -120 +121 @@
                 lentoks = 2     
                 for line in lines:
-                    toks = line.split()
+                    toks = line.split(',')
+                    if len(toks) < 2:
+                        toks = line.split()
                     try:
                         #Make sure that all columns are numbers.