Changeset 14d05ba in sasview for prview/perspectives/pr

Timestamp:

Sep 14, 2008 10:20:51 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

3b19ac9

Parents:

aab8ad7

Message:

minor update

File:

• prview/perspectives/pr/pr.py (modified) (1 diff)

prview/perspectives/pr/pr.py

@@ -601 +601 @@
             return
         
-        x, y, err = self.parent.load_ascii_1D(path)
+        #x, y, err = self.parent.load_ascii_1D(path)
+        # Use data loader to load file
+        try:
+            dataread = Loader().load(path)
+            x = None
+            y = None
+            err = None
+            if dataread.__class__.__name__ == 'Data1D':
+                x = dataread.x
+                y = dataread.y
+                err = dataread.dy
+            else:
+                wx.PostEvent(self.parent, StatusEvent(status="This tool can only read 1D data"))
+                return
+        except:
+            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
+            return
         
         filename = os.path.basename(path)