Changeset 6280464 in sasview for src/sas/qtgui/Calculators/SlitSizeCalculator.py

Timestamp:

Nov 3, 2017 10:58:39 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

412e069e

Parents:

304d082

Message:

More Qt5 related fixes.

File:

• src/sas/qtgui/Calculators/SlitSizeCalculator.py (modified) (6 diffs)

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -4 +4 @@
 import os
 import sys
+import logging
 
 from PyQt5 import QtCore
@@ -64 +65 @@
             return
         loader = Loader()
-        data = loader.load(path_str)[0]
+        try:
+            data = loader.load(path_str)[0]
+        # Can return multiple exceptions - gather them all under one umbrella and complain
+        except Exception as ex:
+            logging.error(ex)
+            return
 
         self.data_file.setText(os.path.basename(path_str))
@@ -79 +85 @@
                                                  "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)",
                                                  None,
-                                                 QtWidgets.QFileDialog.DontUseNativeDialog)
-
-        if path is None:
-            return
-
+                                                 QtWidgets.QFileDialog.DontUseNativeDialog)[0]
         return path
 
@@ -106 +108 @@
             self.clearResults()
             msg = "ERROR: Data hasn't been loaded correctly"
-            raise RuntimeError(msg)
+            logging.error(msg)
+            return
 
         if data.__class__.__name__ == 'Data2D':
             self.clearResults()
             msg = "Slit Length cannot be computed for 2D Data"
-            raise RuntimeError(msg)
+            logging.error(msg)
+            return
 
         #compute the slit size
@@ -119 +123 @@
             if xdata == [] or xdata is None or ydata == [] or ydata is None:
                 msg = "The current data is empty please check x and y"
-                raise ValueError(msg)
+                logging.error(msg)
+                return
             slit_length_calculator = SlitlengthCalculator()
             slit_length_calculator.set_data(x=xdata, y=ydata)
@@ -126 +131 @@
             self.clearResults()
             msg = "Slit Size Calculator: %s" % (sys.exc_info()[1])
-            raise RuntimeError(msg)
+            logging.error(msg)
+            return
 
         slit_length_str = "{:.5f}".format(slit_length)