Changeset 2625

Timestamp:

Jan 12, 2017 11:01:40 AM (7 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

Location:

trunk

Files:

• GSASIIIO.py (modified) (4 diffs)
• GSASIIimgGUI.py (modified) (6 diffs)

trunk/GSASIIIO.py

@@ -153 +153 @@
 
     '''
-    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(G2frame.Image)
+    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(treeId)
     if not os.path.exists(imagefile):
         print 'Image file '+imagefile+' not found'
@@ -165 +165 @@
                 print 'found image file '+os.path.join(G2frame.dirname,fil)
                 imagefile = os.path.join(G2frame.dirname,fil)
-                G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
+                G2frame.PatternTree.UpdateImageLoc(treeId,imagefile)
                 return Npix,imagefile,imagetag
             pth,enddir = os.path.split(pth)
@@ -189 +189 @@
                 print 'found image file '+os.path.join(pth,fil)
                 imagefile = os.path.join(pth,fil)
-                G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
+                G2frame.PatternTree.UpdateImageLoc(treeId,imagefile)
                 return Npix,imagefile,imagetag
             pth,enddir = os.path.split(pth)
@@ -204 +204 @@
             if dlg.ShowModal() == wx.ID_OK:
                 imagefile = dlg.GetPath()
-                G2frame.PatternTree.UpdateImageLoc(G2frame.Image,imagefile)
+                G2frame.PatternTree.UpdateImageLoc(treeId,imagefile)
             else:
                 imagefile = False

trunk/GSASIIimgGUI.py

@@ -69 +69 @@
             Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
             dformatName = Ddata.get('formatName','')
-            Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
-            darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
+            Npix,darkfile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
+            darkImage = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag,FormatName=dformatName)
             if darkImg is not None:                
                 sumImg += np.array(darkImage*darkScale,dtype='int32')
@@ -79 +79 @@
         Bid = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, backImg)
         if Bid:
-            Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,Bid)
+            Npix,backfile,imagetag = G2IO.GetCheckImageFile(G2frame,Bid)
             Bdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Bid,'Image Controls'))
             bformatName = Bdata.get('formatName','')
-            backImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=bformatName)
+            backImage = G2IO.GetImageData(G2frame,backfile,True,ImageTag=imagetag,FormatName=bformatName)
             if darkImg and backImage is not None:
                 Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root,darkImg)
@@ -88 +88 @@
                     Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
                     dformatName = Ddata.get('formatName','')
-                    Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
-                    darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
+                    Npix,darkfile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
+                    darkImage = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag,FormatName=dformatName)
                     if darkImage is not None:
                         backImage += np.array(darkImage*darkScale,dtype='int32')
@@ -215 +215 @@
         nYBlks = (Ny-1)/blkSize+1
         Nup = nXBlks*nYBlks*3+1     #exact count expected so AUTO_HIDE works!
+        sumImg = GetImageZ(G2frame,data)
         if IntegrateOnly:
-            pdlg = wx.ProgressDialog("Elapsed time","2D image integration\nPress Cancel to pause after current image",
-                Nup,style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)            
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,
+                wx.ProgressDialog("Elapsed time","2D image integration\nPress Cancel to pause after current image",
+                Nup,style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT))            
         else:
-            pdlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
-                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
-        sumImg = GetImageZ(G2frame,data)
-        G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,pdlg)
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,
+                wx.ProgressDialog("Elapsed time","2D image integration",Nup,
+                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE))
         G2frame.PauseIntegration = G2frame.Integrate[-1]
         del sumImg  #force cleanup
@@ -229 +230 @@
         G2frame.PatternTree.SelectItem(Id)
         G2frame.PatternTree.Expand(Id)
-        wx.CallAfter(pdlg.Destroy)
         for item in G2frame.MakePDF: item.Enable(True)
         
@@ -249 +249 @@
                     nYBlks = (Ny-1)/blkSize+1
                     Nup = nXBlks*nYBlks*3+3
-                    dlgp = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
-                        style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
                     image = GetImageZ(G2frame,Data)
                     Masks = G2frame.PatternTree.GetItemPyData(
                         G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Masks'))
-                    G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,dlgp)
+                    image = GetImageZ(G2frame,Data)
+                    G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,
+                        wx.ProgressDialog("Elapsed time","2D image integration",Nup,
+                        style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT))
                     del image   #force cleanup
                     pId = G2IO.SaveIntegration(G2frame,CId,Data)
-                    dlgp.Destroy()
                     if G2frame.Integrate[-1]:       #Cancel from progress bar?
                         break