Optionally show axis titles on the graph

Task-number: QTRD-2961
Change-Id: I6a344156bd29fa8fb1ede0546af4d0e67e5e2db4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

4 files changed, 59 insertions, 4 deletions

diff --git a/examples/datavisualization/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp
index dc5d92c9..9c280bfb 100644
--- a/examples/datavisualization/bars/graphmodifier.cpp
+++ b/examples/datavisualization/bars/graphmodifier.cpp
@@ -68,12 +68,15 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
     m_temperatureAxis->setSubSegmentCount(m_subSegments);
     m_temperatureAxis->setRange(m_minval, m_maxval);
     m_temperatureAxis->setLabelFormat(QString(QStringLiteral("%.1f ") + celsiusString));
-    m_temperatureAxis->setLabelAutoRotation(90.0f);
+    m_temperatureAxis->setLabelAutoRotation(30.0f);
+    m_temperatureAxis->setTitleVisible(true);
 
     m_yearAxis->setTitle("Year");
-    m_yearAxis->setLabelAutoRotation(40.0f);
+    m_yearAxis->setLabelAutoRotation(30.0f);
+    m_yearAxis->setTitleVisible(true);
     m_monthAxis->setTitle("Month");
-    m_monthAxis->setLabelAutoRotation(40.0f);
+    m_monthAxis->setLabelAutoRotation(30.0f);
+    m_monthAxis->setTitleVisible(true);
 
     m_graph->setValueAxis(m_temperatureAxis);
     m_graph->setRowAxis(m_yearAxis);
@@ -239,6 +242,27 @@ void GraphModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality
     emit shadowQualityChanged(quality);
 }
 
+void GraphModifier::changeLabelRotation(int rotation)
+{
+    m_temperatureAxis->setLabelAutoRotation(float(rotation));
+    m_monthAxis->setLabelAutoRotation(float(rotation));
+    m_yearAxis->setLabelAutoRotation(float(rotation));
+}
+
+void GraphModifier::setAxisTitleVisibility(bool enabled)
+{
+    m_temperatureAxis->setTitleVisible(enabled);
+    m_monthAxis->setTitleVisible(enabled);
+    m_yearAxis->setTitleVisible(enabled);
+}
+
+void GraphModifier::setAxisTitleFixed(bool enabled)
+{
+    m_temperatureAxis->setTitleFixed(enabled);
+    m_monthAxis->setTitleFixed(enabled);
+    m_yearAxis->setTitleFixed(enabled);
+}
+
 void GraphModifier::changeShadowQuality(int quality)
 {
     QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h
index e1aacaf7..107ffbab 100644
--- a/examples/datavisualization/bars/graphmodifier.h
+++ b/examples/datavisualization/bars/graphmodifier.h
@@ -57,6 +57,9 @@ public slots:
     void changeTheme(int theme);
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
+    void changeLabelRotation(int rotation);
+    void setAxisTitleVisibility(bool enabled);
+    void setAxisTitleFixed(bool enabled);
 
 signals:
     void shadowQualityChanged(int quality);
diff --git a/examples/datavisualization/bars/main.cpp b/examples/datavisualization/bars/main.cpp
index 79b2967a..96abdc51 100644
--- a/examples/datavisualization/bars/main.cpp
+++ b/examples/datavisualization/bars/main.cpp
@@ -183,6 +183,21 @@ int main(int argc, char **argv)
     rangeList->addItem(QStringLiteral("All"));
     rangeList->setCurrentIndex(8);
 
+    QCheckBox *axisTitlesVisibleCB = new QCheckBox(widget);
+    axisTitlesVisibleCB->setText(QStringLiteral("Axis titles visible"));
+    axisTitlesVisibleCB->setChecked(true);
+
+    QCheckBox *axisTitlesFixedCB = new QCheckBox(widget);
+    axisTitlesFixedCB->setText(QStringLiteral("Axis titles fixed"));
+    axisTitlesFixedCB->setChecked(true);
+
+    QSlider *axisLabelRotationSlider = new QSlider(Qt::Horizontal, widget);
+    axisLabelRotationSlider->setTickInterval(10);
+    axisLabelRotationSlider->setTickPosition(QSlider::TicksBelow);
+    axisLabelRotationSlider->setMinimum(0);
+    axisLabelRotationSlider->setValue(30);
+    axisLabelRotationSlider->setMaximum(90);
+
     //! [5]
     vLayout->addWidget(new QLabel(QStringLiteral("Rotate horizontally")));
     vLayout->addWidget(rotationSliderX, 0, Qt::AlignTop);
@@ -196,6 +211,8 @@ int main(int argc, char **argv)
     vLayout->addWidget(smoothCheckBox);
     vLayout->addWidget(seriesCheckBox);
     vLayout->addWidget(reverseValueAxisCheckBox);
+    vLayout->addWidget(axisTitlesVisibleCB);
+    vLayout->addWidget(axisTitlesFixedCB);
     vLayout->addWidget(new QLabel(QStringLiteral("Show year")));
     vLayout->addWidget(rangeList);
     vLayout->addWidget(new QLabel(QStringLiteral("Change bar style")));
@@ -209,7 +226,9 @@ int main(int argc, char **argv)
     vLayout->addWidget(new QLabel(QStringLiteral("Change font")));
     vLayout->addWidget(fontList);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust font size")));
-    vLayout->addWidget(fontSizeSlider, 1, Qt::AlignTop);
+    vLayout->addWidget(fontSizeSlider);
+    vLayout->addWidget(new QLabel(QStringLiteral("Axis label rotation")));
+    vLayout->addWidget(axisLabelRotationSlider, 1, Qt::AlignTop);
 
     //! [2]
     GraphModifier *modifier = new GraphModifier(widgetgraph);
@@ -271,6 +290,12 @@ int main(int argc, char **argv)
     QObject::connect(modifier, &GraphModifier::fontChanged, fontList,
                      &QFontComboBox::setCurrentFont);
 
+    QObject::connect(axisTitlesVisibleCB, &QCheckBox::stateChanged, modifier,
+                     &GraphModifier::setAxisTitleVisibility);
+    QObject::connect(axisTitlesFixedCB, &QCheckBox::stateChanged, modifier,
+                     &GraphModifier::setAxisTitleFixed);
+    QObject::connect(axisLabelRotationSlider, &QSlider::valueChanged, modifier,
+                     &GraphModifier::changeLabelRotation);
     //! [3]
     widget->show();
     return app.exec();
diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp
index ad9f0112..f00702eb 100644
--- a/examples/datavisualization/itemmodel/main.cpp
+++ b/examples/datavisualization/itemmodel/main.cpp
@@ -167,8 +167,11 @@ void GraphDataGenerator::setupModel()
     // Add labels
     //! [10]
     m_graph->rowAxis()->setTitle("Week of year");
+    m_graph->rowAxis()->setTitleVisible(true);
     m_graph->columnAxis()->setTitle("Day of week");
+    m_graph->columnAxis()->setTitleVisible(true);
     m_graph->valueAxis()->setTitle("Hours spent on the Internet");
+    m_graph->valueAxis()->setTitleVisible(true);
     m_graph->valueAxis()->setLabelFormat("%.1f h");
     //! [10]