Changeset 827
- Timestamp:
- Jan 11, 2013 2:55:47 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r824 r827 1221 1221 Data['ellipses'] = [] 1222 1222 Data['calibrant'] = '' 1223 Data['GonioAngles'] = [0.,0.,0.] 1223 1224 else: 1224 1225 Data['type'] = 'PWDR' … … 1235 1236 Data['edgemin'] = 100000000 1236 1237 Data['ellipses'] = [] 1238 Data['GonioAngles'] = [0.,0.,0.] 1237 1239 Data['calibrant'] = '' 1238 1240 Data['IOtth'] = [2.0,5.0] -
trunk/GSASIIIO.py
r824 r827 579 579 Sample = G2pdG.SetDefaultSample() 580 580 Sample['Gonio. radius'] = data['distance'] 581 Sample['Omega'] = data['GonioAngles'][0] 582 Sample['Chi'] = data['GonioAngles'][1] 583 Sample['Phi'] = data['GonioAngles'][2] 581 584 if Id: 582 585 G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Comments'),Comments) -
trunk/GSASIIimgGUI.py
r765 r827 35 35 def UpdateImageControls(G2frame,data,masks): 36 36 import ImageCalibrants as calFile 37 #patch 38 if 'GonioAngles' not in data: 39 data['GonioAngles'] = [0.,0.,0.] 40 #end patch 41 37 42 38 43 # Menu items … … 163 168 oldData = copy.deepcopy(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls'))) 164 169 Data['range'] = oldData['range'] 165 Data['size'] = oldData['size'] 170 Data['size'] = oldData['size'] 171 Data['GonioAngles'] = oldData['GonioAngles'] 166 172 Data['ring'] = [] 167 173 Data['rings'] = [] … … 695 701 return calibSizer 696 702 703 def GonioSizer(): 704 705 ValObj = {} 706 707 def OnGonioAngle(event): 708 Obj = event.GetEventObject() 709 item = ValObj[Obj.GetId()] 710 try: 711 value = float(Obj.GetValue()) 712 except ValueError: 713 value = data['GonioAngles'][item] 714 data['GonioAngles'][item] = value 715 Obj.SetValue('%8.2f'%(value)) 716 717 gonioSizer = wx.BoxSizer(wx.HORIZONTAL) 718 names = ['Omega','Chi','Phi'] 719 gonioSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'Sample goniometer angles: '),0,wx.ALIGN_CENTER_VERTICAL) 720 for i,name in enumerate(names): 721 gonioSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,name),0,wx.ALIGN_CENTER_VERTICAL) 722 angle = wx.TextCtrl(G2frame.dataDisplay,-1,value='%8.2f'%(data['GonioAngles'][i]), 723 style=wx.TE_PROCESS_ENTER) 724 angle.Bind(wx.EVT_TEXT_ENTER,OnGonioAngle) 725 angle.Bind(wx.EVT_KILL_FOCUS,OnGonioAngle) 726 ValObj[angle.GetId()] = i 727 gonioSizer.Add(angle,0,wx.ALIGN_CENTER_VERTICAL) 728 return gonioSizer 729 697 730 # Image Controls main code 698 731 … … 749 782 mainSizer.Add((5,5),0) 750 783 mainSizer.Add(CalibSizer(),0,wx.ALIGN_CENTER_VERTICAL) 784 mainSizer.Add((5,5),0) 785 mainSizer.Add(GonioSizer(),0,wx.ALIGN_CENTER_VERTICAL) 751 786 752 787 mainSizer.Layout()
Note: See TracChangeset
for help on using the changeset viewer.