Actually use axis formatter in renderer.

Task-number: QTRD-2787

Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

3 files changed, 64 insertions, 14 deletions

diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index 7f2a3ef2..e1fed76a 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -49,8 +49,10 @@ GraphModifier::GraphModifier(Q3DSurface *graph)
       m_activeSample(0),
       m_fontSize(40),
       m_rangeX(16.0),
+      m_rangeY(16.0),
       m_rangeZ(16.0),
       m_minX(-8.0),
+      m_minY(-8.0),
       m_minZ(-8.0),
       m_addRowCounter(m_zCount),
       m_insertTestZPos(0),
@@ -85,14 +87,15 @@ GraphModifier::GraphModifier(Q3DSurface *graph)
     m_multiSampleOffsetX[3] = m_offset;
     m_multiSampleOffsetZ[3] = m_offset;
 
-    m_graph->axisX()->setRange(-m_limitX - m_offset, m_limitX + m_offset);
-    m_graph->axisY()->setRange(-1.0f, 4.5f);
-    m_graph->axisZ()->setRange(-m_limitZ - m_offset, m_limitZ + m_offset);
+//    m_graph->axisX()->setRange(-m_limitX - m_offset, m_limitX + m_offset);
+//    m_graph->axisY()->setRange(-1.0f, 4.5f);
+//    m_graph->axisZ()->setRange(-m_limitZ - m_offset, m_limitZ + m_offset);
 #else
-    m_graph->axisX()->setRange(m_minX, m_minX + m_rangeX);
-    m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ);
     m_graph->addSeries(m_theSeries);
 #endif
+    m_graph->axisX()->setRange(m_minX, m_minX + m_rangeX);
+    m_graph->axisY()->setRange(m_minY, m_minY + m_rangeY);
+    m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ);
 
     for (int i = 0; i < 4; i++) {
         m_multiseries[i] = new QSurface3DSeries;
@@ -134,18 +137,27 @@ void GraphModifier::fillSeries()
     QSurfaceDataArray *dataArray4 = new QSurfaceDataArray;
     dataArray4->reserve(m_zCount);
 
+
     for (int i = 0; i < m_zCount; i++) {
         QSurfaceDataRow *newRow[4];
+        float zAdjust = 0.0f;
+        if (i == 3)
+            zAdjust = 0.7f;
+
         for (int s = 0; s < 4; s++) {
             newRow[s] = new QSurfaceDataRow(m_xCount);
-            float z = float(i) - m_limitZ + 0.5f + m_multiSampleOffsetZ[s];
+            float z = float(i) - m_limitZ + 0.5f + m_multiSampleOffsetZ[s] + zAdjust;
             for (int j = 0; j < m_xCount; j++) {
-                float x = float(j) - m_limitX + 0.5f + m_multiSampleOffsetX[s];
+                float xAdjust = 0.0f;
+                if (j == 3)
+                    xAdjust = 0.7f;
+                float x = float(j) - m_limitX + 0.5f + m_multiSampleOffsetX[s] + xAdjust;
                 float angle = (z * x) / full * 1.57f;
-                float y = qSin(angle * float(qPow(1.3f, s))) + 1.1f * s;
+                float y = (qSin(angle * float(qPow(1.3f, s))) + 1.1f * s) * 3.0f - 5.0f + xAdjust + zAdjust;
                 (*newRow[s])[j].setPosition(QVector3D(x, y, z));
             }
         }
+        qDebug() << newRow[0]->at(0).z();
         *dataArray1 << newRow[0];
         *dataArray2 << newRow[1];
         *dataArray3 << newRow[2];
@@ -550,6 +562,14 @@ void GraphModifier::adjustXRange(int range)
     qDebug() << "X Range =" << range;
 }
 
+void GraphModifier::adjustYRange(int range)
+{
+    m_rangeY = range;
+    m_graph->axisY()->setRange(m_minY, m_minY + m_rangeY);
+
+    qDebug() << "Y Range =" << range;
+}
+
 void GraphModifier::adjustZRange(int range)
 {
     m_rangeZ = range;
@@ -566,6 +586,14 @@ void GraphModifier::adjustXMin(int min)
     qDebug() << "X Minimum =" << min;
 }
 
+void GraphModifier::adjustYMin(int min)
+{
+    m_minY = min;
+    m_graph->axisY()->setRange(m_minY, m_minY + m_rangeY);
+
+    qDebug() << "Y Minimum =" << min;
+}
+
 void GraphModifier::adjustZMin(int min)
 {
     m_minZ = min;
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h
index 7d7d425e..9fd0360b 100644
--- a/tests/surfacetest/graphmodifier.h
+++ b/tests/surfacetest/graphmodifier.h
@@ -82,8 +82,10 @@ public:
     void adjustXCount(int count);
     void adjustZCount(int count);
     void adjustXRange(int range);
+    void adjustYRange(int range);
     void adjustZRange(int range);
     void adjustXMin(int min);
+    void adjustYMin(int min);
     void adjustZMin(int min);
     void updateSamples();
     void gradientPressed();
@@ -143,8 +145,10 @@ private:
     int m_activeSample;
     int m_fontSize;
     float m_rangeX;
+    float m_rangeY;
     float m_rangeZ;
     float m_minX;
+    float m_minY;
     float m_minZ;
     int m_addRowCounter;
     int m_insertTestZPos;
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 99c60893..6b54b8dd 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -182,28 +182,40 @@ int main(int argc, char *argv[])
 
     QSlider *axisRangeSliderX = new QSlider(Qt::Horizontal, widget);
     axisRangeSliderX->setTickInterval(1);
-    axisRangeSliderX->setMinimum(2);
+    axisRangeSliderX->setMinimum(1);
     axisRangeSliderX->setValue(16);
     axisRangeSliderX->setMaximum(100);
     axisRangeSliderX->setEnabled(true);
+    QSlider *axisRangeSliderY = new QSlider(Qt::Horizontal, widget);
+    axisRangeSliderY->setTickInterval(1);
+    axisRangeSliderY->setMinimum(1);
+    axisRangeSliderY->setValue(16);
+    axisRangeSliderY->setMaximum(100);
+    axisRangeSliderY->setEnabled(true);
     QSlider *axisRangeSliderZ = new QSlider(Qt::Horizontal, widget);
     axisRangeSliderZ->setTickInterval(1);
-    axisRangeSliderZ->setMinimum(2);
+    axisRangeSliderZ->setMinimum(1);
     axisRangeSliderZ->setValue(16);
     axisRangeSliderZ->setMaximum(100);
     axisRangeSliderZ->setEnabled(true);
 
     QSlider *axisMinSliderX = new QSlider(Qt::Horizontal, widget);
     axisMinSliderX->setTickInterval(1);
-    axisMinSliderX->setMinimum(-50);
+    axisMinSliderX->setMinimum(-100);
     axisMinSliderX->setValue(-8);
-    axisMinSliderX->setMaximum(50);
+    axisMinSliderX->setMaximum(100);
     axisMinSliderX->setEnabled(true);
+    QSlider *axisMinSliderY = new QSlider(Qt::Horizontal, widget);
+    axisMinSliderY->setTickInterval(1);
+    axisMinSliderY->setMinimum(-100);
+    axisMinSliderY->setValue(-8);
+    axisMinSliderY->setMaximum(100);
+    axisMinSliderY->setEnabled(true);
     QSlider *axisMinSliderZ = new QSlider(Qt::Horizontal, widget);
     axisMinSliderZ->setTickInterval(1);
-    axisMinSliderZ->setMinimum(-50);
+    axisMinSliderZ->setMinimum(-100);
     axisMinSliderZ->setValue(-8);
-    axisMinSliderZ->setMaximum(50);
+    axisMinSliderZ->setMaximum(100);
     axisMinSliderZ->setEnabled(true);
 
     QLinearGradient gr(0, 0, 100, 1);
@@ -378,9 +390,11 @@ int main(int argc, char *argv[])
 #endif
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis range")));
     vLayout->addWidget(axisRangeSliderX);
+    vLayout->addWidget(axisRangeSliderY);
     vLayout->addWidget(axisRangeSliderZ);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis minimum")));
     vLayout->addWidget(axisMinSliderX);
+    vLayout->addWidget(axisMinSliderY);
     vLayout->addWidget(axisMinSliderZ);
     vLayout2->addWidget(new QLabel(QStringLiteral("Change font")));
     vLayout2->addWidget(fontList);
@@ -510,10 +524,14 @@ int main(int argc, char *argv[])
 #endif
     QObject::connect(axisRangeSliderX, &QSlider::valueChanged,
                      modifier, &GraphModifier::adjustXRange);
+    QObject::connect(axisRangeSliderY, &QSlider::valueChanged,
+                     modifier, &GraphModifier::adjustYRange);
     QObject::connect(axisRangeSliderZ, &QSlider::valueChanged,
                      modifier, &GraphModifier::adjustZRange);
     QObject::connect(axisMinSliderX, &QSlider::valueChanged,
                      modifier, &GraphModifier::adjustXMin);
+    QObject::connect(axisMinSliderY, &QSlider::valueChanged,
+                     modifier, &GraphModifier::adjustYMin);
     QObject::connect(axisMinSliderZ, &QSlider::valueChanged,
                      modifier, &GraphModifier::adjustZMin);
     QObject::connect(colorPB, &QPushButton::pressed,