Changeset 07eb396 in sasview for invariantview/src/sans

Timestamp:

Jul 19, 2012 11:07:32 AM (12 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:

3df5ecf

Parents:

80ff71e

Message:

Invaraint freeze fix

File:

• invariantview/src/sans/perspectives/invariant/invariant_panel.py (modified) (6 diffs)

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

@@ -478 +478 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg,
                                                       type="stop"))
+                raise
         else:
             try:
@@ -515 +516 @@
                         msg = "Expect float for power at low q, "
                         msg += " got %s" % (power_low)
-                        raise ValueError, msg
+                        wx.PostEvent(self.parent, StatusEvent(status=msg, 
+                                                  info="error",
+                                                  type="stop"))
        
         #Get the number of points to extrapolated
@@ -525 +528 @@
                 msg = "Expect float for number of points at low q,"
                 msg += " got %s" % (npts_low)
-                raise ValueError, msg
+                wx.PostEvent(self.parent, StatusEvent(status=msg, 
+                                                  info="error",
+                                                  type="stop"))
         #Set the invariant calculator
         inv.set_extrapolation(range="low", npts=npts_low,
@@ -551 +556 @@
                     msg = "Expect float for power at high q,"
                     msg += " got %s" % (power_high)
-                    raise ValueError, msg
+                    wx.PostEvent(self.parent, StatusEvent(status=msg, 
+                                                  info="error",
+                                                  type="stop"))
                           
         npts_high = self.npts_high_tcl.GetValue().lstrip().rstrip()   
@@ -560 +567 @@
                 msg = "Expect float for number of points at high q,"
                 msg += " got %s" % (npts_high)
-                raise ValueError, msg
+                wx.PostEvent(self.parent, StatusEvent(status=msg, 
+                                                  info="error",
+                                                  type="stop"))
         inv.set_extrapolation(range="high", npts=npts_high,
                                    function=function_high, power=power_high)
@@ -638 +647 @@
             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)
-        #Compute qstar extrapolated to high q range 
-        self.get_high_qstar(inv=inv, high_q=high_q)
-        #Compute qstar extrapolated to total q range and set value to txtcrtl
-        self.get_total_qstar(inv=inv, extrapolation=extrapolation)
-        # Parse additional parameters
-        porod_const = self.get_porod_const()        
-        contrast = self.get_contrast()
-        
+        r_msg = ''
+        try:
+            r_msg = 'Low Q: '
+            #Compute qstar extrapolated to low q range 
+            self.get_low_qstar(inv=inv, npts_low=npts_low, low_q=low_q)
+            r_msg = 'High Q: '
+            #Compute qstar extrapolated to high q range 
+            self.get_high_qstar(inv=inv, high_q=high_q)
+            r_msg = ''
+            #Compute qstar extrapolated to total q range 
+            #and set value to txtcrtl
+            self.get_total_qstar(inv=inv, extrapolation=extrapolation)
+            # Parse additional parameters
+            porod_const = self.get_porod_const()        
+            contrast = self.get_contrast()
+        except:
+            msg = r_msg + "Error occurred computing invariant: %s" % \
+                                                            sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status=msg, 
+                                                  info="error",
+                                                  type="stop"))
         try:
             #Compute volume and set value to txtcrtl