Changeset 2625 for trunk/GSASIIIO.py


Ignore:
Timestamp:
Jan 12, 2017 11:01:40 AM (5 years ago)
Author:
vondreele
Message:

fix problem with using dark/background images - GetCheckImageFile? needed to refer to treeId rather than G2frame.Image
fix Progress bar problem in integration should be destroyed after each use

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r2610 r2625  
    153153
    154154    '''
    155     Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(G2frame.Image)
     155    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(treeId)
    156156    if not os.path.exists(imagefile):
    157157        print 'Image file '+imagefile+' not found'
     
    165165                print 'found image file '+os.path.join(G2frame.dirname,fil)
    166166                imagefile = os.path.join(G2frame.dirname,fil)
    167                 G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
     167                G2frame.PatternTree.UpdateImageLoc(treeId,imagefile)
    168168                return Npix,imagefile,imagetag
    169169            pth,enddir = os.path.split(pth)
     
    189189                print 'found image file '+os.path.join(pth,fil)
    190190                imagefile = os.path.join(pth,fil)
    191                 G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
     191                G2frame.PatternTree.UpdateImageLoc(treeId,imagefile)
    192192                return Npix,imagefile,imagetag
    193193            pth,enddir = os.path.split(pth)
     
    204204            if dlg.ShowModal() == wx.ID_OK:
    205205                imagefile = dlg.GetPath()
    206                 G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
     206                G2frame.PatternTree.UpdateImageLoc(treeId,imagefile)
    207207            else:
    208208                imagefile = False
Note: See TracChangeset for help on using the changeset viewer.