Changeset 2221


Ignore:
Timestamp:
Apr 21, 2016 11:35:24 AM (6 years ago)
Author:
vondreele
Message:

change text of "Use as default ..." to "use for all new .." on Image Controls page
Use GetImageZ in Stress/strain fitting to get image corrected for dark, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r2213 r2221  
    815815        fullIntegrate.Bind(wx.EVT_CHECKBOX, OnFullIntegrate)
    816816        fullIntegrate.SetValue(data['fullIntegrate'])
    817         setDefault = wx.CheckBox(parent=G2frame.dataDisplay,label='Use as default for all images?')
     817        setDefault = wx.CheckBox(parent=G2frame.dataDisplay,label='Use for all new images?')
    818818        dataSizer.Add(setDefault,0,WACV)
    819819        setDefault.Bind(wx.EVT_CHECKBOX, OnSetDefault)
     
    17081708                    id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, name)
    17091709                    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Id)
    1710                     image = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
    1711                     dark = Controls['dark image']
    1712                     if dark[0]:
    1713                         id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root,dark[0])
    1714                         Npix,darkfile,imagetag = G2frame.PatternTree.GetImageLoc(id)
    1715                         darkImg = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag)
    1716                         image += dark[1]*darkImg
     1710                    image = GetImageZ(G2frame,Controls)
    17171711                    G2img.FitStrSta(image,StaCtrls,Controls)
    17181712                    G2plt.PlotStrain(G2frame,StaCtrls,newPlot=True)
Note: See TracChangeset for help on using the changeset viewer.