Changeset e54d2c32 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Apr 13, 2010 3:48:35 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:

90c9cdf

Parents:

e0072082

Message:

working on status bar display for fit

File:

• sansview/perspectives/fitting/fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/fitting.py

@@ -29 +29 @@
 from sans.fit.AbstractFitEngine import Model
 from sans.fit.AbstractFitEngine import FitAbort
-
+from console import ConsoleUpdate
 
 from fitproblem import FitProblem
@@ -462 +462 @@
                                                       type="stop"))
                 return 
-            
-        #Do the simultaneous fit
-        try:
-            ## If a thread is already started, stop it
-            #if self.calc_fit!= None and self.calc_fit.isrunning():
-            #    self.calc_fit.stop()
-            
-            wx.PostEvent(self.parent, StatusEvent(status="Start the computation",
-                                        curr_thread=self.calc_fit,type="start"))
-            time.sleep(0.5)
-            wx.PostEvent(self.parent, StatusEvent(status="Computing...",
-                                        curr_thread=self.calc_fit,type="progress"))
-            time.sleep(0.5)
-            ## perform single fit
-            if fitproblem_count == 1:
-                #qmin, qmax= self.current_pg.get_range()
-                #print "went here fitproblem_count == 1",fitproblem_count == 1
-                calc_fit=FitThread(parent =self.parent,
-                                        fn= self.fitter,
-                                       cpage=self.current_pg,
-                                       pars= pars,
-                                       completefn= self._single_fit_completed,
-                                       updatefn=self._updateFit)
-                
-                      
-            else:
-                ## Perform more than 1 fit at the time
-                calc_fit=FitThread(parent =self.parent,
-                                        fn= self.fitter,
-                                       completefn= self._simul_fit_completed,
-                                       updatefn=self._updateFit)
-            
-            calc_fit.queue()
-            self.ready_fit(calc_fit=calc_fit)
-            
-        except FitAbort:
-            print "in pluging"
-        except:
-            msg= "%s error: %s" % (engineType,sys.exc_value)
-            wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
-                                                    type="stop"))
-            return 
-        
+        ## If a thread is already started, stop it
+        #if self.calc_fit!= None and self.calc_fit.isrunning():
+        #    self.calc_fit.stop()
+         #Handler used for park engine displayed message
+        handler = ConsoleUpdate(parent=self.parent,improvement_delta=0.1)
+        ## perform single fit
+        if fitproblem_count == 1:
+            calc_fit=FitThread(parent =self.parent,
+                                    handler = handler,
+                                    fn= self.fitter,
+                                   cpage=self.current_pg,
+                                   pars= pars,
+                                   updatefn=handler.update_fit,
+                                   completefn= self._single_fit_completed)
+        else:
+            ## Perform more than 1 fit at the time
+            calc_fit=FitThread(parent=self.parent,
+                                handler=handler,
+                                    fn= self.fitter,
+                                   completefn= self._simul_fit_completed,
+                                  updatefn=handler.update_fit)
+        
+        calc_fit.queue()
+        self.ready_fit(calc_fit=calc_fit)
+      
     def ready_fit(self, calc_fit):
         """
@@ -740 +722 @@
                 data = self.create_fittable_data2D(data=plottable)
                 self.add_fit_page(data=data)
-
-    def _updateFit(self):
-        """
-            Is called when values of result are available
-        """
-        ##Sending a progess message to the status bar
-        wx.PostEvent(self.parent, StatusEvent(status="Computing..."))
             
     def _single_fit_completed(self,result,pars,cpage, elapsed=None):