1 files changed, 58 insertions, 0 deletions
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index 1440476b..25ff505f 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -18,6 +18,7 @@
 
 #include "qbar3dseries_p.h"
 #include "bars3dcontroller_p.h"
+#include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -114,6 +115,17 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
+ * \qmlproperty real Bar3DSeries::meshAngle
+ *
+ * A convenience property for defining the series rotation \a angle in degrees.
+ *
+ * \note: When reading this property, it is calculated from Abstract3DSeries::meshRotation value and
+ * always returns a value from zero to 360 degrees. It may also have small rounding errors.
+ *
+ * \sa Abstract3DSeries::meshRotation
+ */
+
+/*!
  * Constructs QBar3DSeries with the given \a parent.
  */
 QBar3DSeries::QBar3DSeries(QObject *parent) :
@@ -121,6 +133,7 @@ QBar3DSeries::QBar3DSeries(QObject *parent) :
 {
     // Default proxy
     dptr()->setDataProxy(new QBarDataProxy);
+    dptr()->connectSignals();
 }
 
 /*!
@@ -130,6 +143,7 @@ QBar3DSeries::QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent) :
     QAbstract3DSeries(new QBar3DSeriesPrivate(this), parent)
 {
     dptr()->setDataProxy(dataProxy);
+    dptr()->connectSignals();
 }
 
 /*!
@@ -138,6 +152,7 @@ QBar3DSeries::QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent) :
 QBar3DSeries::QBar3DSeries(QBar3DSeriesPrivate *d, QObject *parent) :
     QAbstract3DSeries(d, parent)
 {
+    dptr()->connectSignals();
 }
 
 /*!
@@ -204,6 +219,38 @@ QPoint QBar3DSeries::invalidSelectionPosition()
     return Bars3DController::invalidSelectionPosition();
 }
 
+static inline float quaternionAngle(const QQuaternion &rotation)
+{
+    return qAcos(rotation.scalar()) * 360.0f / M_PI;
+}
+
+/*!
+ * \property QBar3DSeries::meshAngle
+ *
+ * A convenience property for defining the series rotation \a angle in degrees.
+ * Setting this property is equivalent to the following call:
+ * \code setMeshRotation(QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, angle)) \endcode
+ *
+ * \note: When reading this property, it is calculated from QAbstract3DSeries::meshRotation value
+ * and always returns a value from zero to 360 degrees. It may also have small rounding errors.
+ *
+ * \sa QAbstract3DSeries::meshRotation
+ */
+void QBar3DSeries::setMeshAngle(float angle)
+{
+    setMeshRotation(QQuaternion::fromAxisAndAngle(upVector, angle));
+}
+
+float QBar3DSeries::meshAngle() const
+{
+    QQuaternion rotation = meshRotation();
+
+    if (rotation.isIdentity() || rotation.x() != 0.0f || rotation.z() != 0.0f)
+        return 0.0f;
+    else
+        return quaternionAngle(rotation);
+}
+
 /*!
  * \internal
  */
@@ -279,6 +326,11 @@ void QBar3DSeriesPrivate::connectControllerAndProxy(Abstract3DController *newCon
     }
 }
 
+void QBar3DSeriesPrivate::handleMeshRotationChanged(const QQuaternion &rotation)
+{
+    emit qptr()->meshAngleChanged(quaternionAngle(rotation));
+}
+
 void QBar3DSeriesPrivate::setSelectedBar(const QPoint &position)
 {
     if (position != m_selectedBar) {
@@ -287,4 +339,10 @@ void QBar3DSeriesPrivate::setSelectedBar(const QPoint &position)
     }
 }
 
+void QBar3DSeriesPrivate::connectSignals()
+{
+    QObject::connect(q_ptr, &QAbstract3DSeries::meshRotationChanged, this,
+                     &QBar3DSeriesPrivate::handleMeshRotationChanged);
+}
+
 QT_END_NAMESPACE_DATAVISUALIZATION