Changeset 257
- Timestamp:
- Mar 9, 2011 1:09:55 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimage.py
r251 r257 314 314 import ImageCalibrants as calFile 315 315 print 'image calibrate' 316 time0 = time.time() 316 317 ring = data['ring'] 317 318 pixelSize = data['pixelSize'] … … 345 346 data['center'] = copy.copy(ellipse[0]) #not right!! (but useful for now) 346 347 data['ellipses'].append(ellipse[:]+('r',)) 347 G2plt.PlotImage(self )348 G2plt.PlotImage(self,newImage=False) 348 349 349 350 #setup for calibration … … 440 441 %(i,dist,phi,Tilt,cent[0],cent[1],numZ)) 441 442 data['ellipses'].append(copy.deepcopy(ellipse+('r',))) 442 G2plt.PlotImage(self)443 443 else: 444 444 break 445 G2plt.PlotImage(self,newImage=True) 445 446 fullSize = len(self.ImageZ)/scalex 446 447 if 2*radii[1] < .9*fullSize: … … 483 484 ellipse = GetEllipse(H[3],data) 484 485 data['ellipses'].append(copy.deepcopy(ellipse+('b',))) 485 G2plt.PlotImage(self) 486 print 'calibration time = ',time.time()-time0 487 G2plt.PlotImage(self,newImage=True) 486 488 return True 487 489 -
trunk/GSASIIimgGUI.py
r256 r257 187 187 188 188 def OnCalibrate(event): 189 self.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCLEARCALIB,enable=True) 189 190 data['setRings'] = False 190 191 setRings.SetValue(data['setRings']) -
trunk/GSASIIplot.py
r256 r257 893 893 plotNo = self.G2plotNB.nb.GetSelection() 894 894 if self.G2plotNB.nb.GetPageText(plotNo) == '2D Powder Image': 895 PlotImage(self,newPlot,event )895 PlotImage(self,newPlot,event,newImage=True) 896 896 elif self.G2plotNB.nb.GetPageText(plotNo) == '2D Integration': 897 897 PlotIntegration(self,newPlot,event) 898 898 899 def PlotImage(self,newPlot=False,event=None ):899 def PlotImage(self,newPlot=False,event=None,newImage=True): 900 900 from matplotlib.patches import Ellipse,Arc,Circle,Polygon 901 901 import numpy.ma as ma … … 955 955 Ypos = event.ydata 956 956 if event.key == 's': 957 print 'spot mask @ ',Xpos,Ypos958 957 Masks['Points'].append([Xpos,Ypos,1.]) 959 958 elif event.key == 'r': 960 959 tth = G2img.GetTth(Xpos,Ypos,Data) 961 print 'ring mask @ ',Xpos,Ypos,tth962 960 Masks['Rings'].append([tth,0.1]) 963 961 elif event.key == 'a': 964 962 tth,azm = G2img.GetTthAzm(Xpos,Ypos,Data) 965 963 azm = int(azm) 966 print 'arc mask @ ', Xpos,Ypos967 964 Masks['Arcs'].append([tth,[azm-5,azm+5],0.1]) 968 965 elif event.key == 'p': … … 991 988 else: 992 989 self.logPlot = True 993 PlotImage(self )990 PlotImage(self,newImage=True) 994 991 995 992 def OnKeyBox(event): … … 1061 1058 ypos /= scaley 1062 1059 Data['ring'].append([xpos,ypos]) 1063 PlotImage(self )1060 PlotImage(self,newImage=False) 1064 1061 return 1065 1062 else: … … 1137 1134 # else: #keep for future debugging 1138 1135 # print str(self.itemPicked),event.xdata,event.ydata,event.button 1139 PlotImage(self )1136 PlotImage(self,newImage=True) 1140 1137 self.itemPicked = None 1141 1138 … … 1146 1143 Plot = Page.figure.gca() #get previous powder plot & get limits 1147 1144 xylim = Plot.get_xlim(),Plot.get_ylim() 1148 Page.figure.clf() 1149 Plot = Page.figure.gca() #get a fresh plot after clf() 1145 if newImage: 1146 Page.figure.clf() 1147 Plot = Page.figure.gca() #get a fresh plot after clf() 1150 1148 1151 1149 except ValueError,error: … … 1208 1206 wx.BeginBusyCursor() 1209 1207 try: 1210 MA = ma.masked_greater(ma.masked_less(self.ImageZ,Zlim[0]),Zlim[1]) 1211 MaskA = ma.getmaskarray(MA) 1212 A = G2img.ImageCompress(MA,imScale) 1213 AM = G2img.ImageCompress(MaskA,imScale) 1214 if self.logPlot: 1215 A = np.log(A) 1216 AM = np.log(AM) 1217 Imin,Imax = [np.amin(A),np.amax(A)] 1218 1219 ImgM = Plot.imshow(AM,aspect='equal',cmap='Reds', 1220 interpolation='nearest',vmin=0,vmax=2,extent=[0,Xmax,Xmax,0]) 1221 Img = Plot.imshow(A,aspect='equal',cmap=acolor, 1222 interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Ymax,0]) 1223 if self.setPoly: 1224 Img.set_picker(True) 1208 1209 if newImage: 1210 MA = ma.masked_greater(ma.masked_less(self.ImageZ,Zlim[0]),Zlim[1]) 1211 MaskA = ma.getmaskarray(MA) 1212 A = G2img.ImageCompress(MA,imScale) 1213 AM = G2img.ImageCompress(MaskA,imScale) 1214 if self.logPlot: 1215 A = np.log(A) 1216 AM = np.log(AM) 1217 Imin,Imax = [np.amin(A),np.amax(A)] 1218 ImgM = Plot.imshow(AM,aspect='equal',cmap='Reds', 1219 interpolation='nearest',vmin=0,vmax=2,extent=[0,Xmax,Xmax,0]) 1220 Img = Plot.imshow(A,aspect='equal',cmap=acolor, 1221 interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Ymax,0]) 1222 if self.setPoly: 1223 Img.set_picker(True) 1225 1224 1226 1225 Plot.plot(xcent,ycent,'x') … … 1293 1292 self.polyList.append([Plot.plot(x,y,'r+',picker=10),ipoly]) 1294 1293 Plot.plot(x,y,'r') 1295 colorBar = Page.figure.colorbar(Img) 1294 if newImage: 1295 colorBar = Page.figure.colorbar(Img) 1296 1296 Plot.set_xlim(xlim) 1297 1297 Plot.set_ylim(ylim)
Note: See TracChangeset
for help on using the changeset viewer.