Changeset 1386
- Timestamp:
- Jun 17, 2014 2:45:48 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1380 r1386 2485 2485 Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]} 2486 2486 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Masks'),Masks) 2487 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Stress/Strain'),{}) 2487 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Stress/Strain'), 2488 {'Type':'True','d-zero':[],'Sample phi':0.0,'Sample z':0.0,'Sample load':0.0}) 2488 2489 self.PatternTree.SelectItem(Id) 2489 2490 self.PatternTree.Expand(Id) -
trunk/GSASIIIO.py
r1384 r1386 282 282 283 283 def PutG2Image(filename,Comments,Data,Npix,image): 284 'Write an image as a python pickle '284 'Write an image as a python pickle - might be better as an .edf file?' 285 285 File = open(filename,'wb') 286 286 cPickle.dump([Comments,Data,Npix,image],File,1) -
trunk/GSASIIgrid.py
r1384 r1386 4838 4838 G2frame.Image = G2frame.PatternTree.GetItemParent(item) 4839 4839 data = G2frame.PatternTree.GetItemPyData(item) 4840 G2imG.UpdateStressStrain(G2frame,data)4841 4840 G2plt.PlotImage(G2frame) 4842 4841 G2plt.PlotStrain(G2frame,data,newPlot=True) 4842 G2imG.UpdateStressStrain(G2frame,data) 4843 4843 elif G2frame.PatternTree.GetItemText(item) == 'PDF Controls': 4844 4844 G2frame.PatternId = G2frame.PatternTree.GetItemParent(item) -
trunk/GSASIIimgGUI.py
r1384 r1386 21 21 import time 22 22 import copy 23 import cPickle24 23 import GSASIIpath 25 24 GSASIIpath.SetVersionNumber("$Revision$") … … 235 234 236 235 def OnCopyControls(event): 237 import copy238 236 TextList = [[False,'All IMG',0]] 239 237 Names = [] … … 246 244 if id == G2frame.Image: 247 245 Source = name 248 Data = copy.deepcopy(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls'))) 246 Data = copy.deepcopy(data) 247 # Data = copy.deepcopy(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls'))) 249 248 Data['showLines'] = True 250 249 Data['ring'] = [] … … 278 277 finally: 279 278 dlg.Destroy() 279 G2frame.PatternTree.SelectItem(G2frame.PickId) 280 280 281 281 def OnSaveControls(event): … … 624 624 625 625 def OnSetDefault(event): 626 import copy627 626 if data['setDefault']: 628 627 G2frame.imageDefault = {} … … 1098 1097 1099 1098 def OnCopyMask(event): 1100 import copy1101 1099 TextList = [[False,'All IMG',0]] 1102 1100 Names = [] … … 1419 1417 1420 1418 def OnCopyStrSta(event): 1421 import copy 1422 TextList = [[False,'All IMG',0]] 1419 TextList = [[False,'All IMG',0,0]] 1423 1420 Names = [] 1424 1421 if G2frame.PatternTree.GetCount(): -
trunk/GSASIIplot.py
r1383 r1386 2518 2518 ''' 2519 2519 G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',0) 2520 StrSta = G2frame.PatternTree.GetItemPyData( 2521 G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain')) 2520 G2frame.PickId = G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain') 2521 data = G2frame.PatternTree.GetItemPyData(G2frame.PickId) 2522 return data 2522 2523 2523 2524 def PlotImage(G2frame,newPlot=False,event=None,newImage=True): … … 2528 2529 import numpy.ma as ma 2529 2530 Dsp = lambda tth,wave: wave/(2.*npsind(tth/2.)) 2530 global Data,Masks 2531 global Data,Masks,StrSta 2531 2532 colors=['b','g','r','c','m','k'] 2532 2533 Data = G2frame.PatternTree.GetItemPyData( … … 2598 2599 if event.key in ['a',]: 2599 2600 G2frame.StrainKey = event.key 2600 OnStartNewDzero(G2frame)2601 StrSta = OnStartNewDzero(G2frame) 2601 2602 PlotImage(G2frame,newPlot=False) 2602 2603
Note: See TracChangeset
for help on using the changeset viewer.