From d2e513c558a66c5efd4da11a972759a2ed3fdc11 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Sun, 10 Nov 2013 21:19:13 +0100 Subject: [PATCH] Do not filter/hide line in linechartwidget when checkbox of the line is checked --- src/ui/linechart/LinechartWidget.cc | 17 ++++++++++------- src/ui/linechart/LinechartWidget.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index f4badd7a5..c8652ddec 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -712,13 +712,16 @@ void LinechartWidget::setPlotFilterLineEditFocus() void LinechartWidget::filterCurve(const QString &key, bool match) { - colorIcons[key]->setVisible(match); - curveNameLabels[key]->setVisible(match); - (*curveLabels)[key]->setVisible(match); - (*curveMeans)[key]->setVisible(match); - (*curveVariances)[key]->setVisible(match); - curveUnits[key]->setVisible(match); - checkBoxes[key]->setVisible(match); + if (!checkBoxes[key]->isChecked()) + { + colorIcons[key]->setVisible(match); + curveNameLabels[key]->setVisible(match); + (*curveLabels)[key]->setVisible(match); + (*curveMeans)[key]->setVisible(match); + (*curveVariances)[key]->setVisible(match); + curveUnits[key]->setVisible(match); + checkBoxes[key]->setVisible(match); + } } void LinechartWidget::filterCurves(const QString &filter) diff --git a/src/ui/linechart/LinechartWidget.h b/src/ui/linechart/LinechartWidget.h index 12fe58494..4c9fb20b6 100644 --- a/src/ui/linechart/LinechartWidget.h +++ b/src/ui/linechart/LinechartWidget.h @@ -114,7 +114,7 @@ public slots: private slots: /** Called when the user changes the time scale combobox. */ void timeScaleChanged(int index); - /** @brief Applies action on curve corresponding to key based on the bool match. I used to filter curves */ + /** @brief Toggles visibility of curve based on bool match if corresponding checkbox is not checked */ void filterCurve(const QString &key, bool match); protected: -- 2.22.0