Changeset 9c9a224 in sasview for fittingview


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/console.py

    r2bb37c3 r9c9a224  
    130130            self.fit_duration = 0 
    131131            u_flag = True 
    132              
    133132        if not last: 
    134             msg += "About %s s elapsed......... \n" % str (UPDATE_INTERVAL) 
    135             msg += "Fit Updates ........... %s \n" % str_time 
     133            msg = "Fit Updates ... %s \n" % str_time     
    136134        else: 
    137135            msg = "Final updates ........." 
     
    150148                    model_name = str(self.result.model.name) 
    151149                if m_flag and d_flag: 
    152                     msg += "Data : %s  , Model : %s \n"  % (str(data_name), 
    153                                                      str(model_name)) 
     150                    msg += "Data : %s \n"  % (str(data_name))#, 
     151                                                     #str(model_name)) 
    154152                msg +=  str(self.result) 
    155153                msg += "\n" 
     154                if not last: 
     155                    msg += "About %s s elapsed......... \n" % \ 
     156                                            str (UPDATE_INTERVAL) 
    156157            else: 
    157158                msg += "No result available\n" 
  • fittingview/src/sans/perspectives/fitting/fit_thread.py

    r2bb37c3 r9c9a224  
    7373                list_handler.append(self.handler) 
    7474                list_q.append(None) 
    75                 list_curr_thread.append(None) 
     75                list_curr_thread.append(self) 
    7676                list_ftol.append(self.ftol) 
    7777                list_reset_flag.append(self.reset_flag) 
Note: See TracChangeset for help on using the changeset viewer.