Multi series selection part 3: surface

Task-number: QTRD-2556

Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 19 insertions, 0 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index 7734faa2..e9cb58b1 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -103,6 +103,9 @@ int main(int argc, char **argv)
     QPushButton *addSeriesButton = new QPushButton(widget);
     addSeriesButton->setText(QStringLiteral("Add Series"));
 
+    QPushButton *removeSeriesButton = new QPushButton(widget);
+    removeSeriesButton->setText(QStringLiteral("Remove Series"));
+
     QPushButton *startTimerButton = new QPushButton(widget);
     startTimerButton->setText(QStringLiteral("Start/stop timer"));
 
@@ -162,6 +165,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(removeBunchButton, 0, Qt::AlignTop);
     vLayout->addWidget(setSelectedItemButton, 0, Qt::AlignTop);
     vLayout->addWidget(addSeriesButton, 0, Qt::AlignTop);
+    vLayout->addWidget(removeSeriesButton, 0, Qt::AlignTop);
     vLayout->addWidget(startTimerButton, 0, Qt::AlignTop);
     vLayout->addWidget(gradientBtoYPB, 0, Qt::AlignTop);
     vLayout->addWidget(backgroundCheckBox);
@@ -208,6 +212,8 @@ int main(int argc, char **argv)
                      &ScatterDataModifier::selectItem);
     QObject::connect(addSeriesButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::addSeries);
+    QObject::connect(removeSeriesButton, &QPushButton::clicked, modifier,
+                     &ScatterDataModifier::removeSeries);
     QObject::connect(startTimerButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::startStopTimer);
     QObject::connect(gradientBtoYPB, &QPushButton::clicked, modifier,
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index eba69888..fe784d74 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -435,6 +435,18 @@ void ScatterDataModifier::addSeries()
     m_targetSeries = oldTargetSeries;
 }
 
+void ScatterDataModifier::removeSeries()
+{
+    if (m_targetSeries) {
+        m_chart->removeSeries(m_targetSeries);
+        delete m_targetSeries;
+        if (m_chart->seriesList().size())
+            m_targetSeries = m_chart->seriesList().at(0);
+        else
+            m_targetSeries = 0;
+    }
+}
+
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
     QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 2567613f..539c430d 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -65,6 +65,7 @@ public slots:
     void handleSelectionChange(int index);
     void setGradient();
     void addSeries();
+    void removeSeries();
 
 signals:
     void shadowQualityChanged(int quality);