Changeset 2650


Ignore:
Timestamp:
Jan 20, 2017 10:22:57 AM (5 years ago)
Author:
vondreele
Message:

fix cancel of peak indexing issues

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIindex.py

    r2546 r2650  
    856856            if dlg:
    857857#                GoOn,Skip = dlg.Update(100*Nc/ncMax)   #wx error doesn't work in 32 bit versions!
    858                 GoOn = dlg.Update(100*Nc/ncMax)
     858                GoOn = dlg.Update(100*Nc/ncMax)[0]
    859859                if Skip or not GoOn:
    860860                    GoOn = False
  • trunk/GSASIIpwdGUI.py

    r2649 r2650  
    29812981        try:
    29822982            OK,dmin,newcells = G2indx.DoIndexPeaks(peaks[0],controls,bravais,dlg,G2frame.ifX20)
     2983            if not OK:
     2984                dlg.Destroy()
    29832985        finally:
    29842986            dlg.Destroy()
     
    32893291    Size = mainSizer.Fit(G2frame.dataFrame)
    32903292    Size[0] += 25
     3293    Size[1] = min(600,Size[1])
    32913294    G2frame.dataFrame.setSizePosLeft(Size)   
    32923295   
Note: See TracChangeset for help on using the changeset viewer.