Changeset 257

Timestamp:

Mar 9, 2011 1:09:55 PM (11 years ago)

Author:

vondreele

Message:

change plotting during calibration - now at end - faster
make image plotting optional - saves a little here & there

Location:

trunk

Files:

• GSASIIimage.py (modified) (4 diffs)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (8 diffs)

trunk/GSASIIimage.py

@@ -314 +314 @@
     import ImageCalibrants as calFile
     print 'image calibrate'
+    time0 = time.time()
     ring = data['ring']
     pixelSize = data['pixelSize']
@@ -345 +346 @@
     data['center'] = copy.copy(ellipse[0])           #not right!! (but useful for now)
     data['ellipses'].append(ellipse[:]+('r',))
-    G2plt.PlotImage(self)
+    G2plt.PlotImage(self,newImage=False)
     
     #setup for calibration
@@ -440 +441 @@
                 %(i,dist,phi,Tilt,cent[0],cent[1],numZ))
             data['ellipses'].append(copy.deepcopy(ellipse+('r',)))
-            G2plt.PlotImage(self)
         else:
             break
+    G2plt.PlotImage(self,newImage=True)
     fullSize = len(self.ImageZ)/scalex
     if 2*radii[1] < .9*fullSize:
@@ -483 +484 @@
         ellipse = GetEllipse(H[3],data)
         data['ellipses'].append(copy.deepcopy(ellipse+('b',)))
-    G2plt.PlotImage(self)        
+    print 'calibration time = ',time.time()-time0
+    G2plt.PlotImage(self,newImage=True)        
     return True
     

trunk/GSASIIimgGUI.py

@@ -187 +187 @@
             
     def OnCalibrate(event):        
+        self.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCLEARCALIB,enable=True)    
         data['setRings'] = False
         setRings.SetValue(data['setRings'])

trunk/GSASIIplot.py

@@ -893 +893 @@
     plotNo = self.G2plotNB.nb.GetSelection()
     if self.G2plotNB.nb.GetPageText(plotNo) == '2D Powder Image':
-        PlotImage(self,newPlot,event)
+        PlotImage(self,newPlot,event,newImage=True)
     elif self.G2plotNB.nb.GetPageText(plotNo) == '2D Integration':
         PlotIntegration(self,newPlot,event)
 
-def PlotImage(self,newPlot=False,event=None):
+def PlotImage(self,newPlot=False,event=None,newImage=True):
     from matplotlib.patches import Ellipse,Arc,Circle,Polygon
     import numpy.ma as ma
@@ -955 +955 @@
             Ypos = event.ydata
             if event.key == 's':
-                print 'spot mask @ ',Xpos,Ypos
                 Masks['Points'].append([Xpos,Ypos,1.])
             elif event.key == 'r':
                 tth = G2img.GetTth(Xpos,Ypos,Data)
-                print 'ring mask @ ',Xpos,Ypos,tth
                 Masks['Rings'].append([tth,0.1])
             elif event.key == 'a':
                 tth,azm = G2img.GetTthAzm(Xpos,Ypos,Data)
                 azm = int(azm)                
-                print 'arc mask @ ', Xpos,Ypos
                 Masks['Arcs'].append([tth,[azm-5,azm+5],0.1])
             elif event.key == 'p':
@@ -991 +988 @@
                 else:
                     self.logPlot = True
-        PlotImage(self)
+        PlotImage(self,newImage=True)
             
     def OnKeyBox(event):
@@ -1061 +1058 @@
                         ypos /= scaley
                         Data['ring'].append([xpos,ypos])
-                PlotImage(self)
+                PlotImage(self,newImage=False)
             return
         else:
@@ -1137 +1134 @@
 #                    else:                  #keep for future debugging
 #                        print str(self.itemPicked),event.xdata,event.ydata,event.button
-                PlotImage(self)
+                PlotImage(self,newImage=True)
             self.itemPicked = None
             
@@ -1146 +1143 @@
             Plot = Page.figure.gca()          #get previous powder plot & get limits
             xylim = Plot.get_xlim(),Plot.get_ylim()
-        Page.figure.clf()
-        Plot = Page.figure.gca()          #get a fresh plot after clf()
+        if newImage:
+            Page.figure.clf()
+            Plot = Page.figure.gca()          #get a fresh plot after clf()
         
     except ValueError,error:
@@ -1208 +1206 @@
     wx.BeginBusyCursor()
     try:
-        MA = ma.masked_greater(ma.masked_less(self.ImageZ,Zlim[0]),Zlim[1])
-        MaskA = ma.getmaskarray(MA)
-        A = G2img.ImageCompress(MA,imScale)
-        AM = G2img.ImageCompress(MaskA,imScale)
-        if self.logPlot:
-            A = np.log(A)
-            AM = np.log(AM)
-            Imin,Imax = [np.amin(A),np.amax(A)]
-                    
-        ImgM = Plot.imshow(AM,aspect='equal',cmap='Reds',
-            interpolation='nearest',vmin=0,vmax=2,extent=[0,Xmax,Xmax,0])
-        Img = Plot.imshow(A,aspect='equal',cmap=acolor,
-            interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Ymax,0])
-        if self.setPoly:
-            Img.set_picker(True)
+            
+        if newImage:                    
+            MA = ma.masked_greater(ma.masked_less(self.ImageZ,Zlim[0]),Zlim[1])
+            MaskA = ma.getmaskarray(MA)
+            A = G2img.ImageCompress(MA,imScale)
+            AM = G2img.ImageCompress(MaskA,imScale)
+            if self.logPlot:
+                A = np.log(A)
+                AM = np.log(AM)
+                Imin,Imax = [np.amin(A),np.amax(A)]
+            ImgM = Plot.imshow(AM,aspect='equal',cmap='Reds',
+                interpolation='nearest',vmin=0,vmax=2,extent=[0,Xmax,Xmax,0])
+            Img = Plot.imshow(A,aspect='equal',cmap=acolor,
+                interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Ymax,0])
+            if self.setPoly:
+                Img.set_picker(True)
     
         Plot.plot(xcent,ycent,'x')
@@ -1293 +1292 @@
             self.polyList.append([Plot.plot(x,y,'r+',picker=10),ipoly])
             Plot.plot(x,y,'r')            
-        colorBar = Page.figure.colorbar(Img)
+        if newImage:
+            colorBar = Page.figure.colorbar(Img)
         Plot.set_xlim(xlim)
         Plot.set_ylim(ylim)