Changeset 9df816b in sasview for src/sas

Timestamp:

Jul 31, 2017 5:07:50 AM (7 years ago)

Author:

lewis

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fafe52a

Parents:

0615d54

Message:

Only show warning messages once

File:

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

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

@@ -223 +223 @@
 
             except NoKnownLoaderException as e:
+                exception_occurred = True
                 logging.error(e.message)
+
                 error_message = "Loading data failed!\n" + e.message
                 self.load_update(output=None, message=e.message, info="warning")
-                self.load_complete(output=None,
-                                   message=error_message,
-                                   info="error")
-            except:
-                logger.error(sys.exc_value)
-
-                error_message = "The Data file you selected could not be "
-                error_message += "loaded.\nMake 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"
-                error_message += "Error: " + str(sys.exc_info()[1])
-                file_errors[basename] = [error_message]
-                self.load_update(output=output, message=error_message,
-                                 info="warning")
+
+            except Exception as e:
+                import pdb; pdb.set_trace()
+                exception_occurred = True
+                logger.error(e.message)
+
+                file_err = "The Data file you selected could not be "
+                file_err += "loaded.\nMake sure the content of your file"
+                file_err += " is properly formatted.\n"
+                file_err += "When contacting the SasView team, mention the"
+                file_err += " following:\n"
+                file_err += "Error: " + e.message
+                file_errors[basename] = [file_err]
 
         if len(file_errors) > 0:
@@ -250 +250 @@
                     error_message += message + "\n"
                 error_message += "\n"
-            self.load_update(output=output, message=error_message, info="error")
-
-        self.load_complete(output=output, message="Loading data complete!",
-                           info="info")
+            if not exception_occurred: # Some data loaded but with errors
+                self.load_update(output=output, message=error_message, info="error")
+
+        if not exception_occurred: # Everything loaded as expected
+            self.load_complete(output=output, message="Loading data complete!",
+                               info="info")
+        else:
+            self.load_complete(output=None, message=error_message, info="error")
+
 
     def load_update(self, output=None, message="", info="warning"):