Support for non-zero centered data in scatter

Task-number: QTRD-2311

Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780
Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

3 files changed, 24 insertions, 0 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index dda4536b..1ac661df 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -68,6 +68,9 @@ int main(int argc, char **argv)
     QPushButton *clearButton = new QPushButton(widget);
     clearButton->setText(QStringLiteral("Clear chart"));
 
+    QPushButton *resetButton = new QPushButton(widget);
+    resetButton->setText(QStringLiteral("Reset axes"));
+
     QPushButton *addOneButton = new QPushButton(widget);
     addOneButton->setText(QStringLiteral("Add item"));
 
@@ -129,6 +132,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
     vLayout->addWidget(cameraButton, 0, Qt::AlignTop);
     vLayout->addWidget(clearButton, 0, Qt::AlignTop);
+    vLayout->addWidget(resetButton, 0, Qt::AlignTop);
     vLayout->addWidget(addOneButton, 0, Qt::AlignTop);
     vLayout->addWidget(addBunchButton, 0, Qt::AlignTop);
     vLayout->addWidget(insertOneButton, 0, Qt::AlignTop);
@@ -161,6 +165,8 @@ int main(int argc, char **argv)
                      &ScatterDataModifier::changePresetCamera);
     QObject::connect(clearButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::clear);
+    QObject::connect(resetButton, &QPushButton::clicked, modifier,
+                     &ScatterDataModifier::resetAxes);
     QObject::connect(addOneButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::addOne);
     QObject::connect(addBunchButton, &QPushButton::clicked, modifier,
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 48f1d999..adb2d6a5 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -175,6 +175,23 @@ void ScatterDataModifier::clear()
     qDebug() << m_loopCounter << "Cleared array";
 }
 
+void ScatterDataModifier::resetAxes()
+{
+    m_chart->releaseAxis(m_chart->axisX());
+    m_chart->releaseAxis(m_chart->axisY());
+    m_chart->releaseAxis(m_chart->axisZ());
+
+    m_chart->setAxisX(new Q3DValueAxis);
+    m_chart->setAxisY(new Q3DValueAxis);
+    m_chart->setAxisZ(new Q3DValueAxis);
+    m_chart->axisX()->setSegmentCount(5);
+    m_chart->axisY()->setSegmentCount(5);
+    m_chart->axisZ()->setSegmentCount(5);
+    m_chart->axisX()->setTitle("X");
+    m_chart->axisY()->setTitle("Y");
+    m_chart->axisZ()->setTitle("Z");
+}
+
 void ScatterDataModifier::addOne()
 {
     QScatterDataItem item(randVector());
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 7132e7ce..2d97c236 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -49,6 +49,7 @@ public slots:
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
     void clear();
+    void resetAxes();
     void addOne();
     void addBunch();
     void insertOne();