From ba812351a1577163a1c9794b667f2b4e3acb9373 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 12 Mar 2014 09:25:51 +0200
Subject: Introduce value axis formatter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently only used for label formatting.

Also some other preparatory changes for logaxis.

Task-number: QTRD-2787

Note: Not to be merged until 1.0 is released

Change-Id: I2d7ab70b9c51677d0edd5b0226fb779c9e346286
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 tests/barstest/chart.cpp | 14 ++++++++++++++
 tests/barstest/chart.h   |  1 +
 tests/barstest/main.cpp  |  7 +++++++
 3 files changed, 22 insertions(+)

(limited to 'tests')

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index e7a0e2ca..7374f25f 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -20,6 +20,7 @@
 #include "custominputhandler.h"
 #include <QtDataVisualization/qcategory3daxis.h>
 #include <QtDataVisualization/qvalue3daxis.h>
+#include <QtDataVisualization/qvalue3daxisformatter.h>
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
@@ -1044,6 +1045,19 @@ void GraphModifier::toggleRotation()
         m_rotationTimer.start(20);
 }
 
+void GraphModifier::useLogAxis()
+{
+    // TODO proper log axis test
+
+
+//    // Change y-axis to log axis
+//    QValue3DAxis *logAxis = new QValue3DAxis;
+//    logAxis->formatter()->setBase(10);
+//    logAxis->setSegmentCount(5);
+//    logAxis->setRange(1, 100000);
+//    m_graph->setValueAxis(logAxis);
+}
+
 void GraphModifier::insertRemoveTimerTimeout()
 {
     if (m_insertRemoveStep < 32) {
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 5758262c..557270e0 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -85,6 +85,7 @@ public:
     void primarySeriesTest();
     void insertRemoveTestToggle();
     void toggleRotation();
+    void useLogAxis();
 
 public slots:
     void flipViews();
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index 8189f917..b02fa48f 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -165,6 +165,10 @@ int main(int argc, char **argv)
     toggleRotationButton->setText(QStringLiteral("Toggle rotation"));
     toggleRotationButton->setEnabled(true);
 
+    QPushButton *logAxisButton = new QPushButton(widget);
+    logAxisButton->setText(QStringLiteral("Use Log Axis"));
+    logAxisButton->setEnabled(true);
+
     QColorDialog *colorDialog = new QColorDialog(widget);
 
     QLinearGradient grBtoY(0, 0, 100, 0);
@@ -313,6 +317,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(ownThemeButton, 0, Qt::AlignTop);
     vLayout->addWidget(primarySeriesTestsButton, 0, Qt::AlignTop);
     vLayout->addWidget(toggleRotationButton, 0, Qt::AlignTop);
+    vLayout->addWidget(logAxisButton, 0, Qt::AlignTop);
     vLayout->addWidget(gradientBtoYPB, 1, Qt::AlignTop);
 
     vLayout2->addWidget(staticCheckBox, 0, Qt::AlignTop);
@@ -418,6 +423,8 @@ int main(int argc, char **argv)
                      &GraphModifier::primarySeriesTest);
     QObject::connect(toggleRotationButton, &QPushButton::clicked, modifier,
                      &GraphModifier::toggleRotation);
+    QObject::connect(logAxisButton, &QPushButton::clicked, modifier,
+                     &GraphModifier::useLogAxis);
     QObject::connect(colorDialog, &QColorDialog::currentColorChanged, modifier,
                      &GraphModifier::changeBaseColor);
     QObject::connect(gradientBtoYPB, &QPushButton::clicked, modifier,
-- 
cgit v1.2.3