Changeset 4062
- Timestamp:
- Jul 15, 2019 9:02:11 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r4060 r4062 3210 3210 DifLine = Plot1.plot(X[Ibeg:Ifin],DZ[Ibeg:Ifin],colors[3],picker=1.,label='_diff') #(Io-Ic)/sig(Io) 3211 3211 Plot1.axhline(0.,color='k') 3212 # try:3213 # CurLims = [np.min(DZ[Ibeg:Ifin])*1.2,np.max(DZ[Ibeg:Ifin])*1.2]3214 # for i in range(2):3215 # if not G2frame.UseLimits['dylims'][i]: continue3216 # CurLims[i] = float(G2frame.FixedLimits['dylims'][i])3217 # if all(np.isfinite(CurLims)): Plot1.set_ylim(CurLims)3218 # except:3219 # pass3220 3212 3221 3213 if Page.plotStyle['logPlot']: … … 3313 3305 if PickId and not G2frame.Contour: 3314 3306 Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters')) 3307 orange = [255/256.,128/256.,0.] 3315 3308 if G2frame.GPXtree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']: 3316 3309 peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Index Peak List')) … … 3325 3318 Plot.axvline(peak[0],color='b') 3326 3319 for hkl in G2frame.HKL: 3327 clr = 'r'3320 clr = orange 3328 3321 if len(hkl) > 6 and hkl[3]: 3329 3322 clr = 'g' 3330 3323 if Page.plotStyle['qPlot']: 3331 Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=( 1,3),lw=2.5)3324 Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=(3,3),lw=1.5) 3332 3325 if Page.plotStyle['dPlot']: 3333 Plot.axvline(G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=( 1,3),lw=2.5)3326 Plot.axvline(G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=(3,3),lw=1.5) 3334 3327 else: 3335 Plot.axvline(hkl[-2],color=clr,dashes=( 1,3),lw=2.5)3328 Plot.axvline(hkl[-2],color=clr,dashes=(3,3),lw=1.5) 3336 3329 elif Page.plotStyle.get('WgtDiagnostic',False): 3337 3330 pass # skip reflection markers -
trunk/GSASIIpwdGUI.py
r4060 r4062 3271 3271 Limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits'))[1] 3272 3272 if 'C' in Inst['Type'][0] or 'PKS' in Inst['Type'][0]: 3273 wave = G2mth.getWave(Inst)3274 3273 dmin = G2lat.Pos2dsp(Inst,Limits[1]) 3275 3274 else: … … 4359 4358 volVal.SetBackgroundColour(VERY_LIGHT_GREY) 4360 4359 littleSizer.Add(volVal,0,WACV) 4361 littleSizer.Add(wx.StaticText(G2frame.dataWindow,label='cell inc',style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)4360 littleSizer.Add(wx.StaticText(G2frame.dataWindow,label='cell step',style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT) 4362 4361 shiftChoices = [ '0.01%','0.05%','0.1%','0.5%', '1.0%','2.5%','5.0%'] 4363 shiftSel = wx.Choice(G2frame.dataWindow,choices=shiftChoices ,size=(75,-1))4362 shiftSel = wx.Choice(G2frame.dataWindow,choices=shiftChoices) 4364 4363 shiftSel.SetSelection(3) 4365 4364 littleSizer.Add(shiftSel) … … 6601 6600 wx.CallAfter(UpdatePDFGrid,G2frame,data) 6602 6601 #UpdatePDFGrid(G2frame,data) 6603 wx.CallAfter(OnComputePDF, tc.event)6602 wx.CallAfter(OnComputePDF,event) 6604 6603 6605 6604 sampleSizer = wx.BoxSizer(wx.VERTICAL) … … 6897 6896 for item in data: 6898 6897 if item[:] not in ['Sample','I(Q)','S(Q)','F(Q)','G(R)']: 6899 File.write(item+':'+ unicode(data[item])+'\n')6898 File.write(item+':'+data[item]+'\n') 6900 6899 File.close() 6901 6900 print ('PDF controls saved to: '+filename)
Note: See TracChangeset
for help on using the changeset viewer.