Changeset 2626 for trunk/GSASIIimgGUI.py

Timestamp:

Jan 12, 2017 11:56:41 AM (6 years ago)

Author:

vondreele

Message:

fix dialog issues (again) in image integration

File:

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

trunk/GSASIIimgGUI.py

@@ -217 +217 @@
         sumImg = GetImageZ(G2frame,data)
         if IntegrateOnly:
-            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))            
+            dlg = 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:
-            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))
+            dlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
+                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
+        try:
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)            
+        finally:
+            dlg.Destroy()
         G2frame.PauseIntegration = G2frame.Integrate[-1]
         del sumImg  #force cleanup
@@ -253 +255 @@
                         G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Masks'))
                     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))
+                    dlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
+                        style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
+                    try:
+                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,dlg)
+                    finally:
+                        dlg.Destroy()
                     del image   #force cleanup
                     pId = G2IO.SaveIntegration(G2frame,CId,Data)
@@ -1072 +1077 @@
                             vals = Items[Names.index(name)]
                             ctrls['GonioAngles'] = vals
-#                            G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls'),ctrls)
                         id, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
             finally:
@@ -1178 +1182 @@
     fitSize = mainSizer.Fit(G2frame.dataFrame)
     G2frame.dataFrame.setSizePosLeft(fitSize)
+    G2frame.dataFrame.SendSizeEvent()
     
 ################################################################################