Optionally show axis titles on the graph

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

3 files changed, 85 insertions, 1 deletions

diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp
index 27951f4c..681c435f 100644
--- a/src/datavisualization/axis/qabstract3daxis.cpp
+++ b/src/datavisualization/axis/qabstract3daxis.cpp
@@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 /*!
  * \qmlproperty string AbstractAxis3D::title
  * Defines the title for the axis.
+ *
+ * \sa titleVisible, titleFixed
  */
 
 /*!
@@ -100,6 +102,27 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
+ * \qmlproperty bool AbstractAxis3D::titleVisible
+ *
+ * Defines if the axis title is visible in the primary graph view. The default value is \c{false}.
+ *
+ * \sa title, titleFixed
+ */
+
+/*!
+ * \qmlproperty bool AbstractAxis3D::titleFixed
+ *
+ * If \c{true}, axis titles in the primary graph view will be rotated towards the camera similarly
+ * to the axis labels.
+ * If \c{false}, axis titles are only rotated around their axis but are not otherwise oriented
+ * towards the camera.
+ * This property doesn't have any effect if labelAutoRotation property value is zero.
+ * Default value is \c{true}.
+ *
+ * \sa labelAutoRotation, title, titleVisible
+ */
+
+/*!
  * \enum QAbstract3DAxis::AxisOrientation
  *
  * The orientation of the axis object.
@@ -160,6 +183,8 @@ QAbstract3DAxis::AxisType QAbstract3DAxis::type() const
  * \property QAbstract3DAxis::title
  *
  * Defines the title for the axis.
+ *
+ * \sa titleVisible, titleFixed
  */
 void QAbstract3DAxis::setTitle(const QString &title)
 {
@@ -229,6 +254,51 @@ float QAbstract3DAxis::labelAutoRotation() const
 }
 
 /*!
+ * \property QAbstract3DAxis::titleVisible
+ *
+ * Defines if the axis title is visible in the primary graph view. The default value is \c{false}.
+ *
+ * \sa title, titleFixed
+ */
+void QAbstract3DAxis::setTitleVisible(bool visible)
+{
+    if (d_ptr->m_titleVisible != visible) {
+        d_ptr->m_titleVisible = visible;
+        emit titleVisibilityChanged(visible);
+    }
+}
+
+bool QAbstract3DAxis::isTitleVisible() const
+{
+    return d_ptr->m_titleVisible;
+}
+
+/*!
+ * \property QAbstract3DAxis::titleFixed
+ *
+ * If \c{true}, axis titles in the primary graph view will be rotated towards the camera similarly
+ * to the axis labels.
+ * If \c{false}, axis titles are only rotated around their axis but are not otherwise oriented
+ * towards the camera.
+ * This property doesn't have any effect if labelAutoRotation property value is zero.
+ * Default value is \c{true}.
+ *
+ * \sa labelAutoRotation, title, titleVisible
+ */
+void QAbstract3DAxis::setTitleFixed(bool fixed)
+{
+    if (d_ptr->m_titleFixed != fixed) {
+        d_ptr->m_titleFixed = fixed;
+        emit titleFixedChanged(fixed);
+    }
+}
+
+bool QAbstract3DAxis::isTitleFixed() const
+{
+    return d_ptr->m_titleFixed;
+}
+
+/*!
  * \property QAbstract3DAxis::min
  *
  * Defines the minimum value on the axis.
@@ -302,7 +372,9 @@ QAbstract3DAxisPrivate::QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAx
       m_min(0.0f),
       m_max(10.0f),
       m_autoAdjust(true),
-      m_labelAutoRotation(0.0f)
+      m_labelAutoRotation(0.0f),
+      m_titleVisible(false),
+      m_titleFixed(true)
 {
 }
 
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index 286e87bd..a9f75550 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -41,6 +41,8 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DAxis : public QObject
     Q_PROPERTY(float max READ max WRITE setMax NOTIFY maxChanged)
     Q_PROPERTY(bool autoAdjustRange READ isAutoAdjustRange WRITE setAutoAdjustRange NOTIFY autoAdjustRangeChanged)
     Q_PROPERTY(float labelAutoRotation READ labelAutoRotation WRITE setLabelAutoRotation NOTIFY labelAutoRotationChanged REVISION 1)
+    Q_PROPERTY(bool titleVisible READ isTitleVisible WRITE setTitleVisible NOTIFY titleVisibilityChanged REVISION 1)
+    Q_PROPERTY(bool titleFixed READ isTitleFixed WRITE setTitleFixed NOTIFY titleFixedChanged REVISION 1)
 
 public:
     enum AxisOrientation {
@@ -85,6 +87,12 @@ public:
     void setLabelAutoRotation(float angle);
     float labelAutoRotation() const;
 
+    void setTitleVisible(bool visible);
+    bool isTitleVisible() const;
+
+    void setTitleFixed(bool fixed);
+    bool isTitleFixed() const;
+
 signals:
     void titleChanged(const QString &newTitle);
     void labelsChanged();
@@ -94,6 +102,8 @@ signals:
     void rangeChanged(float min, float max);
     void autoAdjustRangeChanged(bool autoAdjust);
     Q_REVISION(1) void labelAutoRotationChanged(float angle);
+    Q_REVISION(1) void titleVisibilityChanged(bool visible);
+    Q_REVISION(1) void titleFixedChanged(bool fixed);
 
 protected:
     QScopedPointer<QAbstract3DAxisPrivate> d_ptr;
diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h
index eea3593c..72e5b15d 100644
--- a/src/datavisualization/axis/qabstract3daxis_p.h
+++ b/src/datavisualization/axis/qabstract3daxis_p.h
@@ -68,6 +68,8 @@ protected:
     float m_max;
     bool m_autoAdjust;
     float m_labelAutoRotation;
+    bool m_titleVisible;
+    bool m_titleFixed;
 
     friend class QAbstract3DAxis;
     friend class QValue3DAxis;