Changeset cdd1c3b in sasview

Timestamp:

Jul 11, 2016 4:36:55 AM (8 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1d4b9e5

Parents:

033c14c

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/08/16 09:21:30)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 04:36:55)

Message:

Show error messages when extraplation, transform or extract parameters fail

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (5 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -152 +152 @@
         Called when Extrapolate button is pressed.
         """
-        if self._data is None:
-            msg = "Data must be loaded in order to perform an extrapolation."
-            wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
-            return
         if not self._validate_inputs:
             msg = "Invalid Q range entered."
@@ -164 +160 @@
         self._calculator.upperq = self.qmax
         self._calculator.background = self.background
-        self._extrapolated_data = self._calculator.compute_extrapolation()
+        try:
+            self._extrapolated_data = self._calculator.compute_extrapolation()
+        except:
+            msg = "Error extrapolating data."
+            wx.MessageBox(msg, 'error')
+            wx.PostEvent(self._manager.parent,
+                StatusEvent(status=msg, info="Error"))
+            self._transform_btn.Disable()
+            return
         # TODO: Find way to set xlim and ylim so full range of data can be
         # plotted
@@ -183 +187 @@
         Called when Transform button is pressed.
         """
-        transformed_data = self._calculator.compute_transform(
-            self._extrapolated_data, self.background)
+        try:
+            transformed_data = self._calculator.compute_transform(
+                self._extrapolated_data, self.background)
+        except:
+            transformed_data = None
+        if transformed_data is None:
+            msg = "Error calculating Transform."
+            wx.MessageBox(msg, 'error')
+            wx.PostEvent(self._manager.parent,
+                StatusEvent(status=msg, info="Error"))
+            self._extract_btn.Disable()
+            return
         self._transformed_data = transformed_data
         from sas.sasgui.perspectives.corfunc.corfunc import TRANSFORM_LABEL
@@ -194 +208 @@
 
     def extract_parameters(self, event=None):
-        params = None
         try:
             params = self._calculator.extract_parameters(self._transformed_data)
@@ -201 +214 @@
         if params is None:
             msg = "Error extracting parameters."
+            wx.MessageBox(msg, 'error')
             wx.PostEvent(self._manager.parent,
-                StatusEvent(status=msg, info="error"))
+                StatusEvent(status=msg, info="Error"))
             return
         for key in OUTPUT_STRINGS.keys():