Changeset 82d88d5 in sasview for src/sas/sasgui/guiframe/local_perspectives/data_loader

Timestamp:

Mar 6, 2019 6:18:09 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

f923967

Parents:

cb64d86 (diff), f205d3a (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.

Message:

Merge branch 'master' into py37-sasgui

Location:

src/sas/sasgui/guiframe/local_perspectives/data_loader

Files:

• data_loader.py (modified) (3 diffs)
• load_thread.py (modified) (1 diff)

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

@@ -205 +205 @@
             except NoKnownLoaderException as e:
                 exception_occurred = True
-                error_message = "Loading data failed!" + e.message
+                error_message = "Loading data failed!\n" + e.message
                 file_errors[basename] = [error_message]
             except Exception as e:
@@ -224 +224 @@
                 for message in error_array:
                     error_message += message + "\n"
+                error_message = error_message[:-1]
             self.load_complete(output=output,
                                message=error_message,
@@ -231 +232 @@
             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, message="", info="warning"):

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

@@ -72 +72 @@
                 if self.updatefn is not None:
                     self.updatefn(output=output, message=message)
-            except:
+            except Exception as exc:
                 error_message = "Error while loading: %s\n" % str(path)
-                error_message += str(sys.exc_value) + "\n"
+                error_message += str(exc) + "\n"
                 self.updatefn(output=output, message=error_message)