Browse Source

Fix a virtual function override

QGC4.4
Don Gagne 11 years ago
parent
commit
aa14800fc3
  1. 6
      src/ui/linechart/LinechartPlot.cc
  2. 2
      src/ui/linechart/LinechartPlot.h
  3. 6
      src/ui/linechart/LinechartWidget.cc

6
src/ui/linechart/LinechartPlot.cc

@ -412,7 +412,7 @@ void LinechartPlot::setScaling(int scaling) @@ -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) @@ -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) @@ -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)

2
src/ui/linechart/LinechartPlot.h

@ -213,7 +213,7 @@ public slots: @@ -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.

6
src/ui/linechart/LinechartWidget.cc

@ -171,7 +171,7 @@ void LinechartWidget::selectAllCurves(bool all) @@ -171,7 +171,7 @@ void LinechartWidget::selectAllCurves(bool all)
{
QMap<QString, QLabel*>::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) @@ -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) @@ -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)
{

Loading…
Cancel
Save