Changeset 25e3fc9 in sasview for sansview/perspectives/fitting/fitting.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/fitting.py (modified) (6 diffs)

sansview/perspectives/fitting/fitting.py

@@ -459 +459 @@
                     self.current_pg= page
             except:
-                raise
-                #msg= "%s error: %s" % (engineType,sys.exc_value)
-                #wx.PostEvent(self.parent, StatusEvent(status= msg ))
-                #return 
+                msg= "%s error: %s" % (engineType,sys.exc_value)
+                wx.PostEvent(self.parent, StatusEvent(status= msg ))
+                return 
             
         #Do the simultaneous fit
@@ -501 +500 @@
             print "in pluging"
         except:
-            raise
-        #    msg= "%s error: %s" % (engineType,sys.exc_value)
-        #    wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
-        #    return 
+            msg= "%s error: %s" % (engineType,sys.exc_value)
+            wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
+            return 
         
     def ready_fit(self, calc_fit):
@@ -641 +639 @@
             value.clear_model_param()
         except:
-            raise
-            #msg= title +" error: %s" % sys.exc_value
-            #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
-            #return
+            msg= title +" error: %s" % sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+            return
        
     def _onSelect(self,event):
@@ -776 +773 @@
            
         except:
-            raise
-            #msg= "Single Fit completed but Following error occurred:%s"% sys.exc_value
-            #wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
-            #return
+            msg= "Single Fit completed but Following error occurred:%s"% sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+            return
        
        
@@ -829 +825 @@
                     page.onsetValues(result.fitness, small_param_name,small_out,small_cov)
         except:
-            raise
-             #msg= "Simultaneous Fit completed"
-             #msg +=" but Following error occurred:%s"%sys.exc_value
-             #wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
-             #return 
+             msg= "Simultaneous Fit completed"
+             msg +=" but Following error occurred:%s"%sys.exc_value
+             wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+             return 
              
                            
@@ -1205 +1200 @@
             
         except:
-            raise
-            #msg= " Error occurred when drawing %s Model 2D: "%model.name
-            #msg+= " %s"%sys.exc_value
-            #wx.PostEvent( self.parent, StatusEvent(status= msg ))
-            #return  
+            msg= " Error occurred when drawing %s Model 2D: "%model.name
+            msg+= " %s"%sys.exc_value
+            wx.PostEvent( self.parent, StatusEvent(status= msg ))
+            return  
    
     def _draw_model1D(self, model, data=None, smearer= None,