Actually use axis formatter in renderer.

Task-number: QTRD-2787

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

3 files changed, 16 insertions, 3 deletions

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 7374f25f..cf044a45 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -144,7 +144,7 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog)
     m_dummyData4->setName("Dummy 4");
     m_dummyData5->setName("Dummy 5");
 
-    m_temperatureData->setItemLabelFormat(QStringLiteral("@seriesName: @valueTitle for @colLabel @rowLabel: @valueLabel"));
+    m_temperatureData->setItemLabelFormat(QStringLiteral("@seriesName: @valueTitle for @colLabel @rowLabel: @valueLabel ~ %.4f"));
     m_temperatureData2->setItemLabelFormat(QStringLiteral("@seriesName: @valueTitle for @colLabel @rowLabel: @valueLabel"));
     m_genericData->setItemLabelFormat(QStringLiteral("@seriesName: @valueTitle for (@rowIdx, @colIdx): @valueLabel"));
 
@@ -1055,7 +1055,12 @@ void GraphModifier::useLogAxis()
 //    logAxis->formatter()->setBase(10);
 //    logAxis->setSegmentCount(5);
 //    logAxis->setRange(1, 100000);
-//    m_graph->setValueAxis(logAxis);
+    //    m_graph->setValueAxis(logAxis);
+}
+
+void GraphModifier::changeValueAxisFormat(const QString & text)
+{
+    m_graph->valueAxis()->setLabelFormat(text);
 }
 
 void GraphModifier::insertRemoveTimerTimeout()
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 557270e0..304103cd 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -86,6 +86,7 @@ public:
     void insertRemoveTestToggle();
     void toggleRotation();
     void useLogAxis();
+    void changeValueAxisFormat(const QString & text);
 
 public slots:
     void flipViews();
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index b02fa48f..edf61e2e 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -32,6 +32,7 @@
 #include <QLinearGradient>
 #include <QPainter>
 #include <QColorDialog>
+#include <QLineEdit>
 
 int main(int argc, char **argv)
 {
@@ -290,6 +291,8 @@ int main(int argc, char **argv)
     shadowQuality->addItem(QStringLiteral("High Soft"));
     shadowQuality->setCurrentIndex(5);
 
+    QLineEdit *valueAxisFormatEdit = new QLineEdit(widget);
+
     vLayout->addWidget(addDataButton, 0, Qt::AlignTop);
     vLayout->addWidget(addMultiDataButton, 0, Qt::AlignTop);
     vLayout->addWidget(insertDataButton, 0, Qt::AlignTop);
@@ -344,7 +347,9 @@ int main(int argc, char **argv)
     vLayout2->addWidget(new QLabel(QStringLiteral("Change font")), 0, Qt::AlignTop);
     vLayout2->addWidget(fontList, 0, Qt::AlignTop);
     vLayout2->addWidget(new QLabel(QStringLiteral("Adjust font size")), 0, Qt::AlignTop);
-    vLayout2->addWidget(fontSizeSlider, 1, Qt::AlignTop);
+    vLayout2->addWidget(fontSizeSlider, 0, Qt::AlignTop);
+    vLayout2->addWidget(new QLabel(QStringLiteral("Value axis format")), 0, Qt::AlignTop);
+    vLayout2->addWidget(valueAxisFormatEdit, 1, Qt::AlignTop);
     // TODO: Add example for setMeshFileName
 
     widget->show();
@@ -380,6 +385,8 @@ int main(int argc, char **argv)
                      &QComboBox::setCurrentIndex);
     QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier,
                      &GraphModifier::changeFontSize);
+    QObject::connect(valueAxisFormatEdit, &QLineEdit::textEdited, modifier,
+                     &GraphModifier::changeValueAxisFormat);
 
     QObject::connect(multiScaleButton, &QPushButton::clicked, modifier,
                      &GraphModifier::toggleMultiseriesScaling);