Changeset ed2ea6a in sasview for sansview/perspectives/fitting/fit_thread.py

Timestamp:

Feb 27, 2009 6:53:16 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:

b491d6e

Parents:

6d920cd

Message:

print statement removed

File:

• sansview/perspectives/fitting/fit_thread.py (modified) (6 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -8 +8 @@
 DEFAULT_BEAM = 0.005
 import time
-
-import thread
-print "main",thread.get_ident()
-
  
 class ConsoleUpdate(FitHandler):
@@ -53 +49 @@
             
             wx.PostEvent(self.parent, StatusEvent(status=\
-             "%d%% complete ..."%(p)))
+             "%d%% complete ..."%(p),type="update"))
        
         # Update percent complete
@@ -61 +57 @@
         if dt > self.progress_delta:
             if 1 <= dp <= 2:
-                print "%d%% complete"%p
                 self.progress_percent = p
                 self.progress_time = t
                 wx.PostEvent(self.parent, StatusEvent(status=\
-                                                      "%d%% complete ..."%(p)))
+                                                      "%d%% complete ..."%(p),type="update"))
        
             elif 2 < dp <= 5:
                 if p//5 != self.progress_percent//5:
-                    print "%d%% complete"%(5*(p//5))
                     wx.PostEvent(self.parent, StatusEvent(status=\
-                       "%d%% complete ..."%(5*(p//5))))
+                       "%d%% complete ..."%(5*(p//5)),type="update"))
                     self.progress_percent = p
                     self.progress_time = t
             else:
                 if p//10 != self.progress_percent//10:
-                    print "%d%% complete"%(10*(p//10))
-                    
                     self.progress_percent = p
                     self.progress_time = t
                     wx.PostEvent(self.parent, StatusEvent(status=\
-                   "%d%% complete ..."%(10*(p//10))))
+                   "%d%% complete ..."%(10*(p//10)),type="update"))
         
     def improvement(self):
@@ -107 +99 @@
 
 class FitThread(CalcThread):
-    """Compute 2D data"""
+    """Thread performing the fit """
     
     def __init__(self,parent, fn,pars=None,cpage=None, qmin=None,qmax=None,ymin=None, ymax=None,
@@ -135 +127 @@
                        "Start the computation  ",curr_thread=self,type="start"))
     def isquit(self):
+        """
+             @raise KeyboardInterrupt: when the thread is interrupted
+        """
         try:
             CalcThread.isquit(self)
         except KeyboardInterrupt:
-            #printEVT("Calc %s interrupted" % self.model.name)
             wx.PostEvent(self.parent, StatusEvent(status=\
-                       "Calc %g interrupted" % time.time()))
-           
+                       "Calc %g interrupted"))
             raise KeyboardInterrupt
         
     def update(self):
-        print "updatting"
-        elapsed = time.time()-self.starttime
+        """
+            Is called when values of result are available
+        """
         wx.PostEvent(self.parent, StatusEvent(status="Computing \
         ... " ,curr_thread=self,type="update"))
             
     def compute(self):
+        """
+            Perform a fit 
+        """
         try: 
             self.starttime = time.time()
+            #Sending a progess message to the status bar
             wx.PostEvent(self.parent, StatusEvent(status=\
                        "Computing . ...",curr_thread=self,type="progress"))
+            #Handler used for park engine displayed message
             handler= ConsoleUpdate(parent= self.parent,improvement_delta=0.1)
+            #Result from the fit
             result = self.fitter.fit(handler= handler)
-            print "result", result
-           
-            print "in my compute function"
+        
             elapsed = time.time()-self.starttime
             self.complete(result= result,
@@ -174 +172 @@
             # Thread was interrupted, just proceed and re-raise.
             # Real code should not print, but this is an example...
-            print "Thread stopped. "
             raise
         except: