Changeset 56
- Timestamp:
- Apr 29, 2010 5:04:39 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r55 r56 378 378 try: 379 379 if dlg.ShowModal() == wx.ID_OK: 380 self.imagefile = dlg.GetPath()380 imagefile = dlg.GetPath() 381 381 self.dirname = dlg.GetDirectory() 382 ext = ospath.splitext(self.imagefile)[1] 383 Comments = [] 384 if ext == '.tif': 385 Comments,Data,Size,Image = G2IO.GetTifData(self.imagefile) 386 elif ext == '.img': 387 Comments,Data,Size,Image = G2IO.GetImgData(self.imagefile) 388 Image[0][0] = 0 389 elif ext == '.mar3450' or ext == '.mar2300': 390 Comments,Data,Size,Image = G2IO.GetMAR345Data(self.imagefile) 391 elif ext in ['.sum','.avg']: 392 Comments,Data,Size,Image = G2IO.GetGEsumData(self.imagefile) 382 Comments,Data,Size,Image = G2IO.GetImageData(imagefile) 393 383 if Comments: 394 Id = self.PatternTree.AppendItem(parent=self.root,text='IMG '+ospath.basename( self.imagefile))384 Id = self.PatternTree.AppendItem(parent=self.root,text='IMG '+ospath.basename(imagefile)) 395 385 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Comments'),Comments) 396 386 Imax = np.amax(Image) … … 421 411 Data['range'] = [(Imin,Imax),[Imin,Imax]] 422 412 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data) 423 self.PatternTree.SetItemPyData(Id,[Size, Image])413 self.PatternTree.SetItemPyData(Id,[Size,imagefile]) 424 414 self.PickId = Id 425 415 self.Image = Id -
trunk/GSASIIIO.py
r55 r56 388 388 return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)] 389 389 390 def GetGEsumData(filename): 390 def GetImageData(imagefile,imageOnly=False): 391 ext = ospath.splitext(imagefile)[1] 392 Comments = [] 393 if ext == '.tif': 394 Comments,Data,Size,Image = GetTifData(imagefile) 395 elif ext == '.img': 396 Comments,Data,Size,Image = GetImgData(imagefile) 397 Image[0][0] = 0 398 elif ext == '.mar3450' or ext == '.mar2300': 399 Comments,Data,Size,Image = GetMAR345Data(imagefile) 400 elif ext in ['.sum','.avg']: 401 Comments,Data,Size,Image = GetGEsumData(imagefile) 402 if imageOnly: 403 return Image 404 else: 405 return Comments,Data,Size,Image 406 407 408 def GetGEsumData(filename,imageOnly=False): 391 409 import array as ar 392 410 print 'Read GE sum file: ',filename … … 411 429 row += 1 412 430 data = {'pixelSize':(200,200),'wavelength':0.15,'distance':250.0,'center':[204.8,204.8]} 413 return head,data,size,image414 431 File.close() 432 if imageOnly: 433 return image 434 else: 435 return head,data,size,image 415 436 416 def GetImgData(filename ):437 def GetImgData(filename,imageOnly=False): 417 438 import struct as st 418 439 import array as ar … … 454 475 pos += 2*size 455 476 File.close() 456 return lines[1:-2],data,size,image 477 if imageOnly: 478 return image 479 else: 480 return lines[1:-2],data,size,image 457 481 458 def GetMAR345Data(filename ):482 def GetMAR345Data(filename,imageOnly=False): 459 483 import array as ar 460 484 import struct as st … … 505 529 image = np.zeros(shape=(size,size),dtype=np.int32) 506 530 image = pf.pack_f(len(raw),raw,size,image) 507 return head,data,size,image.T 508 509 def GetTifData(filename): 531 if imageOnly: 532 return image.T 533 else: 534 return head,data,size,image.T 535 536 def GetTifData(filename,imageOnly=False): 510 537 # only works for APS Perkin-Elmer detector data files in "TIFF" format that are readable by Fit2D 511 538 import struct as st … … 543 570 pos += 4*size 544 571 data = {'pixelSize':(200,200),'wavelength':0.10,'distance':100.0,'center':[204.8,204.8]} 545 return head,data,size,image546 547 572 File.close() 573 if imageOnly: 574 return image 575 else: 576 return head,data,size,image 577 548 578 549 579 def ProjFileOpen(self): -
trunk/GSASIIcomp.py
r55 r56 1665 1665 t2 = time.time() 1666 1666 print "Elapsed time:","%8.3f"%(t2-t1), "s" 1667 G2plt.PlotTRImage(self,newPlot=True)1667 # G2plt.PlotTRImage(self,newPlot=True) 1668 1668 print 'Form 1-D histograms for ',numAzms,' azimuthal angles' 1669 1669 print 'Integration limits:',LUtth,LRazm -
trunk/GSASIIplot.py
r55 r56 8 8 import GSASIIgrid as G2gd 9 9 import GSASIIcomp as G2cmp 10 import GSASIIIO as G2IO 10 11 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas 11 12 from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar … … 654 655 655 656 Plot.set_title(self.PatternTree.GetItemText(self.Image)[4:]) 656 size,self.ImageZ = self.PatternTree.GetItemPyData(self.Image) 657 size,imagefile = self.PatternTree.GetItemPyData(self.Image) 658 self.ImageZ = G2IO.GetImageData(imagefile,True) 657 659 Data = self.PatternTree.GetItemPyData( \ 658 660 G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls')) … … 801 803 Data = self.PatternTree.GetItemPyData( \ 802 804 G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls')) 805 size,imagefile = self.PatternTree.GetItemPyData(self.Image) 806 self.ImageZ = G2IO.GetImageData(imagefile,True) 803 807 image = self.ImageZ 804 808 Iz = len(image)
Note: See TracChangeset
for help on using the changeset viewer.