Changeset 886d2f2c in sasview

Timestamp:

Dec 14, 2016 5:41:30 AM (8 years ago)

Author:

wojciech

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:

0ba0774

Parents:

abc5e70

Message:

A few fixes after code review

Location:

src/sas/qtgui

Files:

• SlitSizeCalculator.py (modified) (3 diffs)
• UnitTesting/SlitSizeCalculatorTest.py (modified) (1 diff)

src/sas/qtgui/SlitSizeCalculator.py

@@ -89 +89 @@
         self.close()
 
+    def clearResults(self):
+        """
+        Clear the content of output LineEdits
+        """
+        self.slit_length_out.setText("ERROR!")
+        self.unit_out.clear()
+
     def calculateSlitSize(self, data=None):
         """
@@ -95 +102 @@
 
         if data is None:
+            self.clearResults()
             msg = "ERROR: Data hasn't been loaded correctly"
             raise RuntimeError, msg
 
         if data.__class__.__name__ == 'Data2D':
+            self.clearResults()
             msg = "Slit Length cannot be computed for 2D Data"
-            raise Exception, msg
+            raise RuntimeError, msg
 
         #compute the slit size
@@ -113 +122 @@
             slit_length = slit_length_calculator.calculate_slit_length()
         except:
+            self.clearResults()
             msg = "Slit Size Calculator: %s" % (sys.exc_value)
             raise RuntimeError, msg

src/sas/qtgui/UnitTesting/SlitSizeCalculatorTest.py

@@ -83 +83 @@
         loader = Loader()
         data = loader.load(filename)
-        self.assertRaisesRegexp(Exception,
+        self.assertRaisesRegexp(RuntimeError,
                                 "Slit Length cannot be computed for 2D Data",
                                 self.widget.calculateSlitSize, data)