[Kst] Re: branches/work/kst/portto4/kst/src
Peter Kümmel
syntheticpp at gmx.net
Tue Mar 22 21:27:42 CET 2011
On 22.03.2011 20:28, Barth Netterfield wrote:
> SVN commit 1225667 by netterfield:
>
> BUG:
>
> Fix saving and reloading of plugins with input scalars....
> The short name system plugin re-load assumes that no primitives were
> created between the creation of the data object, and the creation of
> the last slave vector of the object.
> This is true, except for when a scalar is automatically created
> from the config dialog before all of the output scalars have been
> created. This patch makes the output scalars always be created
> before the inputs are set, avoiding that problem. I have changed
> the order for all plugins, even those for which it doesn't matter.
> This is a bit of a fragile solution, but it does work....
>
I've reverted my workaround in fitpolynomial_unweighted.cpp because
it was no generic solution. But then the reload bug pops up again.
So the order of output/input doesn't matter here.
The problem (when loading) is that the dataobject is created with
a xnum, and it assumes that xnum is incremented when the input scalar
is loaded. But the scalar already exits with the initial xnum as name.
Thus xnum is not incremented and when the xnum value is used for the
next creation of a scalar then two scalars have the same name.
> Also, this commit adds the short name (eg, (X22) ) to the labels
> in the viewprimitive dialogs.
>
>
>
> M +2 -2 libkstapp/primitivemodel.h
> M +1 -1 plugins/dataobject/bin/bin.cpp
> M +1 -1 plugins/dataobject/chop/chop.cpp
> M +1 -1 plugins/dataobject/convolution/convolve/convolve.cpp
> M +1 -1 plugins/dataobject/convolution/deconvolve/deconvolve.cpp
> M +1 -1 plugins/dataobject/correlation/autocorrelation/autocorrelation.cpp
> M +1 -1 plugins/dataobject/correlation/crosscorrelation/crosscorrelation.cpp
> M +1 -1 plugins/dataobject/crossspectrum/crossspectrum.cpp
> M +1 -1 plugins/dataobject/differentiation/differentiation.cpp
> M +1 -1 plugins/dataobject/effectivebandwidth/effectivebandwidth.cpp
> M +1 -1 plugins/dataobject/genericfilter/genericfilter.cpp
> M +1 -1 plugins/dataobject/interpolations/akima/akima.cpp
> M +1 -1 plugins/dataobject/interpolations/akimaperiodic/akimaperiodic.cpp
> M +1 -1 plugins/dataobject/interpolations/cspline/cspline.cpp
> M +1 -1 plugins/dataobject/interpolations/csplineperiodic/csplineperiodic.cpp
> M +1 -1 plugins/dataobject/interpolations/linear/linear.cpp
> M +1 -1 plugins/dataobject/interpolations/polynomial/polynomial.cpp
> M +1 -1 plugins/dataobject/linefit/linefit.cpp
> M +1 -1 plugins/dataobject/lockin/lockin.cpp
> M +1 -1 plugins/dataobject/noiseaddition/noiseaddition.cpp
> M +1 -1 plugins/dataobject/periodogram/periodogram.cpp
> M +1 -1 plugins/dataobject/phase/phase.cpp
> M +1 -1 plugins/dataobject/shift/shift.cpp
> M +1 -1 plugins/dataobject/statistics/statistics.cpp
> M +1 -1 plugins/dataobject/syncbin/syncbin.cpp
> M +1 -1 plugins/filters/butterworth_bandpass/butterworth_bandpass.cpp
> M +1 -1 plugins/filters/butterworth_bandstop/butterworth_bandstop.cpp
> M +1 -1 plugins/filters/butterworth_highpass/butterworth_highpass.cpp
> M +1 -1 plugins/filters/butterworth_lowpass/butterworth_lowpass.cpp
> M +1 -1 plugins/filters/cumulativesum/cumulativesum.cpp
> M +1 -1 plugins/filters/despike/filterdespike.cpp
> M +1 -1 plugins/filters/differentiation/differentiation.cpp
> M +1 -1 plugins/fits/exponential_unweighted/fitexponential_unweighted.cpp
> M +1 -1 plugins/fits/exponential_weighted/fitexponential_weighted.cpp
> M +1 -1 plugins/fits/gaussian_unweighted/fitgaussian_unweighted.cpp
> M +1 -1 plugins/fits/gaussian_weighted/fitgaussian_weighted.cpp
> M +1 -1 plugins/fits/gradient_unweighted/fitgradient_unweighted.cpp
> M +1 -1 plugins/fits/gradient_weighted/fitgradient_weighted.cpp
> M +1 -1 plugins/fits/kneefrequency/fitkneefrequency.cpp
> M +1 -1 plugins/fits/linear_unweighted/fitlinear_unweighted.cpp
> M +1 -1 plugins/fits/linear_weighted/fitlinear_weighted.cpp
> M +1 -1 plugins/fits/lorentzian_unweighted/fitlorentzian_unweighted.cpp
> M +1 -1 plugins/fits/lorentzian_weighted/fitlorentzian_weighted.cpp
> M +1 -1 plugins/fits/polynomial_unweighted/fitpolynomial_unweighted.cpp
> M +1 -1 plugins/fits/polynomial_weighted/fitpolynomial_weighted.cpp
> M +1 -1 plugins/fits/sinusoid_unweighted/fitsinusoid_unweighted.cpp
> M +1 -1 plugins/fits/sinusoid_weighted/fitsinusoid_weighted.cpp
>
>
> http://websvn.kde.org/?view=rev&revision=1225667
> _______________________________________________
> Kst mailing list
> Kst at kde.org
> https://mail.kde.org/mailman/listinfo/kst
>
More information about the Kst
mailing list