[Kst] branches/work/kst/portto4/kst/src/plugins
Barth Netterfield
netterfield at astro.utoronto.ca
Tue Aug 23 16:57:32 UTC 2011
SVN commit 1249081 by netterfield:
Apply syncbin chrash fix to all other plugins with this code pattern.
M +1 -1 dataobject/bin/bin.cpp
M +2 -2 dataobject/crossspectrum/crossspectrum.cpp
M +1 -1 dataobject/differentiation/differentiation.cpp
M +3 -3 dataobject/effectivebandwidth/effectivebandwidth.cpp
M +2 -2 dataobject/genericfilter/genericfilter.cpp
M +1 -1 dataobject/noiseaddition/noiseaddition.cpp
M +2 -2 dataobject/periodogram/periodogram.cpp
M +2 -2 dataobject/phase/phase.cpp
M +1 -1 dataobject/shift/shift.cpp
M +3 -3 dataobject/syncbin/syncbin.cpp
M +2 -2 filters/butterworth_bandpass/butterworth_bandpass.cpp
M +2 -2 filters/butterworth_bandstop/butterworth_bandstop.cpp
M +2 -2 filters/butterworth_highpass/butterworth_highpass.cpp
M +2 -2 filters/butterworth_lowpass/butterworth_lowpass.cpp
M +1 -1 filters/cumulativesum/cumulativesum.cpp
M +1 -1 filters/differentiation/differentiation.cpp
M +3 -3 fits/kneefrequency/fitkneefrequency.cpp
M +1 -1 fits/polynomial_unweighted/fitpolynomial_unweighted.cpp
M +1 -1 fits/polynomial_weighted/fitpolynomial_weighted.cpp
M +2 -2 fits/sinusoid_unweighted/fitsinusoid_unweighted.cpp
M +2 -2 fits/sinusoid_weighted/fitsinusoid_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/bin/bin.cpp #1249080:1249081
@@ -226,9 +226,9 @@
BinSource* object = store->createObject<BinSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_IN, config->selectedScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/crossspectrum/crossspectrum.cpp #1249080:1249081
@@ -366,11 +366,11 @@
CrossSpectrumSource* object = store->createObject<CrossSpectrumSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_FFT, config->selectedScalarFFT());
+ object->setInputScalar(SCALAR_IN_RATE, config->selectedScalarRate());
object->setupOutputs();
object->setInputVector(VECTOR_IN_ONE, config->selectedVectorOne());
object->setInputVector(VECTOR_IN_TWO, config->selectedVectorTwo());
- object->setInputScalar(SCALAR_IN_FFT, config->selectedScalarFFT());
- object->setInputScalar(SCALAR_IN_RATE, config->selectedScalarRate());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/differentiation/differentiation.cpp #1249080:1249081
@@ -213,9 +213,9 @@
DifferentiationSource* object = store->createObject<DifferentiationSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_IN, config->selectedScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/effectivebandwidth/effectivebandwidth.cpp #1249080:1249081
@@ -347,12 +347,12 @@
EffectiveBandwidthSource* object = store->createObject<EffectiveBandwidthSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_MIN, config->selectedScalarMin());
+ object->setInputScalar(SCALAR_IN_FREQ, config->selectedScalarFreq());
+ object->setInputScalar(SCALAR_IN_K, config->selectedScalarK());
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
- object->setInputScalar(SCALAR_IN_MIN, config->selectedScalarMin());
- object->setInputScalar(SCALAR_IN_FREQ, config->selectedScalarFreq());
- object->setInputScalar(SCALAR_IN_K, config->selectedScalarK());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/genericfilter/genericfilter.cpp #1249080:1249081
@@ -300,11 +300,11 @@
GenericFilterSource* object = store->createObject<GenericFilterSource>();
if (setupInputsOutputs) {
- object->setupOutputs();
- object->setInputVector(VECTOR_IN, config->selectedVector());
object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setInputString(STRING_IN_NUMERATOR, config->selectedStringNumerator());
object->setInputString(STRING_IN_DENOMINATOR, config->selectedStringDenominator());
+ object->setupOutputs();
+ object->setInputVector(VECTOR_IN, config->selectedVector());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/noiseaddition/noiseaddition.cpp #1249080:1249081
@@ -230,9 +230,9 @@
NoiseAdditionSource* object = store->createObject<NoiseAdditionSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_IN, config->selectedScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/periodogram/periodogram.cpp #1249080:1249081
@@ -832,11 +832,11 @@
PeriodogramSource* object = store->createObject<PeriodogramSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_OVERSAMPLING, config->selectedScalarOversampling());
+ object->setInputScalar(SCALAR_IN_ANFF, config->selectedScalarANFF());
object->setupOutputs();
object->setInputVector(VECTOR_IN_TIME, config->selectedVectorTime());
object->setInputVector(VECTOR_IN_DATA, config->selectedVectorData());
- object->setInputScalar(SCALAR_IN_OVERSAMPLING, config->selectedScalarOversampling());
- object->setInputScalar(SCALAR_IN_ANFF, config->selectedScalarANFF());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/phase/phase.cpp #1249080:1249081
@@ -346,11 +346,11 @@
PhaseSource* object = store->createObject<PhaseSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_PERIOD, config->selectedScalarPeriod());
+ object->setInputScalar(SCALAR_IN_ZEROPHASE, config->selectedScalarZeroPhase());
object->setupOutputs();
object->setInputVector(VECTOR_IN_TIME, config->selectedVectorTime());
object->setInputVector(VECTOR_IN_DATA, config->selectedVectorData());
- object->setInputScalar(SCALAR_IN_PERIOD, config->selectedScalarPeriod());
- object->setInputScalar(SCALAR_IN_ZEROPHASE, config->selectedScalarZeroPhase());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/shift/shift.cpp #1249080:1249081
@@ -239,9 +239,9 @@
ShiftSource* object = store->createObject<ShiftSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_IN, config->selectedScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/dataobject/syncbin/syncbin.cpp #1249080:1249081
@@ -394,12 +394,12 @@
SyncBinSource* object = store->createObject<SyncBinSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_BINS, config->selectedScalarBins());
+ object->setInputScalar(SCALAR_IN_XMIN, config->selectedScalarXMin());
+ object->setInputScalar(SCALAR_IN_XMAX, config->selectedScalarXMax());
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
- object->setInputScalar(SCALAR_IN_BINS, config->selectedScalarBins());
- object->setInputScalar(SCALAR_IN_XMIN, config->selectedScalarXMin());
- object->setInputScalar(SCALAR_IN_XMAX, config->selectedScalarXMax());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_bandpass/butterworth_bandpass.cpp #1249080:1249081
@@ -296,11 +296,11 @@
FilterButterworthBandPassSource* object = store->createObject<FilterButterworthBandPassSource>();
if (setupInputsOutputs) {
- object->setupOutputs();
- object->setInputVector(VECTOR_IN, config->selectedVector());
object->setInputScalar(SCALAR_ORDER_IN, config->selectedOrderScalar());
object->setInputScalar(SCALAR_RATE_IN, config->selectedRateScalar());
object->setInputScalar(SCALAR_BANDWIDTH_IN, config->selectedBandwidthScalar());
+ object->setupOutputs();
+ object->setInputVector(VECTOR_IN, config->selectedVector());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_bandstop/butterworth_bandstop.cpp #1249080:1249081
@@ -297,11 +297,11 @@
FilterButterworthBandStopSource* object = store->createObject<FilterButterworthBandStopSource>();
if (setupInputsOutputs) {
- object->setupOutputs();
- object->setInputVector(VECTOR_IN, config->selectedVector());
object->setInputScalar(SCALAR_ORDER_IN, config->selectedOrderScalar());
object->setInputScalar(SCALAR_RATE_IN, config->selectedRateScalar());
object->setInputScalar(SCALAR_BANDWIDTH_IN, config->selectedBandwidthScalar());
+ object->setupOutputs();
+ object->setInputVector(VECTOR_IN, config->selectedVector());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_highpass/butterworth_highpass.cpp #1249080:1249081
@@ -267,10 +267,10 @@
FilterButterworthHighPassSource* object = store->createObject<FilterButterworthHighPassSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_CUTOFF_IN, config->selectedCutoffScalar());
+ object->setInputScalar(SCALAR_ORDER_IN, config->selectedOrderScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_CUTOFF_IN, config->selectedCutoffScalar());
- object->setInputScalar(SCALAR_ORDER_IN, config->selectedOrderScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_lowpass/butterworth_lowpass.cpp #1249080:1249081
@@ -262,10 +262,10 @@
FilterButterworthLowPassSource* object = store->createObject<FilterButterworthLowPassSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_CUTOFF_IN, config->selectedCutoffScalar());
+ object->setInputScalar(SCALAR_ORDER_IN, config->selectedOrderScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_CUTOFF_IN, config->selectedCutoffScalar());
- object->setInputScalar(SCALAR_ORDER_IN, config->selectedOrderScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/filters/cumulativesum/cumulativesum.cpp #1249080:1249081
@@ -236,9 +236,9 @@
CumulativeSumSource* object = store->createObject<CumulativeSumSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_IN, config->selectedScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/filters/differentiation/differentiation.cpp #1249080:1249081
@@ -236,9 +236,9 @@
DifferentiationSource* object = store->createObject<DifferentiationSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, config->selectedScalar());
object->setupOutputs();
object->setInputVector(VECTOR_IN, config->selectedVector());
- object->setInputScalar(SCALAR_IN, config->selectedScalar());
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/fits/kneefrequency/fitkneefrequency.cpp #1249080:1249081
@@ -455,12 +455,12 @@
FitKneeFrequencySource* object = store->createObject<FitKneeFrequencySource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_MAX, max);
+ object->setInputScalar(SCALAR_IN_MIN, min);
+ object->setInputScalar(SCALAR_IN_WHITENOISE, noise);
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
- object->setInputScalar(SCALAR_IN_MAX, max);
- object->setInputScalar(SCALAR_IN_MIN, min);
- object->setInputScalar(SCALAR_IN_WHITENOISE, noise);
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/fits/polynomial_unweighted/fitpolynomial_unweighted.cpp #1249080:1249081
@@ -331,10 +331,10 @@
FitPolynomialUnweightedSource* object = store->createObject<FitPolynomialUnweightedSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, order);
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
- object->setInputScalar(SCALAR_IN, order);
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/fits/polynomial_weighted/fitpolynomial_weighted.cpp #1249080:1249081
@@ -351,11 +351,11 @@
FitPolynomialWeightedSource* object = store->createObject<FitPolynomialWeightedSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN, order);
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
object->setInputVector(VECTOR_IN_WEIGHTS, config->selectedVectorWeights());
- object->setInputScalar(SCALAR_IN, order);
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/fits/sinusoid_unweighted/fitsinusoid_unweighted.cpp #1249080:1249081
@@ -350,11 +350,11 @@
FitSinusoidUnweightedSource* object = store->createObject<FitSinusoidUnweightedSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_HARMONICS, harmonics);
+ object->setInputScalar(SCALAR_IN_PERIOD, period);
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
- object->setInputScalar(SCALAR_IN_HARMONICS, harmonics);
- object->setInputScalar(SCALAR_IN_PERIOD, period);
}
object->setPluginName(pluginName());
--- branches/work/kst/portto4/kst/src/plugins/fits/sinusoid_weighted/fitsinusoid_weighted.cpp #1249080:1249081
@@ -373,12 +373,12 @@
FitSinusoidWeightedSource* object = store->createObject<FitSinusoidWeightedSource>();
if (setupInputsOutputs) {
+ object->setInputScalar(SCALAR_IN_HARMONICS, harmonics);
+ object->setInputScalar(SCALAR_IN_PERIOD, period);
object->setupOutputs();
object->setInputVector(VECTOR_IN_X, config->selectedVectorX());
object->setInputVector(VECTOR_IN_Y, config->selectedVectorY());
object->setInputVector(VECTOR_IN_WEIGHTS, config->selectedVectorWeights());
- object->setInputScalar(SCALAR_IN_HARMONICS, harmonics);
- object->setInputScalar(SCALAR_IN_PERIOD, period);
}
object->setPluginName(pluginName());
More information about the Kst
mailing list