Changeset f343069 in sasview

Timestamp:

Feb 17, 2009 8:57:36 AM (16 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:

ef628a1

Parents:

3c37ba2

Message:

improve message on gauge of the status bar

Location:

sansview/perspectives/fitting

Files:

• fit_thread.py (modified) (3 diffs)
• fitting.py (modified) (4 diffs)
• simfitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -132 +132 @@
         self.ymax = ymax
         self.done= False
+        wx.PostEvent(self.parent, StatusEvent(status=\
+                       "Start the computation %g " % self.starttime,curr_thread=self,type="start"))
     def isquit(self):
         try:
@@ -144 +146 @@
     def update(self):
         print "updatting"
-        timen= time.time()
+        elapsed = time.time()-self.starttime
         wx.PostEvent(self.parent, StatusEvent(status="Computing \
-        ... %g sec" % timen))
+        ... %g sec" %  elapsed ,curr_thread=self,type="update"))
             
     def compute(self):
@@ -152 +154 @@
             self.starttime = time.time()
             wx.PostEvent(self.parent, StatusEvent(status=\
-                       "Start the computation %g " % self.starttime))
+                       "Setting the fit Engine %g " % self.starttime,curr_thread=self,type="progress"))
             handler= ConsoleUpdate(parent= self.parent,improvement_delta=0.1)
             result = self.fitter.fit(handler= handler)

sansview/perspectives/fitting/fitting.py

@@ -286 +286 @@
           
         """
+        
         #print "single fit ", pars,result.pvec,result.stderr,result.fitness
-        #self.done = True
-        #wx.PostEvent(self.parent, StatusEvent(status="Fitting Completed: %g" % elapsed))
+        wx.PostEvent(self.parent, StatusEvent(status="Single fit \
+        complete in %g sec" % elapsed, type="stop"))
         try:
             for page, value in self.page_finder.iteritems():
@@ -328 +329 @@
             @param elapsed: computation time
         """
-        wx.PostEvent(self.parent, StatusEvent(status="Fitting Completed: %g" % elapsed))
+        wx.PostEvent(self.parent, StatusEvent(status="Sinmultaneous fit \
+        complete in %g sec" % elapsed, type="stop"))
         try:
             for page, value in self.page_finder.iteritems():
@@ -669 +671 @@
                 theory.x_bins= data.x_bins
                 theory.y_bins= data.y_bins
-                    
                 tempy=[]
                 #print "max x,y",max(data.xmax,data.xmin),max(data.ymax,data.ymin)
@@ -797 +798 @@
        
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
-        complete in %g sec" % elapsed))
+        complete in %g sec" % elapsed, type="stop"))
         #print "complete",output, model,qmin, qmax
         data = output

sansview/perspectives/fitting/simfitpage.py

@@ -59 +59 @@
         self.Centre()
         
+        
     def onFit(self,event):
         """ signal for fitting"""
@@ -73 +74 @@
         else:
             wx.PostEvent(self.parent.Parent, StatusEvent(status=\
-                            "Select at least on model to fit... "))
+                            "Select at least on model to fit "))
+           
             
             
@@ -187 +189 @@
                 #item[1].schedule_tofit(1)
                 self.model_toFit.append(item)
-                print "simultaneous fit ",item[1]
                 self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
             else: