From aa14800fc3860b64d0c42b8359e596690f9f3e56 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 11 Feb 2014 16:02:04 -0800 Subject: [PATCH] Fix a virtual function override --- src/ui/linechart/LinechartPlot.cc | 6 +++--- src/ui/linechart/LinechartPlot.h | 2 +- src/ui/linechart/LinechartWidget.cc | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ui/linechart/LinechartPlot.cc b/src/ui/linechart/LinechartPlot.cc index 4b6456459..f65134499 100644 --- a/src/ui/linechart/LinechartPlot.cc +++ b/src/ui/linechart/LinechartPlot.cc @@ -412,7 +412,7 @@ void LinechartPlot::setScaling(int scaling) * @param id The string id of the curve * @param visible The visibility: True to make it visible **/ -void LinechartPlot::setVisible(QString id, bool visible) +void LinechartPlot::setVisibleById(QString id, bool visible) { if(curves.contains(id)) { curves.value(id)->setVisible(visible); @@ -437,7 +437,7 @@ void LinechartPlot::setVisible(QString id, bool visible) **/ void LinechartPlot::hideCurve(QString id) { - setVisible(id, false); + setVisibleById(id, false); } /** @@ -450,7 +450,7 @@ void LinechartPlot::hideCurve(QString id) **/ void LinechartPlot::showCurve(QString id) { - setVisible(id, true); + setVisibleById(id, true); } //void LinechartPlot::showCurve(QString id, int position) diff --git a/src/ui/linechart/LinechartPlot.h b/src/ui/linechart/LinechartPlot.h index 470d64b05..5d19f5c53 100644 --- a/src/ui/linechart/LinechartPlot.h +++ b/src/ui/linechart/LinechartPlot.h @@ -213,7 +213,7 @@ public slots: void setActive(bool active); // Functions referring to the currently active plot - void setVisible(QString id, bool visible); + void setVisibleById(QString id, bool visible); /** * @brief Set the color of a curve and its symbols. diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index c8652ddec..e2d331932 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -171,7 +171,7 @@ void LinechartWidget::selectAllCurves(bool all) { QMap::iterator i; for (i = curveLabels->begin(); i != curveLabels->end(); ++i) { - activePlot->setVisible(i.key(), all); + activePlot->setVisibleById(i.key(), all); } } @@ -647,7 +647,7 @@ void LinechartWidget::addCurve(const QString& curve, const QString& unit) // Set UI components to initial state checkBox->setChecked(false); - plot->setVisible(curve+unit, false); + plot->setVisibleById(curve+unit, false); } /** @@ -952,7 +952,7 @@ void LinechartWidget::takeButtonClick(bool checked) if(button != NULL) { - activePlot->setVisible(button->objectName(), checked); + activePlot->setVisibleById(button->objectName(), checked); QWidget* colorIcon = colorIcons.value(button->objectName(), 0); if (colorIcon) { -- 2.22.0