Changeset d7412e0 in sasview for prview/perspectives/pr

Timestamp:

Aug 1, 2009 10:22:46 AM (15 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:

4d5005e

Parents:

cb0d17c

Message:

prview: standalone mode: pop up error message when file can't be loaded

File:

• prview/perspectives/pr/pr.py (modified) (4 diffs)

prview/perspectives/pr/pr.py

@@ -23 +23 @@
 from sans.pr.invertor import Invertor
 from DataLoader.loader import Loader
+from sans.guiframe.data_loader import load_error 
 
 import copy
@@ -1046 +1047 @@
                 y = self._current_file_data.y
                 err = self._current_file_data.err
+                
+                message = "The data from this file has already been loaded."
+                wx.PostEvent(self.parent, StatusEvent(status=message))
             else:
                 # Reset the status bar so that we don't get mixed up
@@ -1054 +1058 @@
                     x, y, err = self.load(path)
                 except:
-                    message = "Could not read the data file: %s" % path
-                    wx.PostEvent(self.parent, StatusEvent(status=message))
+                    load_error(sys.exc_value)
                     return None
                 
                 # If the file contains no data, just return
-                if x is None:
-                    message = "The loaded file contains no data"
-                    wx.PostEvent(self.parent, StatusEvent(status=message))
+                if x is None or len(x)==0:
+                    load_error("The loaded file contains no data")
                     return None
             
@@ -1093 +1095 @@
                 return pr
             except:
-                wx.PostEvent(self.parent, StatusEvent(status="Problem reading data: %s" % sys.exc_value))
+                load_error(sys.exc_value)
         return None