Changeset 281
- Timestamp:
- May 4, 2011 4:18:44 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r273 r281 422 422 self.CheckNotebook() 423 423 dlg = wx.FileDialog(self, 'Choose image files', '.', '',\ 424 'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img )\425 |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img |\424 'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img)\ 425 |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img|\ 426 426 Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\ 427 427 MAR file (*.mar*)|*.mar*|\ 428 428 GE Image (*.avg;*.sum)|*.avg;*.sum|\ 429 429 ADSC Image (*.img)|*.img|\ 430 GSAS-II Image (*.G2img)|*.G2img|\ 430 431 All files (*.*)|*.*', 431 432 wx.OPEN | wx.MULTIPLE) … … 602 603 name.SetEditable(False) 603 604 scale = wx.TextCtrl(panel,id,str(item[0]),style=wx.TE_PROCESS_ENTER) 604 scale.Bind(wx.EVT_TEXT,self.OnScaleChange) 605 scale.Bind(wx.EVT_TEXT_ENTER,self.OnScaleChange) 606 scale.Bind(wx.EVT_KILL_FOCUS,self.OnScaleChange) 605 607 dataGridSizer.Add(scale,0,wx.LEFT,10) 606 608 dataGridSizer.Add(name,0,wx.RIGHT,10) … … 608 610 wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10) 609 611 self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER) 610 self.name.Bind(wx.EVT_TEXT,self.OnNameChange) 612 self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange) 613 self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange) 611 614 dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10) 612 615 mainSizer.Add(dataGridSizer,0,wx.EXPAND) … … 825 828 self.dirname = dlg.GetDirectory() 826 829 newimagefile = dlg.GetPath() 827 G2IO.PutG2Image(newimagefile, newImage)830 G2IO.PutG2Image(newimagefile,Comments,Data,Npix,newImage) 828 831 Imax = np.amax(newImage) 829 832 Imin = np.amin(newImage) -
trunk/GSASIIIO.py
r273 r281 448 448 Comments,Data,Npix,Image = GetGEsumData(imagefile) 449 449 elif ext == '.G2img': 450 returnGetG2Image(imagefile)450 Comments,Data,Npix,Image = GetG2Image(imagefile) 451 451 if imageOnly: 452 452 return Image … … 454 454 return Comments,Data,Npix,Image 455 455 456 def PutG2Image(filename, image):456 def PutG2Image(filename,Comments,Data,Npix,image): 457 457 File = open(filename,'wb') 458 cPickle.dump( image,File,1)458 cPickle.dump([Comments,Data,Npix,image],File,1) 459 459 File.close() 460 460 return … … 462 462 def GetG2Image(filename): 463 463 File = open(filename,'rb') 464 image = cPickle.load(File)464 Comments,Data,Npix,image = cPickle.load(File) 465 465 File.close() 466 return image466 return Comments,Data,Npix,image 467 467 468 468 def GetGEsumData(filename,imageOnly=False): … … 783 783 784 784 def SaveIntegration(self,PickId,data): 785 azms = self.Integrate[1] 785 azms = self.Integrate[1][:-1] 786 786 X = self.Integrate[2][:-1] 787 787 Xminmax = [X[0],X[-1]] … … 793 793 names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','SH/L','Azimuth'] 794 794 codes = [0 for i in range(11)] 795 Azms = [(azms[i+1]+azms[i])/2. for i in range(len(azms)-1)]795 LRazm = data['LRazimuth'] 796 796 if data['fullIntegrate'] and data['outAzimuths'] == 1: 797 Azms = [ 0.0,]798 for i,azm in enumerate( Azms):797 Azms = [45.0,] #a poor man's average? 798 for i,azm in enumerate(azms): 799 799 item, cookie = self.PatternTree.GetFirstChild(self.root) 800 800 Id = 0 -
trunk/GSASIIplot.py
r273 r281 384 384 if self.Contour: 385 385 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")] 386 choice.sort() 386 387 dlg = wx.SingleChoiceDialog(self,'Select','Color scheme',choice) 387 388 if dlg.ShowModal() == wx.ID_OK: … … 717 718 if self.Contour: 718 719 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")] 720 choice.sort() 719 721 dlg = wx.SingleChoiceDialog(self,'Select','Color scheme',choice) 720 722 if dlg.ShowModal() == wx.ID_OK: -
trunk/GSASIIpwdGUI.py
r273 r281 1417 1417 inst = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,powId,'Instrument Parameters')) 1418 1418 inst = dict(zip(inst[3],inst[1])) 1419 auxPlot = G2pwd.CalcPDF( data,inst,xydata)1419 auxPlot = G2pwd.CalcPDF(Data,inst,xydata) 1420 1420 PDFId = G2gd.GetPatternTreeItemId(self,self.root,'PDF '+powName[4:]) 1421 1421 self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,PDFId,'I(Q)'+powName[4:]),xydata['IofQ']) … … 1428 1428 print 'Calculating PDF:' 1429 1429 auxPlot = ComputePDF(data) 1430 print 'Done calculating PDF:' 1430 1431 Status.SetStatusText('PDF computed') 1431 1432 for plot in auxPlot: … … 1449 1450 Status.SetStatusText('All PDFs computed') 1450 1451 G2plt.PlotISFG(self,newPlot=True,type='G(R)') 1452 print ' Done calculating PDFs:' 1451 1453 1452 1454 def OnShowTip(self,tip):
Note: See TracChangeset
for help on using the changeset viewer.