Changeset 9c9a224 in sasview

Timestamp:

Oct 20, 2011 4:36:37 PM (13 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:

c00592d

Parents:

b837e1f

Message:

rearranged the fit updating strings

Location:

fittingview/src/sans/perspectives/fitting

Files:

• console.py (modified) (2 diffs)
• fit_thread.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/console.py

@@ -130 +130 @@
             self.fit_duration = 0
             u_flag = True
-            
         if not last:
-            msg += "About %s s elapsed......... \n" % str (UPDATE_INTERVAL)
-            msg += "Fit Updates ........... %s \n" % str_time
+            msg = "Fit Updates ... %s \n" % str_time    
         else:
             msg = "Final updates ........."
@@ -150 +148 @@
                     model_name = str(self.result.model.name)
                 if m_flag and d_flag:
-                    msg += "Data : %s  , Model : %s \n"  % (str(data_name),
-                                                     str(model_name))
+                    msg += "Data : %s \n"  % (str(data_name))#,
+                                                     #str(model_name))
                 msg +=  str(self.result)
                 msg += "\n"
+                if not last:
+                    msg += "About %s s elapsed......... \n" % \
+                                            str (UPDATE_INTERVAL)
             else:
                 msg += "No result available\n"

fittingview/src/sans/perspectives/fitting/fit_thread.py

@@ -73 +73 @@
                 list_handler.append(self.handler)
                 list_q.append(None)
-                list_curr_thread.append(None)
+                list_curr_thread.append(self)
                 list_ftol.append(self.ftol)
                 list_reset_flag.append(self.reset_flag)