Changeset 327 for trunk/GSASIIplot.py

Timestamp:

Jul 1, 2011 12:10:28 PM (12 years ago)

Author:

vondreele

Message:

fix to path name for atomdata.dat
fix to texture display - can't have colorbars!
put in bit to show #threads used

File:

• trunk/GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIplot.py

@@ -1192 +1192 @@
     Page.canvas.draw()
     
-def PlotTexture(self,data,newPlot=False):
+def PlotTexture(self,data,newPlot=False,Start=False):
     '''Pole figure, inverse pole figure(?), 3D pole distribution and 3D inverse pole distribution(?)
     plotting; Need way to select  
@@ -1211 +1211 @@
     SHCoef = SHData['SH Coeff'][1]
     cell = generalData['Cell'][1:7]
-    Start = True
     
     def OnMotion(event):
@@ -1264 +1263 @@
             R = np.where(R <= 1.,2.*npasind(R*0.70710678),0.0)
             Z = np.zeros_like(R)
-            time0 = time.time()
             Z = G2lat.invpolfcal(ODFln,SGData,R,P)
-            print 'inverse time:',time.time()-time0
             Z = np.reshape(Z,(npts,npts))
             CS = Plot.contour(Y,X,Z,aspect='equal')
@@ -1272 +1269 @@
             Img = Plot.imshow(Z.T,aspect='equal',cmap='binary',extent=[-1,1,-1,1])
             if newPlot:
-                Page.figure.colorbar(Img)
+#                Page.figure.colorbar(Img)    #colorbar fails - crashes gsasii
                 newPlot = False
             Plot.set_title('Inverse pole figure for XYZ='+str(SHData['PFxyz']))
-            print 'inverse pole figure',Img
                         
         else:
@@ -1286 +1282 @@
             R = np.where(R <= 1.,2.*npasind(R*0.70710678),0.0)
             Z = np.zeros_like(R)
-            time0 = time.time()
             Z = G2lat.polfcal(ODFln,SamSym[textureData['Model']],R,P)
-            print 'polfig time:',time.time()-time0
             Z = np.reshape(Z,(npts,npts))
             CS = Plot.contour(Y,X,Z,aspect='equal')
@@ -1294 +1288 @@
             Img = Plot.imshow(Z.T,aspect='equal',cmap='binary',extent=[-1,1,-1,1])
             if newPlot:
-                Page.figure.colorbar(Img)
+#                Page.figure.colorbar(Img)    #colorbar fails - crashes gsasii
                 newPlot = False
             Plot.set_title('Pole figure for HKL='+str(SHData['PFhkl']))
-            print 'pole figure',Img
     Page.canvas.draw()
+
             
 def PlotExposedImage(self,newPlot=False,event=None):