Changeset 3365
 Timestamp:
 Apr 28, 2018 12:04:52 PM (5 years ago)
 Location:
 trunk
 Files:

 5 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIIO.py
r3355 r3365 799 799 G2frame.GPXtree.SetItemPyData(G2frame.GPXtree.AppendItem(Id,text='Models'),G2pdG.SetDefaultSASDModel()) 800 800 valuesdict = { 801 'wtFactor':1.0, 802 'Dummy':False, 803 'ranId':ran.randint(0,sys.maxsize), 804 'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':0.1*Ymax,'refDelt':0.1*Ymax, 805 'qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax] 806 } 807 G2frame.GPXtree.SetItemPyData( 808 Id,[valuesdict, 809 [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]]) 801 'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxsize),'Offset':[0.0,0.0],'delOffset':0.02*Ymax, 802 'refOffset':0.1*Ymax,'refDelt':0.1*Ymax,'Yminmax':[Ymin,Ymax]} 803 G2frame.GPXtree.SetItemPyData(Id,[valuesdict, 804 [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]]) 810 805 return Id #last powder pattern generated 811 806 
trunk/GSASIIdataGUI.py
r3364 r3365 1662 1662 'ranId':ran.randint(0,sys.maxsize), 1663 1663 'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':.1*Ymax,'refDelt':0.1*Ymax, 1664 ' qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]1664 'Yminmax':[Ymin,Ymax] 1665 1665 } 1666 1666 # apply usersupplied corrections to powder data … … 1880 1880 'ranId':ran.randint(0,sys.maxsize), 1881 1881 'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':.1*Ymax,'refDelt':0.1*Ymax, 1882 ' qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]1882 'Yminmax':[Ymin,Ymax] 1883 1883 } 1884 1884 self.GPXtree.SetItemPyData(Id,[valuesdict,rd.powderdata]) … … 2261 2261 'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxsize), 2262 2262 'Offset':[0.0,0.0],'delOffset':0.02*Ymax, 2263 ' qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]2263 'Yminmax':[Ymin,Ymax] 2264 2264 } 2265 2265 self.GPXtree.SetItemPyData( … … 3266 3266 'ranId':ran.randint(0,sys.maxsize), 3267 3267 'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':.1*Ymax,'refDelt':0.1*Ymax, 3268 ' qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]3268 'Yminmax':[Ymin,Ymax] 3269 3269 } 3270 3270 self.GPXtree.SetItemPyData(Id,[valuesdict,[np.array(Xsum),np.array(Ysum),np.array(Wsum), 
trunk/GSASIIplot.py
r3364 r3365 392 392 self.toolbar.Realize() 393 393 self.plotStyle = {'qPlot':False,'dPlot':False,'sqrtPlot':False,'sqPlot':False,'logPlot':False} 394 self.logPlot = False395 self.sqrtPlot = False396 394 397 395 sizer=wx.BoxSizer(wx.VERTICAL) … … 1639 1637 else: 1640 1638 Page.plotStyle['logPlot'] = not Page.plotStyle['logPlot'] 1641 if not Page.plotStyle['logPlot']: 1639 if Page.plotStyle['logPlot']: 1640 Page.plotStyle['sqrtPlot'] = False 1641 else: 1642 1642 Pattern[0]['Offset'][0] = 0 1643 1643 newPlot = True … … 1645 1645 if G2frame.SinglePlot: #toggle sqrt plot 1646 1646 Page.plotStyle['sqrtPlot'] = not Page.plotStyle['sqrtPlot'] 1647 if Page.plotStyle['sqrtPlot']: 1648 Page.plotStyle['logPlot'] = False 1647 1649 Ymax = max(Pattern[1][1]) 1648 1650 if Page.plotStyle['sqrtPlot']: 
trunk/GSASIIpwdGUI.py
r3357 r3365 341 341 if 'Offset' not in sourceData[0]: #patch for old data 342 342 sourceData[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':1.0, 343 'refDelt':0.01, 'qPlot':False,'dPlot':False,'sqrtPlot':False})343 'refDelt':0.01,}) 344 344 G2frame.GPXtree.SetItemPyData(G2frame.PatternId,sourceData) 345 345 … … 356 356 copyList.append(histList[i]) 357 357 358 keys = ['Offset','delOffset','refOffset','refDelt' ,'qPlot','dPlot','sqrtPlot']358 keys = ['Offset','delOffset','refOffset','refDelt'] 359 359 source = dict(zip(keys,[sourceData[0][item] for item in keys])) 360 360 for hist in copyList: 
trunk/GSASIIscriptable.py
r3294 r3365 1079 1079 'Offset': [0.0, 0.0], 'delOffset': 0.02*Ymax, 1080 1080 'refOffset': 0.1*Ymax, 'refDelt': 0.1*Ymax, 1081 'qPlot': False, 'dPlot': False, 'sqrtPlot': False,1082 1081 'Yminmax': [Ymin, Ymax]} 1083 1082 reader.Sample['ranId'] = valuesdict['ranId']
Note: See TracChangeset
for help on using the changeset viewer.