Changeset 437e639 in sasview for invariantview

Timestamp:

Mar 18, 2010 10:28:50 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f43827cc

Parents:

471b598

Message:

error check added for txtcrtl value

File:

• invariantview/perspectives/invariant/invariant_panel.py (modified) (4 diffs)

invariantview/perspectives/invariant/invariant_panel.py

@@ -335 +335 @@
             compute invariant 
         """
+        msg= ""
+        wx.PostEvent(self.parent, StatusEvent(status= msg))
         if self._data is None:
             return
@@ -353 +355 @@
                                             background=background,
                                             scale=scale)
-        inv, npts_low = self.set_extrapolation_low(inv=inv, low_q=low_q)
-        inv, npts_high = self.set_extrapolation_high(inv=inv, high_q=high_q)
+        try:
+            inv, npts_low = self.set_extrapolation_low(inv=inv, low_q=low_q)
+            inv, npts_high = self.set_extrapolation_high(inv=inv, high_q=high_q)
+        except:
+            msg= "Error occurred computing invariant: %s"%sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+            return
         #check the type of extrapolation
         extrapolation = self.get_extrapolation_type(low_q=low_q, high_q=high_q)
@@ -521 +528 @@
             Draw widgets related to extrapolation at low q range
         """
-        self.enable_low_cbox = wx.CheckBox(self, -1, "Extrapolate Low Q")
+        self.enable_low_cbox = wx.CheckBox(self, -1, "Enable Extrapolate Low Q")
+        self.enable_low_cbox.SetForegroundColour('red')
         self.enable_low_cbox.SetValue(False)
         self.fit_low_cbox = wx.CheckBox(self, -1, "Check to Fit Power")
@@ -579 +587 @@
             Draw widgets related to extrapolation at high q range
         """
-        self.enable_high_cbox = wx.CheckBox(self, -1, "Extrapolate high-Q")
+        self.enable_high_cbox = wx.CheckBox(self, -1, "Enable Extrapolate high-Q")
+        self.enable_high_cbox.SetForegroundColour('red')
         self.enable_high_cbox.SetValue(False)
         self.fit_high_cbox = wx.CheckBox(self, -1, "Check to Fit Power")