Changeset b3efb7d in sasview for src/sas/guiframe/local_perspectives

Timestamp:

Feb 14, 2015 11:16:03 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:

10a483f

Parents:

b3133fd

Message:

Modified data loading error messages to be much more specific and
include information in the console log about the specific errors
generated.

The cansas reader is now loading non-standard units (ie counts), but
shows a specific error message about the issue.

File:

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

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

@@ -171 +171 @@
                                   file) for file in os.listdir(path)]
    
+    def _process_data_and_errors(self, item, p_file, output, message):
+        """
+        Check to see if data set loaded with any errors. If so, append to
+            error message to be sure user knows the issue.
+        """
+        data_error = False
+        for error_data in item.errors:
+            data_error = True
+            message += "\tError: {0}\n".format(error_data)
+        data = self.parent.create_gui_data(item, p_file)
+        output[data.id] = data
+        return output, message, data_error
+   
     def get_data(self, path, format=None):
         """
@@ -178 +191 @@
         output = {}
         any_error = False
+        data_error = False
         error_message = ""
         for p_file in path:
             info = "info"
             basename  = os.path.basename(p_file)
-            root, extension = os.path.splitext(basename)
+            _, extension = os.path.splitext(basename)
             if extension.lower() in EXTENSIONS:
                 any_error = True
@@ -194 +208 @@
         
             try:
+                message = "Loading Data... " + str(p_file) + "\n"
+                self.load_update(output=output, message=message, info=info)
                 temp =  self.loader.load(p_file, format)
                 if temp.__class__.__name__ == "list":
                     for item in temp:
-                        data = self.parent.create_gui_data(item, p_file)
-                        output[data.id] = data
+                        output, error_message, data_error = \
+                            self._process_data_and_errors(item, 
+                                                          p_file, 
+                                                          output, 
+                                                          error_message)
                 else:
-                    data = self.parent.create_gui_data(temp, p_file)
-                    output[data.id] = data
-                message = "Loading Data..." + str(p_file) + "\n"
-                self.load_update(output=output, message=message, info=info)
+                    output, error_message, data_error = \
+                            self._process_data_and_errors(temp, 
+                                                          p_file, 
+                                                          output, 
+                                                          error_message)
             except:
                 any_error = True
-                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 DANSE team, mention the"
-                     error_message += " following:\n%s" % str(error)
-                else:
-                     error_message += "%s\n"% str(p_file)
-                info = "error"
-                self.load_update(output=output, message=error_message, 
+        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 DANSE 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"
+            self.load_update(output=output, message=error_message, 
                                   info=info)
                 
-        message = "Loading Data Complete! "
+        else:
+            message = "Loading Data Complete! "
         message += log_msg
-        if error_message != "":
-            info = 'error'
         self.load_complete(output=output, error_message=error_message,
                        message=message, path=path, info=info)