Changeset 2627

Timestamp:

Jan 12, 2017 1:22:19 PM (6 years ago)

Author:

vondreele

Message:

remove progress bar stuff from image Integrate
put progress bar around integrate all
put wx.BusyCursor? around individual integrations & autointegrate

Location:

trunk

Files:

• GSASIIimage.py (modified) (6 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -862 +862 @@
     return tax,tay,taz,tad,tabs
     
-def ImageIntegrate(image,data,masks,blkSize=128,dlg=None,returnN=False):
+def ImageIntegrate(image,data,masks,blkSize=128,returnN=False):
     'Integrate an image; called from OnIntegrateAll and OnIntegrate in G2imgGUI'    #for q, log(q) bins need data['binType']
     import histogram2d as h2d
@@ -890 +890 @@
     tbeg = time.time()
     Nup = 0
-    if dlg:
-        dlg.Update(Nup)
     times = [0,0,0,0,0]
     for iBlk in range(nYBlks):
@@ -902 +900 @@
             TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times)           #2-theta & azimuth arrays & create position mask
             Nup += 1
-#            if dlg and jBlk == 0:                    #update progress bar on each row
-#                pause = dlg.Update(Nup)
-#                if not pause[0]: CancelPressed = True
             Block = image[iBeg:iFin,jBeg:jFin]
             t0 = time.time()
@@ -911 +906 @@
             times[2] += time.time()-t0
             Nup += 1
-#            if dlg and jBlk == 0:                    #update progress bar on each row
-#                pause = dlg.Update(Nup)
-#                if not pause[0]: CancelPressed = True
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
             tax = np.where(tax < LRazm[0],tax+360.,tax)
@@ -934 +926 @@
             Nup += 1
             del tax; del tay; del taz; del tad; del tabs
-            if dlg and jBlk == 0:                    #update progress bar on each row
-                pause = dlg.Update(Nup)
-                if not pause[0]: CancelPressed = True
     t0 = time.time()
     NST = np.array(NST,dtype=np.float)
@@ -959 +948 @@
         H0 /= np.array([G2pwd.Polarization(data['PolaVal'][0],H2[:-1],Azm=azm-90.)[0] for azm in (H1[:-1]+np.diff(H1)/2.)])
     Nup += 1
-    if dlg:
-        pause = dlg.Update(Nup)
-        if not pause[0]: CancelPressed = True
     times[4] += time.time()-t0
     print 'Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \

trunk/GSASIIimgGUI.py

@@ -211 +211 @@
         CleanupMasks(masks)
         blkSize = 128   #this seems to be optimal; will break in polymask if >1024
-        Nx,Ny = data['size']
-        nXBlks = (Nx-1)/blkSize+1
-        nYBlks = (Ny-1)/blkSize+1
-        Nup = nXBlks*nYBlks*3+1     #exact count expected so AUTO_HIDE works!
         sumImg = GetImageZ(G2frame,data)
-        if IntegrateOnly:
-            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:
-            dlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
-                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
+        wx.BeginBusyCursor()
         try:
-            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)            
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize)            
         finally:
-            dlg.Destroy()
+            wx.EndBusyCursor()    
         G2frame.PauseIntegration = G2frame.Integrate[-1]
         del sumImg  #force cleanup
@@ -241 +232 @@
                 items = dlg.GetSelections()
                 G2frame.EnablePlot = False
-                for item in items:
-                    name = Names[item]
-                    G2frame.Image = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name)
-                    CId = G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Image Controls')
-                    Data = G2frame.PatternTree.GetItemPyData(CId)
-                    blkSize = 128   #this seems to be optimal; will break in polymask if >1024
-                    Nx,Ny = Data['size']
-                    nXBlks = (Nx-1)/blkSize+1
-                    nYBlks = (Ny-1)/blkSize+1
-                    Nup = nXBlks*nYBlks*3+3
-                    image = GetImageZ(G2frame,Data)
-                    Masks = G2frame.PatternTree.GetItemPyData(
-                        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Masks'))
-                    image = GetImageZ(G2frame,Data)
-                    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)
-                    if G2frame.Integrate[-1]:       #Cancel from progress bar?
-                        break
-                else:
+                dlgp = wx.ProgressDialog("Elapsed time","2D image integrations",len(items)+1,
+                    style = wx.PD_ELAPSED_TIME|wx.PD_CAN_ABORT)
+                try:
+                    for icnt,item in enumerate(items):
+                        GoOn = dlgp.Update(icnt)
+                        if not GoOn[0]:
+                            break
+                        name = Names[item]
+                        G2frame.Image = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name)
+                        CId = G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Image Controls')
+                        Data = G2frame.PatternTree.GetItemPyData(CId)
+                        Masks = G2frame.PatternTree.GetItemPyData(
+                            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Masks'))
+                        image = GetImageZ(G2frame,Data)
+                        blkSize = 128   #this seems to be optimal; will break in polymask if >1024
+                        G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize)
+                        del image   #force cleanup
+                        pId = G2IO.SaveIntegration(G2frame,CId,Data)
+                finally:    
+                    dlgp.Destroy()
                     G2frame.EnablePlot = True
                     G2frame.PatternTree.SelectItem(pId)