Changeset 949aa2c in sasview for src/sans/perspectives/fitting/console.py

Timestamp:

Jun 3, 2014 6:13:26 PM (10 years ago)

Author:

pkienzle

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:

f8940db

Parents:

35086c3 (diff), eb9fc6d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from trunk to bumps

File:

• src/sans/perspectives/fitting/console.py (modified) (5 diffs)

src/sans/perspectives/fitting/console.py

@@ -5 +5 @@
 import time
 import wx
-import park
-from park.fitresult import FitHandler
+from sans.fit import FitHandler
 
 class ConsoleUpdate(FitHandler):
@@ -88 +87 @@
         Print result object
         """
-        msg = " \n %s \n" % self.result.__str__()
+        msg = " \n %s \n" % str(self.result)
         wx.PostEvent(self.parent, StatusEvent(status=msg))
                      
@@ -129 +128 @@
             
         
-    def update_fit(self, msg="", last=False):
+    def update_fit(self, last=False):
         """
         """
@@ -136 +135 @@
         self.update_duration = t1
         self.fit_duration += self.elapsed_time
-        str_time = time.strftime("%a, %d %b %Y %H:%M:%S ", time.localtime(t1))
-        UPDATE_INTERVAL = 0.5
+        str_time = time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(t1))
+        UPDATE_INTERVAL = 5.0
         u_flag = False
         if self.fit_duration >= UPDATE_INTERVAL:
             self.fit_duration = 0
             u_flag = True
-        if not last:
-            msg += "Fit Updates ... %s \n" % str_time    
-        else:
-            msg += "Final updates ........."
+        msg = str_time
         if u_flag or last:
             if self.result is not None:
@@ -164 +160 @@
                 msg +=  str(self.result)
                 msg += "\n"
-                if not last:
-                    msg += "About %s s elapsed......... \n" % \
-                                            str (UPDATE_INTERVAL)
             else:
                 msg += "No result available\n"