Changeset 55 for trunk/GSASIIplot.py
 Timestamp:
 Apr 29, 2010 12:27:45 PM (13 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIplot.py
r54 r55 550 550 if (0 <= xpix <= size) and (0 <= ypix <= size): 551 551 Page.canvas.SetToolTipString('%6d'%(self.ImageZ[ypix][xpix])) 552 tth,azm,dsp = G2cmp.GetTth DspAzm(xpos,ypos,Data)552 tth,azm,dsp = G2cmp.GetTthAzmDsp(xpos,ypos,Data) 553 553 Q = 2.*math.pi/dsp 554 554 self.G2plotNB.status.SetFields(\ … … 609 609 rings.remove(ring) 610 610 else: 611 tth,azm,dsp = G2cmp.GetTth DspAzm(xpos,ypos,Data)611 tth,azm,dsp = G2cmp.GetTthAzmDsp(xpos,ypos,Data) 612 612 if 'Line2D' in str(self.itemPicked): 613 613 if 'line1' in str(self.itemPicked): … … 738 738 if azm and tth: 739 739 self.G2plotNB.status.SetFields(\ 740 ['Detector 2th =%9. 2fdeg, azm = %7.2fdeg'%(tth,azm),])740 ['Detector 2th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm),]) 741 741 742 742 def OnPick(event): … … 809 809 Plot.set_xlabel('azimuth',fontsize=12) 810 810 Plot.set_ylabel('2theta',fontsize=12) 811 Plot.contour(self.TA[:,:,0],self.TA[:,:,1], self.TA[:,:,2],V,cmap=acolor)811 Plot.contour(self.TA[:,:,0],self.TA[:,:,1],image,V,cmap=acolor) 812 812 if Data['showLines']: 813 813 IOtth = Data['IOtth'] … … 826 826 x,y = G2cmp.GetTthAzm(xring,yring,Data) 827 827 Plot.plot(y,x,'r+') 828 for ellipse in Data['ellipses']:829 ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color830 x,y = np.hsplit(ring,2)831 tth,azm = G2cmp.GetTthAzm(x,y,Data)832 Plot.plot(azm,tth,'b')828 for ellipse in Data['ellipses']: 829 ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color 830 x,y = np.hsplit(ring,2) 831 tth,azm = G2cmp.GetTthAzm(x,y,Data) 832 Plot.plot(azm,tth,'b,') 833 833 if not newPlot: 834 834 Page.toolbar.push_current() … … 859 859 if azm and tth: 860 860 self.G2plotNB.status.SetFields(\ 861 ['Detector 2th =%9. 2fdeg, azm = %7.2fdeg'%(tth,azm),])861 ['Detector 2th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm),]) 862 862 863 863 try: … … 889 889 Plot.set_xlabel('2theta',fontsize=12) 890 890 Plot.imshow(image,cmap=acolor,vmin=Imin,vmax=Imax,interpolation='nearest', \ 891 extent=[ysc[0],ysc[1],xsc[ 0],xsc[1]],aspect='auto')891 extent=[ysc[0],ysc[1],xsc[1],xsc[0]],aspect='auto') 892 892 if Data['setRings']: 893 893 rings = np.concatenate((Data['rings']),axis=0) … … 895 895 x,y = G2cmp.GetTthAzm(xring,yring,Data) 896 896 Plot.plot(x,y,'r+') 897 for ellipse in Data['ellipses']:898 ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color899 x,y = np.hsplit(ring,2)900 tth,azm = G2cmp.GetTthAzm(x,y,Data)901 Plot.plot(tth,azm,'b')897 for ellipse in Data['ellipses']: 898 ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color 899 x,y = np.hsplit(ring,2) 900 tth,azm = G2cmp.GetTthAzm(x,y,Data) 901 Plot.plot(tth,azm,'b,') 902 902 if not newPlot: 903 903 Page.toolbar.push_current()
Note: See TracChangeset
for help on using the changeset viewer.