Changeset 4062


Ignore:
Timestamp:
Jul 15, 2019 9:02:11 AM (2 years ago)
Author:
vondreele
Message:

small fixes to G2plot - make indexed lines 3,3 dashed orange lines, width=1.5 - looks better & different from upper limit line
removed commented out CurLim? code
small fixes to G2pwdGUI - 'cell inc' --> 'cell step' perhaps a bit more obvious, fixed 2 probable bugs in PDF code

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r4060 r4062  
    32103210                    DifLine = Plot1.plot(X[Ibeg:Ifin],DZ[Ibeg:Ifin],colors[3],picker=1.,label='_diff')                    #(Io-Ic)/sig(Io)
    32113211                    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]: continue
    3216 #                            CurLims[i] = float(G2frame.FixedLimits['dylims'][i])
    3217 #                        if all(np.isfinite(CurLims)): Plot1.set_ylim(CurLims)
    3218 #                    except:
    3219 #                        pass
    32203212
    32213213                if Page.plotStyle['logPlot']:
     
    33133305    if PickId and not G2frame.Contour:
    33143306        Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
     3307        orange = [255/256.,128/256.,0.]
    33153308        if G2frame.GPXtree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
    33163309            peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Index Peak List'))
     
    33253318                        Plot.axvline(peak[0],color='b')
    33263319            for hkl in G2frame.HKL:
    3327                 clr = 'r'
     3320                clr = orange
    33283321                if len(hkl) > 6 and hkl[3]:
    33293322                    clr = 'g'
    33303323                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)
    33323325                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)
    33343327                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)
    33363329        elif Page.plotStyle.get('WgtDiagnostic',False):
    33373330            pass # skip reflection markers
  • trunk/GSASIIpwdGUI.py

    r4060 r4062  
    32713271        Limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits'))[1]
    32723272        if 'C' in Inst['Type'][0] or 'PKS' in Inst['Type'][0]:
    3273             wave = G2mth.getWave(Inst)
    32743273            dmin = G2lat.Pos2dsp(Inst,Limits[1])
    32753274        else:
     
    43594358            volVal.SetBackgroundColour(VERY_LIGHT_GREY)
    43604359            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)
    43624361    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)
    43644363    shiftSel.SetSelection(3)
    43654364    littleSizer.Add(shiftSel)
     
    66016600            wx.CallAfter(UpdatePDFGrid,G2frame,data)
    66026601            #UpdatePDFGrid(G2frame,data)
    6603             wx.CallAfter(OnComputePDF,tc.event)
     6602            wx.CallAfter(OnComputePDF,event)
    66046603       
    66056604        sampleSizer = wx.BoxSizer(wx.VERTICAL)
     
    68976896                for item in data:
    68986897                    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')
    69006899                File.close()
    69016900                print ('PDF controls saved to: '+filename)
Note: See TracChangeset for help on using the changeset viewer.