Changeset 8dec7e7 in sasview for src/sas/sasgui/guiframe/local_perspectives

Timestamp:

Jul 27, 2017 12:13:00 PM (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:

0615d54

Parents:

9d786e5

Message:

Raise DefaultReaderException? in NXcanSAS reader and handle correctly

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

@@ -224 +224 @@
             except NoKnownLoaderException as e:
                 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="Loading data failed!",
-                                   info="warning")
+                                   message=error_message,
+                                   info="error")
             except:
                 logger.error(sys.exc_value)
@@ -268 +269 @@
         wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
                                               type="stop"))
-        self.parent.add_data(data_list=output)
+        if output is not None:
+            self.parent.add_data(data_list=output)