Scatter and surface autoadjust ranges to consider all visible series

Task-number: QTRD-2605

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

3 files changed, 19 insertions, 3 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index e9cb58b1..26f30beb 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -149,6 +149,12 @@ int main(int argc, char **argv)
     fontSizeSlider->setValue(30);
     fontSizeSlider->setMaximum(200);
 
+    QSlider *pointSizeSlider = new QSlider(Qt::Horizontal, widget);
+    pointSizeSlider->setTickInterval(1);
+    pointSizeSlider->setMinimum(1);
+    pointSizeSlider->setValue(30);
+    pointSizeSlider->setMaximum(100);
+
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
@@ -176,6 +182,8 @@ int main(int argc, char **argv)
     vLayout->addWidget(fontList);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust font size")));
     vLayout->addWidget(fontSizeSlider, 1, Qt::AlignTop);
+    vLayout->addWidget(new QLabel(QStringLiteral("Adjust point size")));
+    vLayout->addWidget(pointSizeSlider, 1, Qt::AlignTop);
 
     widget->show();
 
@@ -183,6 +191,8 @@ int main(int argc, char **argv)
 
     QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier,
                      &ScatterDataModifier::changeFontSize);
+    QObject::connect(pointSizeSlider, &QSlider::valueChanged, modifier,
+                     &ScatterDataModifier::changePointSize);
 
     QObject::connect(styleButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeStyle);
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 5f4f6f01..b1df526a 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -179,14 +179,19 @@ void ScatterDataModifier::changeFont(const QFont &font)
     m_chart->theme()->setFont(newFont);
 }
 
-void ScatterDataModifier::changeFontSize(int fontsize)
+void ScatterDataModifier::changeFontSize(int fontSize)
 {
-    m_fontSize = fontsize;
+    m_fontSize = fontSize;
     QFont font = m_chart->theme()->font();
     font.setPointSize(m_fontSize);
     m_chart->theme()->setFont(font);
 }
 
+void ScatterDataModifier::changePointSize(int pointSize)
+{
+    m_targetSeries->setItemSize(0.01f *  float(pointSize));
+}
+
 void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 {
     int quality = int(sq);
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 539c430d..5524929e 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -41,7 +41,8 @@ public:
     void changeTheme();
     void changeLabelStyle();
     void changeFont(const QFont &font);
-    void changeFontSize(int fontsize);
+    void changeFontSize(int fontSize);
+    void changePointSize(int pointSize);
     void setBackgroundEnabled(int enabled);
     void setGridEnabled(int enabled);
     void start();