Changeset 12cd4ec in sasview

Timestamp:

May 20, 2011 3:18:46 PM (14 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:

92697e3

Parents:

823859a

Message:

handles fit error message better

Files:

• park_integration/AbstractFitEngine.py (modified) (1 diff)
• sansview/perspectives/fitting/console.py (modified) (1 diff)
• sansview/perspectives/fitting/fitpage.py (modified) (1 diff)
• sansview/perspectives/fitting/fitting.py (modified) (7 diffs)

park_integration/AbstractFitEngine.py

@@ -472 +472 @@
                     self.curr_thread.isquit()
                 except:
-                    raise FitAbort,"stop leastsqr optimizer"    
+                   self.handler.error("Fitting Terminated.")
+                   raise FitAbort,"The LeastSqr Fit: terminated by the user."    
+         
         return self.res
     

sansview/perspectives/fitting/console.py

@@ -95 +95 @@
         if self.isbetter:
             self.result.print_summary()
-        message = "fit Error"
+        message = "Fit Error:"
         message = str(msg)+ " \n %s"%self.result.__str__()
         wx.PostEvent(self.parent, StatusEvent(status=message,
                                    info="error", type="stop"))
-            
     def finalize(self):
         """

sansview/perspectives/fitting/fitpage.py

@@ -1876 +1876 @@
         self.Refresh()    
         #PostStatusEvent     
-        msg = "Fit completed! "
-        wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
+        #msg = "Fit completed!dddd "
+        #wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
 
     def onPinholeSmear(self, event):

sansview/perspectives/fitting/fitting.py

@@ -896 +896 @@
         try:
             if result == None:
+                self._update_fit_button(page_id)
                 msg= "Single Fitting did not converge!!!"
                 wx.PostEvent(self.parent, 
@@ -910 +911 @@
                                          info="warning",
                                          type="stop"))
+                self._update_fit_button(page_id)
                 return
             for uid in page_id:
@@ -924 +926 @@
                                   param_name, result.pvec,result.stderr)
                 cpage._on_fit_complete()
-
+            msg = "Completed!"
+            wx.PostEvent(self.parent, StatusEvent(status=msg))
         except ValueError:
+            self._update_fit_button(page_id)
             msg = "Single Fitting did not converge!!!"
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
                                                   type="stop"))
-            return   
+            return  
         except:
+            self._update_fit_button(page_id)
+            msg = "Single Fit completed but Following"
+            msg += " error occurred:%s" % sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
+                                                  type="stop"))
             raise
-            #msg = "Single Fit completed but Following"
-            #msg += " error occurred:%s" % sys.exc_value
-            #wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
-            #                                      type="stop"))
             return
        
@@ -953 +958 @@
             msg = "" 
             if result == None:
+                self._update_fit_button(page_id)
                 msg= "Complex Fitting did not converge!!!"
                 wx.PostEvent(self.parent, StatusEvent(status=msg,
@@ -960 +966 @@
                 numpy.any(result.pvec == None) or not \
                 numpy.all(numpy.isfinite(result.pvec)):
+                self._update_fit_button(page_id)
                 msg= "Simultaneous Fitting did not converge!!!"
                 wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
@@ -987 +994 @@
                                   small_out,small_cov)
                 cpage._on_fit_complete()
-                
+                msg = "Fit completed!"
+                wx.PostEvent(self.parent, StatusEvent(status=msg))
         except Exception:
+            self._update_fit_button(page_id)
             msg = "Complex Fitting did not converge!!!"
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
@@ -995 +1004 @@
 
         except:
+            self._update_fit_button(page_id)
             msg = "Simultaneous Fit completed"
             msg += " but Following error occurred:%s" % sys.exc_value
             wx.PostEvent(self.parent, StatusEvent(status=msg, type="stop"))
-   
+    
+    def _update_fit_button(self, page_id):
+        """
+        Update Fit button when fit stopped
+        
+        : parameter page_id: fitpage where the button is
+        """
+        for uid in page_id:  
+            page = self.fit_panel.get_page_by_id(uid)
+            page._on_fit_complete()
+        
     def _on_show_panel(self, event):
         """