Changeset 2694 for trunk/GSASIIplot.py


Ignore:
Timestamp:
Feb 7, 2017 2:50:13 PM (5 years ago)
Author:
vondreele
Message:

after a repeat of a sequential fit, clear away old plot. Removes possibly bad parameter references
make note in G2grid of possible problem of pseudo vars storage in Controls
set new patch value for penetration corr to 0.5; above that convert to new value
fix peak picking problem when pattern has excluded regions
remove RaisePageNoRefresh? from Seq result plotting - irrelevant if plot is deleted

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r2693 r2694  
    17401740            except ValueError:
    17411741                lineNo = -1
     1742            nxcl = len(exclLines)
    17421743            if  lineNo in [0,1] or lineNo in exclLines:
    17431744                LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Limits')
     
    17571758                if G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Limits':
    17581759                    G2pdG.UpdateLimitsGrid(G2frame,limits,plottype)
    1759             elif lineNo > 1:
     1760            elif lineNo > 1+nxcl:
    17601761                PeakId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Peak List')
    17611762                peaks = G2frame.PatternTree.GetItemPyData(PeakId)
    17621763                if event.button == 3:
    1763                     del peaks['peaks'][lineNo-2]
     1764                    del peaks['peaks'][lineNo-2-nxcl]
    17641765                else:
    17651766                    if G2frame.plotStyle['qPlot']:
    1766                         peaks['peaks'][lineNo-2][0] = G2lat.Dsp2pos(Parms,2.*np.pi/xpos)
     1767                        peaks['peaks'][lineNo-2-nxcl][0] = G2lat.Dsp2pos(Parms,2.*np.pi/xpos)
    17671768                    elif G2frame.plotStyle['dPlot']:
    1768                         peaks['peaks'][lineNo-2][0] = G2lat.Dsp2pos(Parms,xpos)
     1769                        peaks['peaks'][lineNo-2-nxcl][0] = G2lat.Dsp2pos(Parms,xpos)
    17691770                    else:
    1770                         peaks['peaks'][lineNo-2][0] = xpos
     1771                        peaks['peaks'][lineNo-2-nxcl][0] = xpos
    17711772                    peaks['sigDict'] = {}        #no longer valid
    17721773                G2pdG.UpdatePeakGrid(G2frame,peaks)
     
    41794180        elif event.key == 'l':
    41804181            G2frame.seqLines = not G2frame.seqLines
    4181             wx.CallAfter(Draw)
     4182            Draw()
    41824183           
    41834184    def Draw():
    41844185        global Title,xLabel,yLabel
    4185         G2frame.G2plotNB.RaisePageNoRefresh(Page)
    41864186        G2frame.G2plotNB.status.SetStatusText(  \
    41874187            'press L to toggle lines, S to select X axis, T to change titles (reselect column to show?)',1)
Note: See TracChangeset for help on using the changeset viewer.