Changeset 2322 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Jun 15, 2016 7:40:20 AM (5 years ago)
Author:
vondreele
Message:

(partially) fixed Cancel/Pause? behavior in AutoIntegrate?. Will crash 32-bit if Cancel pressed too soon & if Pause pressed repeatedly during integration. 64-bit seems immune to this.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2305 r2322  
    904904            Nup += 1
    905905            if dlg:
    906                 dlg.Update(Nup)
     906                pause = dlg.Update(Nup)
    907907            Block = image[iBeg:iFin,jBeg:jFin]
    908908            t0 = time.time()
     
    912912            Nup += 1
    913913            if dlg:
    914                 dlg.Update(Nup)
     914                pause = dlg.Update(Nup)
    915915            tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
    916916            tax = np.where(tax < LRazm[0],tax+360.,tax)
     
    934934            del tax; del tay; del taz; del tad; del tabs
    935935            if dlg:
    936                 dlg.Update(Nup)
     936                pause = dlg.Update(Nup)
    937937    t0 = time.time()
    938938    NST = np.array(NST,dtype=np.float)
Note: See TracChangeset for help on using the changeset viewer.