Changeset ceaf16e in sasview for prview/perspectives

Timestamp:

Jun 13, 2009 9:43:01 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:

5cc847c

Parents:

009f827

Message:

prview: slightly better error handling

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (2 diffs)
• pr.py (modified) (4 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -7 +7 @@
 import wx
 import os
+import sys
+import logging
 from sans.guicomm.events import StatusEvent    
 from inversion_state import InversionState
@@ -955 +957 @@
             if path and os.path.isfile(path):
                 self.plot_data.SetValue(str(path))
-                self.manager.show_data(path, reset=True)
-                self._on_pars_changed(None)
-            
-                # Perform inversion
-                if self.standalone == True:
-                    self._on_invert(None)
+                try:
+                    self.manager.show_data(path, reset=True)
+                    self._on_pars_changed(None)
+                
+                    # Perform inversion
+                    if self.standalone == True:
+                        self._on_invert(None)
+                except:
+                    # Invalid data
+                    logging.error("InversionControl._change_file: %s" % sys.exc_value)                    
 
 class HelpDialog(wx.Dialog):

prview/perspectives/pr/pr.py

@@ -412 +412 @@
         # Use data loader to load file
         dataread = Loader().load(path)
+        
+        # Notify the user if we could not read the file
+        if dataread is None:
+            raise RuntimeError, "Invalid data"
+            
         x = None
         y = None
@@ -827 +832 @@
             @param reset: if True all other plottables will be cleared
         """
-        
-        
         if path is not None:
             try:
                 pr = self._create_file_pr(path)
-                
-                # If the file contains nothing, just return
-                if pr is None:
-                    return
-                
-                self.pr = pr
-            except:  
-                wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
-                return
+            except:
+                status="Problem reading data: %s" % sys.exc_value
+                wx.PostEvent(self.parent, StatusEvent(status=status))
+                raise RuntimeError, status
+                
+            # If the file contains nothing, just return
+            if pr is None:
+                raise RuntimeError, "Loaded data is invalid"
+            
+            self.pr = pr
               
         # Make a plot of I(q) data
@@ -925 +929 @@
             @param path: path of the file to read in 
         """
+        # Sanity check
+        if self.current_plottable is None:
+            msg = "Please load a valid data set before proceeding."
+            wx.PostEvent(self.parent, StatusEvent(status=msg))  
+            return None   
+        
         # Get the data from the chosen data set and perform inversion
         pr = Invertor()
@@ -1031 +1041 @@
                 #TODO: refactor this into a proper status handling
                 wx.PostEvent(self.parent, StatusEvent(status=''))
-                x, y, err = self.load(path)
+                try:
+                    x, y, err = self.load(path)
+                except:
+                    message = "Could not read the data file: %s" % path
+                    wx.PostEvent(self.parent, StatusEvent(status=message))
+                    return None
                 
                 # If the file contains no data, just return
-                #TODO: clean this up: we need a way to recognize that not all P(r) files are data
                 if x is None:
+                    message = "The loaded file contains no data"
+                    wx.PostEvent(self.parent, StatusEvent(status=message))
                     return None