Changeset acdf0d1 in sasview for src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

Timestamp:

Sep 27, 2018 12:37:09 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

490f790

Parents:

dcca58d (diff), 9c7e2b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (09/27/18 12:37:09)

git-committer:

GitHub <noreply@…> (09/27/18 12:37:09)

Message:

Merge pull request #183 from SasView?/bad_file_loader_fix

Continue loading data files if a single file cannot be loaded.

Tested and works "perfectly"

File:

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

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

@@ -182 +182 @@
                 file_errors[basename] = [log_msg]
                 continue
-
             try:
                 message = "Loading {}...\n".format(p_file)
@@ -204 +203 @@
                 self.load_update(message="Loaded {}\n".format(p_file),
                                  info="info")
-
             except NoKnownLoaderException as e:
                 exception_occurred = True
-                error_message = "Loading data failed!\n" + e.message
-                self.load_complete(output=None,
-                                   message=error_message,
-                                   info="warning")
-
+                error_message = "Loading data failed!" + e.message
+                file_errors[basename] = [error_message]
             except Exception as e:
                 exception_occurred = True
@@ -220 +215 @@
                 file_err += " following:\n"
                 file_err += e.message
-                self.load_complete(output=None,
-                                   message=file_err,
-                                   info="error")
+                file_errors[basename] = [file_err]
 
         if len(file_errors) > 0:
@@ -231 +224 @@
                 for message in error_array:
                     error_message += message + "\n"
-                error_message = error_message[:-1]
             self.load_complete(output=output,
                                message=error_message,