Merge pull request #408 from thomasgubler/plotfilter

LinechartWidget: fix removal of curves

Merge pull request #408 from thomasgubler/plotfilter
LinechartWidget: fix removal of curves
18149033 · Lorenz Meier · 942a02c9 · ee32097e · 18149033
Commit 18149033 authored Oct 31, 2013 by Lorenz Meier
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

LinechartWidget.cc src/ui/linechart/LinechartWidget.cc +12 -2

No files found.
--- a/src/ui/linechart/LinechartWidget.cc
+++ b/src/ui/linechart/LinechartWidget.cc
@@ -673,9 +673,19 @@ void LinechartWidget::removeCurve(QString curve)
    widget = curveVariances->take(curve);
    curvesWidgetLayout->removeWidget(widget);
    widget->deleteLater();
-//    widget = colorIcons->take(curve);
-//    curvesWidgetLayout->removeWidget(colorIcons->take(curve));
+    widget = colorIcons.take(curve);
+    curvesWidgetLayout->removeWidget(widget);
+    widget->deleteLater();
+    widget = curveNameLabels.take(curve);
+    curvesWidgetLayout->removeWidget(widget);
+    widget->deleteLater();
+    widget = curveUnits.take(curve);
+    curvesWidgetLayout->removeWidget(widget);
    widget->deleteLater();
+    QCheckBox* checkbox;
+    checkbox = checkBoxes.take(curve);
+    curvesWidgetLayout->removeWidget(checkbox);
+    checkbox->deleteLater();
 //    intData->remove(curve);
 }