Changeset 1213
- Timestamp:
- Feb 2, 2014 1:00:29 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIpwdGUI.py
r1210 r1213 72 72 'FreePrm1':0.,'FreePrm2':0.,'FreePrm3':0., 73 73 'Gonio. radius':200.0, 74 'Omega':0.0,'Chi':0.0,'Phi':0.0 74 'Omega':0.0,'Chi':0.0,'Phi':0.0, 75 #SASD items 76 'Materials':[{'Name':'vacuum','VolFrac':1.0,},{'Name':'vacuum','VolFrac':0.0,}], 77 'Thick':1.0, 75 78 } 76 79 … … 78 81 'Fills in default items for the SASD Models dictionary' 79 82 return {'Back':[0.0,False],'Size':{'MinMaxDiam':[50.,10000.],'Nbins':100, 80 ' Contrast':['vacuum','vacuum'],'Method':'MaxEnt','Distribution':[],83 'Method':'MaxEnt','Distribution':[], 81 84 'Shape':['Spheroid',1.0],'MaxEnt':{'Niter':100,'Precision':0.01,'Sky':1e-6}, 82 85 'IPG':{'Niter':100,'Approach':0.8},'Reg':{},}, … … 1135 1138 elif 'SASD' in histName: 1136 1139 histType = 'SASD' 1140 copyNames += ['Materials','Thick',] 1137 1141 if len(addNames): 1138 1142 copyNames += addNames … … 1190 1194 def OnSampleCopy(event): 1191 1195 histType,copyNames = SetCopyNames(histName, 1192 addNames =['Omega','Chi','Phi','Gonio. radius','InstrName'])1196 addNames = ['Omega','Chi','Phi','Gonio. radius','InstrName']) 1193 1197 copyDict = {} 1194 1198 for parm in copyNames: … … 1353 1357 ['SurfRoughA','Surface roughness A: ',[10,4]], 1354 1358 ['SurfRoughB','Surface roughness B: ',[10,4]]] 1359 elif 'SASD' in histName: 1360 pass 1355 1361 parms.append(['Omega','Goniometer omega:',[10,3]]) 1356 1362 parms.append(['Chi','Goniometer chi:',[10,3]]) … … 2230 2236 name,El,keyId = Indx[Obj.GetId()] 2231 2237 try: 2232 value = max(0, int(Obj.GetValue()))2238 value = max(0,float(Obj.GetValue())) 2233 2239 except ValueError: 2234 2240 value = 0 2235 Obj.SetValue( str(value))2241 Obj.SetValue('%.2f'%(value)) 2236 2242 data['Substances'][name]['Elements'][El][keyId] = value 2237 2243 data['Substances'][name]['Volume'] = G2mth.El2EstVol(data['Substances'][name]['Elements']) … … 2279 2285 elSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' '+El+': '), 2280 2286 0,wx.ALIGN_CENTER_VERTICAL) 2281 num = wx.TextCtrl(G2frame.dataDisplay,value= str(Elems[El]['Num']),style=wx.TE_PROCESS_ENTER)2287 num = wx.TextCtrl(G2frame.dataDisplay,value='%.2f'%(Elems[El]['Num']),style=wx.TE_PROCESS_ENTER) 2282 2288 Indx[num.GetId()] = [name,El,'Num'] 2283 2289 num.Bind(wx.EVT_TEXT_ENTER,OnValueChange)
Note: See TracChangeset
for help on using the changeset viewer.