Changeset 25e3fc9 in sasview for sansview/perspectives/fitting/invariant_panel.py

Timestamp:

Jan 26, 2010 5:46:22 PM (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:

e84e1e6

Parents:

fcd8887d

Message:

remove raise and pritn statement

File:

• sansview/perspectives/fitting/invariant_panel.py (modified) (7 diffs)

sansview/perspectives/fitting/invariant_panel.py

@@ -131 +131 @@
                 check_float(self.invariant_err_ctl)
             except:
-                raise
-                #msg= "Error occurs for invariant: %s"%sys.exc_value
-                #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
-                #return
+                msg= "Error occurs for invariant: %s"%sys.exc_value
+                wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+                return
             #Compute qstar extrapolated to low q range
             #Clear the previous extrapolated plot
-            print "low_q, high_q",low_q, high_q
+            #print "low_q, high_q",low_q, high_q
             if low_q:
                 try: 
@@ -148 +147 @@
                     self._plot_data(data=low_in_data, name=self.data.name+"Fitted data for low_Q")
                 except:
-                    raise
-                    #msg= "Error occurs for low q invariant: %s"%sys.exc_value
-                    #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+                    msg= "Error occurs for low q invariant: %s"%sys.exc_value
+                    wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
             if high_q:
                 try: 
@@ -161 +159 @@
                     self._plot_data(data=high_in_data, name=self.data.name+"Fitted data for high_Q")
                 except:
-                    raise
-                    #msg= "Error occurs for high q invariant: %s"%sys.exc_value
-                    #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+                    msg= "Error occurs for high q invariant: %s"%sys.exc_value
+                    wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
             try:
                 qstar_total, qstar_total_err = inv.get_qstar_with_error(extrapolation)
@@ -171 +168 @@
                 check_float(self.invariant_total_err_ctl)
             except:
-                raise
-                #msg= "Error occurs for total invariant: %s"%sys.exc_value
-                #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+                msg= "Error occurs for total invariant: %s"%sys.exc_value
+                wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
                 
             contrast = self.contrast_ctl.GetValue().lstrip().rstrip()
@@ -192 +188 @@
                 check_float(self.volume_err_ctl)
             except:
-                raise
-                #msg= "Error occurs for volume fraction: %s"%sys.exc_value
-                #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+                msg= "Error occurs for volume fraction: %s"%sys.exc_value
+                wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
             try:
                 s, ds = inv.get_surface_with_error(contrast=contrast,
@@ -203 +198 @@
                 check_float(self.surface_err_ctl)
             except:
-                raise
-                #msg= "Error occurs for surface: %s"%sys.exc_value
-                #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+                msg= "Error occurs for surface: %s"%sys.exc_value
+                wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
                 
         else:
@@ -218 +212 @@
             @param name: Data's name to use for the legend
         """
-        print "went here "
+        #print "went here "
         plottable = self.graph.get_plottable(name=name)
         if plottable is not None:
             self.graph.delete(plottable)
-        print "name--->",name
+        #print "name--->",name
         # Create a plottable data
         new_plot = Data1D(x=[], y=[], dx=None, dy=None)