Changeset 70308f6c in sasview for src/sas/sasgui/guiframe/local_perspectives

Timestamp:

Aug 15, 2016 10:01:36 AM (8 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.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:

fa1cbee

Parents:

cba0c77

Message:

Fix error message shown when loading folder fails (fixes #614)

File:

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

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

@@ -173 +173 @@
         log_msg = ''
         output = {}
-        any_error = False
         data_error = False
         error_message = ""
 
         for p_file in path:
+            file_error = False
             info = "info"
             basename = os.path.basename(p_file)
             _, extension = os.path.splitext(basename)
             if extension.lower() in EXTENSIONS:
-                any_error = True
                 info = "error"
                 log_msg = "Data Loader cannot "
@@ -211 +210 @@
             except:
                 logging.error(sys.exc_value)
-                any_error = True
-            if any_error:
+                file_error = True
+            if file_error:
                 error = "Error: " + str(sys.exc_info()[1])
                 error += " while loading file: %s" % str(basename)
@@ -228 +227 @@
                 info = "error"
 
-        if any_error or error_message:
+        if error_message != "":
             self.load_update(output=output, message=error_message, info=info)
         else: