Skip to content

Commit e10fb4b

Browse files
committed
fix display issues with fitted PDF peaks, replace SetValue with ChangeValue in the PDF display
1 parent eed51df commit e10fb4b

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

GSASII/GSASIIpwdGUI.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9487,39 +9487,39 @@ def OnDetType(event):
94879487

94889488
def OnFlatSpin(event):
94899489
data['Flat Bkg'] += flatSpin.GetValue()*0.01*data['IofQmin']
9490-
G2frame.flatBkg.SetValue(data['Flat Bkg'])
9490+
G2frame.flatBkg.ChangeValue(data['Flat Bkg'])
94919491
flatSpin.SetValue(0)
94929492
wx.CallAfter(OnComputePDF,None)
94939493

94949494
def OnBackSlider(event):
94959495
value = int(backSldr.GetValue())/100.
94969496
data['BackRatio'] = value
9497-
backVal.SetValue(data['BackRatio'])
9497+
backVal.ChangeValue(data['BackRatio'])
94989498
wx.CallAfter(OnComputePDF,None)
94999499

95009500
def OnRulSlider(event):
95019501
value = int(rulandSldr.GetValue())/100.
95029502
data['Ruland'] = max(0.001,value)
9503-
rulandWdt.SetValue(data['Ruland'])
9503+
rulandWdt.ChangeValue(data['Ruland'])
95049504
wx.CallAfter(OnComputePDF,None)
95059505

95069506
def OnGRscaleSlider(event):
95079507
value = int(gscaleSldr.GetValue())/50.
95089508
data['GR Scale'] = max(0.1,min(2.,value))
9509-
gscale.SetValue(data['GR Scale'])
9509+
gscale.ChangeValue(data['GR Scale'])
95109510
wx.CallAfter(OnComputePDF,None)
95119511

95129512
def NewQmax(invalid,value,tc):
95139513
if invalid: return
95149514
data['QScaleLim'][0] = 0.9*value
9515-
SQmin.SetValue(data['QScaleLim'][0])
9515+
SQmin.ChangeValue(data['QScaleLim'][0])
95169516
wx.CallAfter(OnComputePDF,None)
95179517

95189518
def OnResetQ(event):
95199519
data['QScaleLim'][1] = qLimits[1]
9520-
SQmax.SetValue(data['QScaleLim'][1])
9520+
SQmax.ChangeValue(data['QScaleLim'][1])
95219521
data['QScaleLim'][0] = 0.9*qLimits[1]
9522-
SQmin.SetValue(data['QScaleLim'][0])
9522+
SQmin.ChangeValue(data['QScaleLim'][0])
95239523
wx.CallAfter(OnComputePDF,None)
95249524

95259525
def OnLorch(event):
@@ -9877,7 +9877,7 @@ def OnComputeAllPDF(event):
98779877
G2plt.PlotISFG(G2frame,data,newPlot=True,plotType='G(R)')
98789878
G2plt.PlotISFG(G2frame,data,newPlot=True,plotType='g(r)')
98799879

9880-
# Routine UpdatePDFGrid starts here
9880+
#### Routine UpdatePDFGrid starts here
98819881
G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.PDFMenu)
98829882
global inst
98839883
tth2q = lambda t,w:4.0*math.pi*sind(t/2.0)/w
@@ -9955,7 +9955,7 @@ def OnComputeAllPDF(event):
99559955
G2frame.dataWindow.SetDataSize()
99569956

99579957
###############################################################################################################
9958-
#UpdatePDFPeaks: peaks in G(r)
9958+
####UpdatePDFPeaks: peaks in G(r)
99599959
###############################################################################################################
99609960
def UpdatePDFPeaks(G2frame,peaks,data):
99619961

@@ -10136,6 +10136,7 @@ def OnClearPDFpeaks(event):
1013610136
G2frame.Bind(wx.EVT_MENU, OnFitPDFpeaks, id=G2G.wxID_PDFPKSFIT)
1013710137
G2frame.Bind(wx.EVT_MENU, OnFitAllPDFpeaks, id=G2G.wxID_PDFPKSFITALL)
1013810138
G2frame.Bind(wx.EVT_MENU, OnClearPDFpeaks, id=G2G.wxID_CLEARPDFPEAKS)
10139+
G2frame.dataWindow.ClearData()
1013910140
mainSizer = wx.BoxSizer(wx.VERTICAL)
1014010141
G2frame.dataWindow.SetSizer(mainSizer)
1014110142
mainSizer.Add((5,5),0)

0 commit comments

Comments
 (0)