Changeset 1e56da1 in sasview for src/sas

Timestamp:

Sep 15, 2016 8:33:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

813220f

Parents:

d4115a55

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/12/16 11:27:38)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)

Message:

Show more useful message when loading folder fails (closes #614)

File:

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

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

@@ -162 +162 @@
             logging.error("Loader returned an invalid object:\n %s" % str(item))
             data_error = True
-        
+
         data = self.parent.create_gui_data(item, p_file)
         output[data.id] = data
@@ -176 +176 @@
         data_error = False
         error_message = ""
+
         for p_file in path:
             info = "info"
@@ -182 +183 @@
             if extension.lower() in EXTENSIONS:
                 any_error = True
+                info = "error"
                 log_msg = "Data Loader cannot "
                 log_msg += "load: %s\n" % str(p_file)
                 log_msg += """Please try to open that file from "open project" """
-                log_msg += """or "open analysis" menu\n"""
-                error_message = log_msg + "\n"
+                log_msg += """or "open analysis" menu\n\n"""
+                error_message += log_msg
                 logging.info(log_msg)
                 continue
@@ -210 +212 @@
                 logging.error(sys.exc_value)
                 any_error = True
-            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)
+            if any_error:
+                error = "Error: " + str(sys.exc_info()[1])
+                error += " while loading file: %s" % 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"
+                error_message += "When contacting the SasView team, mention the"
+                error_message += " following:\n%s\n\n" % str(error)
                 info = "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
+                info = "error"
+
         if any_error or error_message:
             self.load_update(output=output, message=error_message, info=info)
@@ -254 +254 @@
         #    self.load_error(error_message)
         self.parent.add_data(data_list=output)
-
-
-