Changeset ee54fcf0 in sasview

Timestamp:

Apr 18, 2012 4:34:21 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

b1432b9

Parents:

6184b4e

Message:

improved error msg in details dialog

Location:

invariantview/src/sans/perspectives/invariant

Files:

• invariant_details.py (modified) (4 diffs)
• invariant_panel.py (modified) (2 diffs)

invariantview/src/sans/perspectives/invariant/invariant_details.py

@@ -101 +101 @@
             except:
                 self.qstar_high_percent = 'error'
-        self.check_values()
+        wx.CallAfter(self.check_values)
    
     def check_values(self):
@@ -119 +119 @@
         msg = ''
         if self.qstar_percent == 'error':
-            self.existing_warning = True
-            msg = 'Error occurred when computing invariant from data.\n '
+            try:
+                float(self.qstar)
+            except:
+                self.existing_warning = True
+                msg += 'Error occurred when computing invariant from data.\n '
         if self.qstar_percent > 1:
             self.existing_warning = True
@@ -126 +129 @@
             msg += "than 100% .\n"
         if self.qstar_low_percent == 'error':
-            self.existing_warning = True
-            msg = "Error occurred when computing extrapolated invariant"
-            msg += " at low-Q region.\n"
+            try:
+                float(self.qstar_low)
+            except:
+                self.existing_warning = True
+                msg += "Error occurred when computing extrapolated invariant"
+                msg += " at low-Q region.\n"
         elif self.qstar_low_percent is not None :
             if self.qstar_low_percent >= 0.05:
@@ -142 +148 @@
                 msg += "than 100% .\n"
         if self.qstar_high_percent == 'error':
-            self.existing_warning = True
-            msg += 'Error occurred when computing extrapolated'
-            msg += ' invariant at high-Q region.\n'
+            try:
+                float(self.qstar_high)
+            except:
+                self.existing_warning = True
+                msg += 'Error occurred when computing extrapolated'
+                msg += ' invariant at high-Q region.\n'
         elif self.qstar_high_percent is not None:
             if self.qstar_high_percent >= 0.05:

invariantview/src/sans/perspectives/invariant/invariant_panel.py

@@ -599 +599 @@
                                                   type="stop"))
             return
-       
+        self.Show(False)
         #Compute qstar extrapolated to low q range 
         self.get_low_qstar(inv=inv, npts_low=npts_low, low_q=low_q)
@@ -654 +654 @@
             wx.PostEvent(self.parent,
                 StatusEvent(status='\nFinished invariant computation...'))
+        self.Show(True)
+        self.Refresh()
             
     def on_undo(self,event=None):