Changeset d26dea0 in sasview for src/sas/guiframe

Timestamp:

Mar 12, 2015 10:32:02 AM (10 years ago)

Author:

krzywon

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:

7d64b0e

Parents:

6b0fc72

Message:

Modified the cansas reader and the dataloader to be more explicit in the
errors that occurred when loading data files. Also, only each error now
only appears a single time.

File:

• src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) (2 diffs)

src/sas/guiframe/local_perspectives/data_loader/data_loader.py

@@ -204 +204 @@
             except:
                 any_error = True
-        if any_error or error_message != "":
-            if error_message == "":
-                error = "Error: " + str(sys.exc_value) + "\n"
-                error += "while loading Data: \n%s\n" % str(p_file)
-                error_message = "The data file you selected could not be loaded.\n"
-                error_message += "Make sure the content of your file"
-                error_message += " is properly formatted.\n\n"
-                error_message += "When contacting the SasView team, mention the"
-                error_message += " following:\n%s" % str(error)
-            elif data_error:
-                base_message = "Errors occurred while loading {0}\n".format(p_file)
-                base_message += "The data file loaded but with errors.\n"
-                error_message = base_message + error_message
-            else:
-                error_message += "%s\n" % str(p_file)
-            info = "error"
+            if any_error or error_message != "":
+                if error_message == "":
+                    error = "Error: " + str(sys.exc_info()[1]) + "\n"
+                    error += "while loading Data: \n%s\n" % str(basename)
+                    error_message += "The data file you selected could not be loaded.\n"
+                    error_message += "Make sure the content of your file"
+                    error_message += " is properly formatted.\n\n"
+                    error_message += "When contacting the SasView team, mention the"
+                    error_message += " following:\n%s" % str(error)
+                elif data_error:
+                    base_message = "Errors occurred while loading "
+                    base_message += "{0}\n".format(basename)
+                    base_message += "The data file loaded but with errors.\n"
+                    error_message = base_message + error_message
+                else:
+                    error_message += "%s\n" % str(p_file)
+                info = "error"
+        
+        if any_error or error_message:
             self.load_update(output=output, message=error_message, info=info)
-
         else:
             message = "Loading Data Complete! "
         message += log_msg
         self.load_complete(output=output, error_message=error_message,
-                           message=message, path=path, info=info)
+                           message=message, path=path, info='warning')
 
     def load_update(self, output=None, message="", info="warning"):
@@ -233 +235 @@
         """
         if message != "":
-            wx.PostEvent(self.parent, StatusEvent(status=message, info='info',
+            wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
                                                   type="progress"))
     def load_complete(self, output, message="", error_message="", path=None,