Changeset 2221

Timestamp:

Apr 21, 2016 11:35:24 AM (7 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:

• trunk/GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIimgGUI.py

@@ -815 +815 @@
         fullIntegrate.Bind(wx.EVT_CHECKBOX, OnFullIntegrate)
         fullIntegrate.SetValue(data['fullIntegrate'])
-        setDefault = wx.CheckBox(parent=G2frame.dataDisplay,label='Use as default for all images?')
+        setDefault = wx.CheckBox(parent=G2frame.dataDisplay,label='Use for all new images?')
         dataSizer.Add(setDefault,0,WACV)
         setDefault.Bind(wx.EVT_CHECKBOX, OnSetDefault)
@@ -1708 +1708 @@
                     id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, name)
                     Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Id)
-                    image = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
-                    dark = Controls['dark image']
-                    if dark[0]:
-                        id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root,dark[0])
-                        Npix,darkfile,imagetag = G2frame.PatternTree.GetImageLoc(id)
-                        darkImg = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag)
-                        image += dark[1]*darkImg
+                    image = GetImageZ(G2frame,Controls)
                     G2img.FitStrSta(image,StaCtrls,Controls)
                     G2plt.PlotStrain(G2frame,StaCtrls,newPlot=True)