Added API for changing data aspect ratio

Task-number: QTRD-3144
Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

6 files changed, 47 insertions, 9 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index b0e52c8c..ad147b0d 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -170,59 +170,68 @@ int main(int argc, char **argv)
     QFontComboBox *fontList = new QFontComboBox(widget);
 
     QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, widget);
-    fontSizeSlider->setTickInterval(1);
+    fontSizeSlider->setTickInterval(15);
+    fontSizeSlider->setTickPosition(QSlider::TicksBelow);
     fontSizeSlider->setMinimum(1);
     fontSizeSlider->setValue(30);
     fontSizeSlider->setMaximum(200);
 
     QSlider *pointSizeSlider = new QSlider(Qt::Horizontal, widget);
-    pointSizeSlider->setTickInterval(1);
+    pointSizeSlider->setTickInterval(15);
+    pointSizeSlider->setTickPosition(QSlider::TicksBelow);
     pointSizeSlider->setMinimum(1);
     pointSizeSlider->setValue(30);
     pointSizeSlider->setMaximum(100);
 
     QSlider *minSliderX = new QSlider(Qt::Horizontal, widget);
-    minSliderX->setTickInterval(1);
+    minSliderX->setTickInterval(50);
     minSliderX->setTickPosition(QSlider::TicksBelow);
     minSliderX->setMinimum(-100);
     minSliderX->setValue(-50);
     minSliderX->setMaximum(100);
 
     QSlider *minSliderY = new QSlider(Qt::Horizontal, widget);
-    minSliderY->setTickInterval(1);
+    minSliderY->setTickInterval(100);
     minSliderY->setTickPosition(QSlider::TicksBelow);
     minSliderY->setMinimum(-200);
     minSliderY->setValue(-100);
     minSliderY->setMaximum(200);
 
     QSlider *minSliderZ = new QSlider(Qt::Horizontal, widget);
-    minSliderZ->setTickInterval(1);
+    minSliderZ->setTickInterval(50);
     minSliderZ->setTickPosition(QSlider::TicksBelow);
     minSliderZ->setMinimum(-100);
     minSliderZ->setValue(-50);
     minSliderZ->setMaximum(100);
 
     QSlider *maxSliderX = new QSlider(Qt::Horizontal, widget);
-    maxSliderX->setTickInterval(1);
+    maxSliderX->setTickInterval(50);
     maxSliderX->setTickPosition(QSlider::TicksAbove);
     maxSliderX->setMinimum(-100);
     maxSliderX->setValue(50);
     maxSliderX->setMaximum(100);
 
     QSlider *maxSliderY = new QSlider(Qt::Horizontal, widget);
-    maxSliderY->setTickInterval(1);
+    maxSliderY->setTickInterval(100);
     maxSliderY->setTickPosition(QSlider::TicksAbove);
     maxSliderY->setMinimum(-200);
     maxSliderY->setValue(120);
     maxSliderY->setMaximum(200);
 
     QSlider *maxSliderZ = new QSlider(Qt::Horizontal, widget);
-    maxSliderZ->setTickInterval(1);
+    maxSliderZ->setTickInterval(50);
     maxSliderZ->setTickPosition(QSlider::TicksAbove);
     maxSliderZ->setMinimum(-100);
     maxSliderZ->setValue(50);
     maxSliderZ->setMaximum(100);
 
+    QSlider *aspectRatioSlider = new QSlider(Qt::Horizontal, widget);
+    aspectRatioSlider->setTickInterval(10);
+    aspectRatioSlider->setTickPosition(QSlider::TicksBelow);
+    aspectRatioSlider->setMinimum(1);
+    aspectRatioSlider->setValue(20);
+    aspectRatioSlider->setMaximum(100);
+
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
@@ -267,7 +276,9 @@ int main(int argc, char **argv)
     vLayout2->addWidget(new QLabel(QStringLiteral("Change font")));
     vLayout2->addWidget(fontList);
     vLayout2->addWidget(new QLabel(QStringLiteral("Adjust font size")));
-    vLayout2->addWidget(fontSizeSlider, 1, Qt::AlignTop);
+    vLayout2->addWidget(fontSizeSlider, 0, Qt::AlignTop);
+    vLayout2->addWidget(new QLabel(QStringLiteral("Adjust aspect ratio")));
+    vLayout2->addWidget(aspectRatioSlider, 1, Qt::AlignTop);
 
     widget->show();
 
@@ -356,6 +367,8 @@ int main(int argc, char **argv)
     QObject::connect(maxSliderZ, &QSlider::valueChanged, modifier,
                      &ScatterDataModifier::setMaxZ);
 
+    QObject::connect(aspectRatioSlider, &QSlider::valueChanged, modifier,
+                     &ScatterDataModifier::setAspectRatio);
 
     modifier->setFpsLabel(fpsLabel);
 
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 430279c3..3f900909 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -968,6 +968,12 @@ void ScatterDataModifier::setMaxZ(int max)
     m_chart->axisZ()->setMax(max);
 }
 
+void ScatterDataModifier::setAspectRatio(int ratio)
+{
+    float aspectRatio = float(ratio) / 10.0f;
+    m_chart->setAspectRatio(aspectRatio);
+}
+
 QVector3D ScatterDataModifier::randVector()
 {
     QVector3D retvec = QVector3D(
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 977e1201..34826aba 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -52,6 +52,7 @@ public:
     void setMaxX(int max);
     void setMaxY(int max);
     void setMaxZ(int max);
+    void setAspectRatio(int ratio);
     void start();
     void massiveDataTest();
     void massiveTestScroll();
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index 33cfb8a1..442e7742 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -1489,3 +1489,9 @@ void GraphModifier::updateSamples()
         break;
     }
 }
+
+void GraphModifier::setAspectRatio(int ratio)
+{
+    float aspectRatio = float(ratio) / 10.0f;
+    m_graph->setAspectRatio(aspectRatio);
+}
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h
index b02e1c31..ff0b325e 100644
--- a/tests/surfacetest/graphmodifier.h
+++ b/tests/surfacetest/graphmodifier.h
@@ -113,6 +113,8 @@ public:
     void testAxisReverse();
     void testDataOrdering();
 
+    void setAspectRatio(int ratio);
+
 public slots:
     void changeShadowQuality(int quality);
     void changeTheme(int theme);
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 9d6165e6..7444a66a 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -218,6 +218,11 @@ int main(int argc, char *argv[])
     axisMinSliderZ->setMaximum(100);
     axisMinSliderZ->setEnabled(true);
 
+    QSlider *aspectRatioSlider = new QSlider(Qt::Horizontal, widget);
+    aspectRatioSlider->setMinimum(1);
+    aspectRatioSlider->setValue(20);
+    aspectRatioSlider->setMaximum(100);
+
     QLinearGradient gr(0, 0, 100, 1);
     gr.setColorAt(0.0, Qt::black);
     gr.setColorAt(0.33, Qt::blue);
@@ -403,6 +408,8 @@ int main(int argc, char *argv[])
     vLayout->addWidget(gridSliderX);
     vLayout->addWidget(gridSliderZ);
 #endif
+    vLayout->addWidget(new QLabel(QStringLiteral("Adjust aspect ratio")));
+    vLayout->addWidget(aspectRatioSlider);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis range")));
     vLayout->addWidget(axisRangeSliderX);
     vLayout->addWidget(axisRangeSliderY);
@@ -605,6 +612,9 @@ int main(int argc, char *argv[])
     QObject::connect(testDataOrderingButton, &QPushButton::clicked,
                      modifier, &GraphModifier::testDataOrdering);
 
+    QObject::connect(aspectRatioSlider, &QSlider::valueChanged,
+                     modifier, &GraphModifier::setAspectRatio);
+
 #ifdef MULTI_SERIES
     modifier->setSeries1CB(series1CB);
     modifier->setSeries2CB(series2CB);