Commit 54a190aa authored by Alexander Semke's avatar Alexander Semke

Added missing signal-slot connection for changing the visibility in the

analysis curves dock widgets.
parent 9544ffd5
......@@ -204,6 +204,7 @@ void XYConvolutionCurveDock::initGeneralTab() {
connect(m_convolutionCurve, SIGNAL(y2DataColumnChanged(const AbstractColumn*)), this, SLOT(curveY2DataColumnChanged(const AbstractColumn*)));
connect(m_convolutionCurve, SIGNAL(convolutionDataChanged(XYConvolutionCurve::ConvolutionData)), this, SLOT(curveConvolutionDataChanged(XYConvolutionCurve::ConvolutionData)));
connect(m_convolutionCurve, SIGNAL(sourceDataChanged()), this, SLOT(enableRecalculate()));
connect(m_convolutionCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYConvolutionCurveDock::curveVisibilityChanged);
}
void XYConvolutionCurveDock::setModel() {
......@@ -671,3 +672,9 @@ void XYConvolutionCurveDock::curveConvolutionDataChanged(const XYConvolutionCurv
void XYConvolutionCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYConvolutionCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -91,6 +91,7 @@ private slots:
void curveY2DataColumnChanged(const AbstractColumn*);
void curveConvolutionDataChanged(const XYConvolutionCurve::ConvolutionData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -187,6 +187,7 @@ void XYCorrelationCurveDock::initGeneralTab() {
connect(m_correlationCurve, SIGNAL(y2DataColumnChanged(const AbstractColumn*)), this, SLOT(curveY2DataColumnChanged(const AbstractColumn*)));
connect(m_correlationCurve, SIGNAL(correlationDataChanged(XYCorrelationCurve::CorrelationData)), this, SLOT(curveCorrelationDataChanged(XYCorrelationCurve::CorrelationData)));
connect(m_correlationCurve, SIGNAL(sourceDataChanged()), this, SLOT(enableRecalculate()));
connect(m_correlationCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYCorrelationCurveDock::curveVisibilityChanged);
}
void XYCorrelationCurveDock::setModel() {
......@@ -552,3 +553,9 @@ void XYCorrelationCurveDock::curveCorrelationDataChanged(const XYCorrelationCurv
void XYCorrelationCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYCorrelationCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -87,6 +87,7 @@ private slots:
void curveY2DataColumnChanged(const AbstractColumn*);
void curveCorrelationDataChanged(const XYCorrelationCurve::CorrelationData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -202,6 +202,7 @@ void XYDataReductionCurveDock::initGeneralTab() {
connect(m_dataReductionCurve, &XYDataReductionCurve::yDataColumnChanged, this, &XYDataReductionCurveDock::curveYDataColumnChanged);
connect(m_dataReductionCurve, &XYDataReductionCurve::dataReductionDataChanged, this, &XYDataReductionCurveDock::curveDataReductionDataChanged);
connect(m_dataReductionCurve, &XYDataReductionCurve::sourceDataChanged, this, &XYDataReductionCurveDock::enableRecalculate);
connect(m_dataReductionCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYDataReductionCurveDock::curveVisibilityChanged);
}
void XYDataReductionCurveDock::setModel() {
......@@ -726,3 +727,9 @@ void XYDataReductionCurveDock::curveDataReductionDataChanged(const XYDataReducti
void XYDataReductionCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYDataReductionCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -95,6 +95,7 @@ private slots:
void curveYDataColumnChanged(const AbstractColumn*);
void curveDataReductionDataChanged(const XYDataReductionCurve::DataReductionData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -192,6 +192,7 @@ void XYDifferentiationCurveDock::initGeneralTab() {
connect(m_differentiationCurve, &XYDifferentiationCurve::yDataColumnChanged, this, &XYDifferentiationCurveDock::curveYDataColumnChanged);
connect(m_differentiationCurve, &XYDifferentiationCurve::differentiationDataChanged, this, &XYDifferentiationCurveDock::curveDifferentiationDataChanged);
connect(m_differentiationCurve, &XYDifferentiationCurve::sourceDataChanged, this, &XYDifferentiationCurveDock::enableRecalculate);
connect(m_differentiationCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYDifferentiationCurveDock::curveVisibilityChanged);
}
void XYDifferentiationCurveDock::setModel() {
......@@ -630,3 +631,9 @@ void XYDifferentiationCurveDock::curveDifferentiationDataChanged(const XYDiffere
void XYDifferentiationCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYDifferentiationCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -88,6 +88,7 @@ private slots:
void curveYDataColumnChanged(const AbstractColumn*);
void curveDifferentiationDataChanged(const XYDifferentiationCurve::DifferentiationData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -294,6 +294,7 @@ void XYFitCurveDock::initGeneralTab() {
connect(m_fitCurve, &XYFitCurve::yErrorColumnChanged, this, &XYFitCurveDock::curveYErrorColumnChanged);
connect(m_fitCurve, &XYFitCurve::fitDataChanged, this, &XYFitCurveDock::curveFitDataChanged);
connect(m_fitCurve, &XYFitCurve::sourceDataChanged, this, &XYFitCurveDock::enableRecalculate);
connect(m_fitCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYFitCurveDock::curveVisibilityChanged);
connect(fitParametersWidget, &FitParametersWidget::parametersChanged, this, &XYFitCurveDock::parametersChanged);
connect(fitParametersWidget, &FitParametersWidget::parametersValid, this, &XYFitCurveDock::parametersValid);
......@@ -1424,3 +1425,9 @@ void XYFitCurveDock::curveFitDataChanged(const XYFitCurve::FitData& fitData) {
void XYFitCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYFitCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -120,6 +120,7 @@ private slots:
void curveYErrorColumnChanged(const AbstractColumn*);
void curveFitDataChanged(const XYFitCurve::FitData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -186,6 +186,7 @@ void XYFourierFilterCurveDock::initGeneralTab() {
connect(m_filterCurve, SIGNAL(yDataColumnChanged(const AbstractColumn*)), this, SLOT(curveYDataColumnChanged(const AbstractColumn*)));
connect(m_filterCurve, SIGNAL(filterDataChanged(XYFourierFilterCurve::FilterData)), this, SLOT(curveFilterDataChanged(XYFourierFilterCurve::FilterData)));
connect(m_filterCurve, SIGNAL(sourceDataChanged()), this, SLOT(enableRecalculate()));
connect(m_filterCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYFourierFilterCurveDock::curveVisibilityChanged);
}
void XYFourierFilterCurveDock::setModel() {
......@@ -707,3 +708,10 @@ void XYFourierFilterCurveDock::curveFilterDataChanged(const XYFourierFilterCurve
void XYFourierFilterCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYFourierFilterCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -86,6 +86,7 @@ private slots:
void curveYDataColumnChanged(const AbstractColumn*);
void curveFilterDataChanged(const XYFourierFilterCurve::FilterData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -165,6 +165,7 @@ void XYFourierTransformCurveDock::initGeneralTab() {
connect(m_transformCurve, SIGNAL(yDataColumnChanged(const AbstractColumn*)), this, SLOT(curveYDataColumnChanged(const AbstractColumn*)));
connect(m_transformCurve, SIGNAL(transformDataChanged(XYFourierTransformCurve::TransformData)), this, SLOT(curveTransformDataChanged(XYFourierTransformCurve::TransformData)));
connect(m_transformCurve, SIGNAL(sourceDataChangedSinceLastTransform()), this, SLOT(enableRecalculate()));
connect(m_transformCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYFourierTransformCurveDock::curveVisibilityChanged);
}
void XYFourierTransformCurveDock::setModel() {
......@@ -421,3 +422,9 @@ void XYFourierTransformCurveDock::curveTransformDataChanged(const XYFourierTrans
void XYFourierTransformCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYFourierTransformCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -83,6 +83,7 @@ private slots:
void curveYDataColumnChanged(const AbstractColumn*);
void curveTransformDataChanged(const XYFourierTransformCurve::TransformData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -192,6 +192,7 @@ void XYIntegrationCurveDock::initGeneralTab() {
connect(m_integrationCurve, &XYIntegrationCurve::yDataColumnChanged, this, &XYIntegrationCurveDock::curveYDataColumnChanged);
connect(m_integrationCurve, &XYIntegrationCurve::integrationDataChanged, this, &XYIntegrationCurveDock::curveIntegrationDataChanged);
connect(m_integrationCurve, &XYIntegrationCurve::sourceDataChanged, this, &XYIntegrationCurveDock::enableRecalculate);
connect(m_integrationCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYIntegrationCurveDock::curveVisibilityChanged);
}
void XYIntegrationCurveDock::setModel() {
......@@ -549,3 +550,9 @@ void XYIntegrationCurveDock::curveIntegrationDataChanged(const XYIntegrationCurv
void XYIntegrationCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYIntegrationCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -87,6 +87,7 @@ private slots:
void curveYDataColumnChanged(const AbstractColumn*);
void curveIntegrationDataChanged(const XYIntegrationCurve::IntegrationData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
......@@ -210,6 +210,7 @@ void XYSmoothCurveDock::initGeneralTab() {
connect(m_smoothCurve, &XYSmoothCurve::yDataColumnChanged, this, &XYSmoothCurveDock::curveYDataColumnChanged);
connect(m_smoothCurve, &XYSmoothCurve::smoothDataChanged, this, &XYSmoothCurveDock::curveSmoothDataChanged);
connect(m_smoothCurve, &XYSmoothCurve::sourceDataChanged, this, &XYSmoothCurveDock::enableRecalculate);
connect(m_smoothCurve, QOverload<bool>::of(&XYCurve::visibilityChanged), this, &XYSmoothCurveDock::curveVisibilityChanged);
}
void XYSmoothCurveDock::setModel() {
......@@ -649,3 +650,9 @@ void XYSmoothCurveDock::curveSmoothDataChanged(const XYSmoothCurve::SmoothData&
void XYSmoothCurveDock::dataChanged() {
this->enableRecalculate();
}
void XYSmoothCurveDock::curveVisibilityChanged(bool on) {
m_initializing = true;
uiGeneralTab.chkVisible->setChecked(on);
m_initializing = false;
}
......@@ -91,7 +91,7 @@ private slots:
void curveYDataColumnChanged(const AbstractColumn*);
void curveSmoothDataChanged(const XYSmoothCurve::SmoothData&);
void dataChanged();
void curveVisibilityChanged(bool);
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment