From 02f950176d3a0488875d451d3da0fc8b2312bec0 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 13 Jan 2014 10:22:43 +0200
Subject: Fix axis range autoadjustment relating to series visibility

No need to recalc ranges when a change targets non-visible series.

Change-Id: Ifd80b876ba279917a5bded8240721d00d66a6f05
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
---
 tests/scattertest/main.cpp         | 6 ++++++
 tests/scattertest/scatterchart.cpp | 6 ++++++
 tests/scattertest/scatterchart.h   | 1 +
 3 files changed, 13 insertions(+)

(limited to 'tests')

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index 26f30beb..d4a6c108 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -106,6 +106,9 @@ int main(int argc, char **argv)
     QPushButton *removeSeriesButton = new QPushButton(widget);
     removeSeriesButton->setText(QStringLiteral("Remove Series"));
 
+    QPushButton *toggleSeriesVisibilityButton = new QPushButton(widget);
+    toggleSeriesVisibilityButton->setText(QStringLiteral("Toggle visibility"));
+
     QPushButton *startTimerButton = new QPushButton(widget);
     startTimerButton->setText(QStringLiteral("Start/stop timer"));
 
@@ -172,6 +175,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(setSelectedItemButton, 0, Qt::AlignTop);
     vLayout->addWidget(addSeriesButton, 0, Qt::AlignTop);
     vLayout->addWidget(removeSeriesButton, 0, Qt::AlignTop);
+    vLayout->addWidget(toggleSeriesVisibilityButton, 0, Qt::AlignTop);
     vLayout->addWidget(startTimerButton, 0, Qt::AlignTop);
     vLayout->addWidget(gradientBtoYPB, 0, Qt::AlignTop);
     vLayout->addWidget(backgroundCheckBox);
@@ -224,6 +228,8 @@ int main(int argc, char **argv)
                      &ScatterDataModifier::addSeries);
     QObject::connect(removeSeriesButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::removeSeries);
+    QObject::connect(toggleSeriesVisibilityButton, &QPushButton::clicked, modifier,
+                     &ScatterDataModifier::toggleSeriesVisibility);
     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 6b7fd910..58f5b355 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -470,6 +470,12 @@ void ScatterDataModifier::removeSeries()
     }
 }
 
+void ScatterDataModifier::toggleSeriesVisibility()
+{
+    if (m_targetSeries)
+        m_targetSeries->setVisible(!m_targetSeries->isVisible());
+}
+
 void ScatterDataModifier::handleAxisXChanged(QValue3DAxis *axis)
 {
     qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_chart->axisX());
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 903c6fc0..7906eac0 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -67,6 +67,7 @@ public slots:
     void setGradient();
     void addSeries();
     void removeSeries();
+    void toggleSeriesVisibility();
 
     void handleAxisXChanged(QValue3DAxis *axis);
     void handleAxisYChanged(QValue3DAxis *axis);
-- 
cgit v1.2.3