Changeset 2304 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Jun 2, 2016 12:43:45 PM (6 years ago)
Author:
vondreele
Message:

add Cancel to image integration ProgressDialog? - will do a Pause in AutoIntegrate?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2302 r2304  
    962962    Nup += 1
    963963    if dlg:
    964         dlg.Update(Nup)
     964        pause = dlg.Update(Nup)
    965965    times[4] += time.time()-t0
    966966    print 'Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \
     
    969969    print 'Integration complete'
    970970    if returnN:     #As requested by Steven Weigand
    971         return H0,H1,H2,NST
     971        return H0,H1,H2,NST,not pause[0]
    972972    else:
    973         return H0,H1,H2
     973        return H0,H1,H2,not pause[0]
    974974   
    975975def MakeStrStaRing(ring,Image,Controls):
Note: See TracChangeset for help on using the changeset viewer.