1 files changed, 46 insertions, 0 deletions
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index 1edee53c..489f8da7 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -93,6 +93,12 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
+ * \qmlproperty string ItemModelScatterDataProxy::rotationRole
+ *
+ * Defines the rotation role for the mapping.
+ */
+
+/*!
  * Constructs QItemModelScatterDataProxy with optional \a parent.
  */
 QItemModelScatterDataProxy::QItemModelScatterDataProxy(QObject *parent)
@@ -134,6 +140,28 @@ QItemModelScatterDataProxy::QItemModelScatterDataProxy(const QAbstractItemModel
 }
 
 /*!
+ * Constructs QItemModelScatterDataProxy with \a itemModel and optional \a parent. Proxy doesn't take
+ * ownership of the \a itemModel, as typically item models are owned by other controls.
+ * The xPosRole property is set to \a xPosRole, yPosRole property to \a yPosRole, zPosRole property
+ * to \a zPosRole, and rotationRole property to \a rotationRole.
+ */
+QItemModelScatterDataProxy::QItemModelScatterDataProxy(const QAbstractItemModel *itemModel,
+                                                       const QString &xPosRole,
+                                                       const QString &yPosRole,
+                                                       const QString &zPosRole,
+                                                       const QString &rotationRole,
+                                                       QObject *parent)
+    : QScatterDataProxy(new QItemModelScatterDataProxyPrivate(this), parent)
+{
+    dptr()->m_itemModelHandler->setItemModel(itemModel);
+    dptr()->m_xPosRole = xPosRole;
+    dptr()->m_yPosRole = yPosRole;
+    dptr()->m_zPosRole = zPosRole;
+    dptr()->m_rotationRole = rotationRole;
+    dptr()->connectItemModelHandler();
+}
+
+/*!
  * Destroys QItemModelScatterDataProxy.
  */
 QItemModelScatterDataProxy::~QItemModelScatterDataProxy()
@@ -211,6 +239,24 @@ QString QItemModelScatterDataProxy::zPosRole() const
 }
 
 /*!
+ * \property QItemModelScatterDataProxy::rotationRole
+ *
+ * Defines the rotation role for the mapping.
+ */
+void QItemModelScatterDataProxy::setRotationRole(const QString &role)
+{
+    if (dptr()->m_rotationRole != role) {
+        dptr()->m_rotationRole = role;
+        emit rotationRoleChanged(role);
+    }
+}
+
+QString QItemModelScatterDataProxy::rotationRole() const
+{
+    return dptrc()->m_rotationRole;
+}
+
+/*!
  * Changes \a xPosRole, \a yPosRole and \a zPosRole mapping.
  */
 void QItemModelScatterDataProxy::remap(const QString &xPosRole, const QString &yPosRole,