Docs update: model mappings

Task-number: QTRD-2133

Change-Id: I557bcf5829d1869bd500513ddf7bf5edd1a1d457
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

8 files changed, 210 insertions, 61 deletions

diff --git a/src/datavis3d/data/qitemmodelbardatamapping.cpp b/src/datavis3d/data/qitemmodelbardatamapping.cpp
index 0aecb082..e549d2d3 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.cpp
+++ b/src/datavis3d/data/qitemmodelbardatamapping.cpp
@@ -20,12 +20,32 @@
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
+/*!
+ * \class QItemModelBarDataMapping
+ * \inmodule QtDataVis3D
+ * \brief Data model mapping for Q3DBars.
+ * \since 1.0.0
+ *
+ * QItemModelBarDataMapping is used to define roles for mapping data in QAbstractItemModel to
+ * Q3DBars.
+ *
+ * TO BE CHECKED (add more explanations and/or example)
+ *
+ * \sa QItemModelBarDataProxy
+ */
+
+/*!
+ * Constructs QItemModelBarDataMapping.
+ */
 QItemModelBarDataMapping::QItemModelBarDataMapping()
     : QObject(0),
       d_ptr(new QItemModelBarDataMappingPrivate(this))
 {
 }
 
+/*!
+ * Constructs a copy of \a other.
+ */
 QItemModelBarDataMapping::QItemModelBarDataMapping(const QItemModelBarDataMapping &other)
     : QObject(0),
       d_ptr(new QItemModelBarDataMappingPrivate(this))
@@ -33,6 +53,9 @@ QItemModelBarDataMapping::QItemModelBarDataMapping(const QItemModelBarDataMappin
     operator=(other);
 }
 
+/*!
+ * Constructs QItemModelBarDataMapping with \a valueRole.
+ */
 QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &valueRole)
     : QObject(0),
       d_ptr(new QItemModelBarDataMappingPrivate(this))
@@ -40,6 +63,10 @@ QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &valueRole)
     d_ptr->m_valueRole = valueRole;
 }
 
+/*!
+ * Constructs QItemModelBarDataMapping with \a rowRole, \a columnRole, \a valueRole,
+ * \a rowCategories and \a columnCategories.
+ */
 QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &rowRole,
                                                    const QString &columnRole,
                                                    const QString &valueRole,
@@ -55,10 +82,16 @@ QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &rowRole,
     d_ptr->m_columnCategories = columnCategories;
 }
 
+/*!
+ * Destroys QItemModelBarDataMapping.
+ */
 QItemModelBarDataMapping::~QItemModelBarDataMapping()
 {
 }
 
+/*!
+ *  Assigns a copy of \a other to this object.
+ */
 QItemModelBarDataMapping &QItemModelBarDataMapping::operator=(const QItemModelBarDataMapping &other)
 {
     d_ptr->m_rowRole = other.d_ptr->m_rowRole;
@@ -70,6 +103,11 @@ QItemModelBarDataMapping &QItemModelBarDataMapping::operator=(const QItemModelBa
     return *this;
 }
 
+/*!
+ * \property QItemModelBarDataMapping::rowRole
+ *
+ * Defines the row role for the mapping.
+ */
 void QItemModelBarDataMapping::setRowRole(const QString &role)
 {
     d_ptr->m_rowRole = role;
@@ -81,6 +119,11 @@ QString QItemModelBarDataMapping::rowRole() const
     return d_ptr->m_rowRole;
 }
 
+/*!
+ * \property QItemModelBarDataMapping::columnRole
+ *
+ * Defines the column role for the mapping.
+ */
 void QItemModelBarDataMapping::setColumnRole(const QString &role)
 {
     d_ptr->m_columnRole = role;
@@ -92,6 +135,11 @@ QString QItemModelBarDataMapping::columnRole() const
     return d_ptr->m_columnRole;
 }
 
+/*!
+ * \property QItemModelBarDataMapping::valueRole
+ *
+ * Defines the value role for the mapping.
+ */
 void QItemModelBarDataMapping::setValueRole(const QString &role)
 {
     d_ptr->m_valueRole = role;
@@ -103,6 +151,11 @@ QString QItemModelBarDataMapping::valueRole() const
     return d_ptr->m_valueRole;
 }
 
+/*!
+ * \property QItemModelBarDataMapping::rowCategories
+ *
+ * Defines the row categories for the mapping.
+ */
 void QItemModelBarDataMapping::setRowCategories(const QStringList &categories)
 {
     d_ptr->m_rowCategories = categories;
@@ -114,6 +167,11 @@ const QStringList &QItemModelBarDataMapping::rowCategories() const
     return d_ptr->m_rowCategories;
 }
 
+/*!
+ * \property QItemModelBarDataMapping::columnCategories
+ *
+ * Defines the column categories for the mapping.
+ */
 void QItemModelBarDataMapping::setColumnCategories(const QStringList &categories)
 {
     d_ptr->m_columnCategories = categories;
@@ -125,6 +183,12 @@ const QStringList &QItemModelBarDataMapping::columnCategories() const
     return d_ptr->m_columnCategories;
 }
 
+/*!
+ * Changes \a rowRole, \a columnRole, \a valueRole, \a rowCategories and \a columnCategories to the
+ * mapping.
+ *
+ * Emits mappingChanged() signal after remapping.
+ */
 void QItemModelBarDataMapping::remap(const QString &rowRole,
                                      const QString &columnRole,
                                      const QString &valueRole,
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h
index d9f74152..424a9c30 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.h
+++ b/src/datavis3d/data/qitemmodelbardatamapping.h
@@ -29,11 +29,11 @@ class QItemModelBarDataMappingPrivate;
 class QT_DATAVIS3D_EXPORT QItemModelBarDataMapping : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole)
-    Q_PROPERTY(QString columnRole READ columnRole WRITE setColumnRole)
-    Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole)
-    Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories)
-    Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories)
+    Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString columnRole READ columnRole WRITE setColumnRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged)
+    Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories NOTIFY mappingChanged)
+    Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories NOTIFY mappingChanged)
 public:
     explicit QItemModelBarDataMapping();
     QItemModelBarDataMapping(const QItemModelBarDataMapping &other);
diff --git a/src/datavis3d/data/qitemmodelmapdatamapping.cpp b/src/datavis3d/data/qitemmodelmapdatamapping.cpp
index a59be94b..fab2a87a 100644
--- a/src/datavis3d/data/qitemmodelmapdatamapping.cpp
+++ b/src/datavis3d/data/qitemmodelmapdatamapping.cpp
@@ -20,12 +20,32 @@
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
+/*!
+ * \class QItemModelMapDataMapping
+ * \inmodule QtDataVis3D
+ * \brief Data model mapping for Q3DMaps.
+ * \since 1.0.0
+ *
+ * QItemModelMapDataMapping is used to define roles for mapping data in QAbstractItemModel to
+ * Q3DMaps.
+ *
+ * TO BE CHECKED (add more explanations and/or example)
+ *
+ * \sa QItemModelMapDataProxy
+ */
+
+/*!
+ * Constructs QItemModelMapDataMapping.
+ */
 QItemModelMapDataMapping::QItemModelMapDataMapping()
     : QObject(0),
       d_ptr(new QItemModelMapDataMappingPrivate(this))
 {
 }
 
+/*!
+ * Constructs a copy of \a other.
+ */
 QItemModelMapDataMapping::QItemModelMapDataMapping(const QItemModelMapDataMapping &other)
     : QObject(0),
       d_ptr(new QItemModelMapDataMappingPrivate(this))
@@ -33,31 +53,48 @@ QItemModelMapDataMapping::QItemModelMapDataMapping(const QItemModelMapDataMappin
     operator=(other);
 }
 
-QItemModelMapDataMapping::QItemModelMapDataMapping(const QString &labelRole, const QString &xPosRole,
-                                                   const QString &yPosRole, const QString &valueRole)
+/*!
+ * Constructs QItemModelMapDataMapping with \a labelRole, \a xPosRole, \a zPosRole and
+ * \a valueRole.
+ */
+QItemModelMapDataMapping::QItemModelMapDataMapping(const QString &labelRole,
+                                                   const QString &xPosRole,
+                                                   const QString &zPosRole,
+                                                   const QString &valueRole)
     : QObject(0),
       d_ptr(new QItemModelMapDataMappingPrivate(this))
 {
     d_ptr->m_labelRole = labelRole;
     d_ptr->m_xPosRole = xPosRole;
-    d_ptr->m_yPosRole = yPosRole;
+    d_ptr->m_zPosRole = zPosRole;
     d_ptr->m_valueRole = valueRole;
 }
 
+/*!
+ * Destroys QItemModelMapDataMapping.
+ */
 QItemModelMapDataMapping::~QItemModelMapDataMapping()
 {
 }
 
+/*!
+ *  Assigns a copy of \a other to this object.
+ */
 QItemModelMapDataMapping &QItemModelMapDataMapping::operator=(const QItemModelMapDataMapping &other)
 {
     d_ptr->m_labelRole = other.d_ptr->m_labelRole;
     d_ptr->m_xPosRole = other.d_ptr->m_xPosRole;
-    d_ptr->m_yPosRole = other.d_ptr->m_yPosRole;
+    d_ptr->m_zPosRole = other.d_ptr->m_zPosRole;
     d_ptr->m_valueRole = other.d_ptr->m_valueRole;
 
     return *this;
 }
 
+/*!
+ * \property QItemModelMapDataMapping::labelRole
+ *
+ * Defines the label role for the mapping.
+ */
 void QItemModelMapDataMapping::setLabelRole(const QString &role)
 {
     d_ptr->m_labelRole = role;
@@ -69,6 +106,11 @@ QString QItemModelMapDataMapping::labelRole() const
     return d_ptr->m_labelRole;
 }
 
+/*!
+ * \property QItemModelMapDataMapping::xPosRole
+ *
+ * Defines the x position role for the mapping.
+ */
 void QItemModelMapDataMapping::setXPosRole(const QString &role)
 {
     d_ptr->m_xPosRole = role;
@@ -80,17 +122,27 @@ QString QItemModelMapDataMapping::xPosRole() const
     return d_ptr->m_xPosRole;
 }
 
-void QItemModelMapDataMapping::setYPosRole(const QString &role)
+/*!
+ * \property QItemModelMapDataMapping::zPosRole
+ *
+ * Defines the z position role for the mapping.
+ */
+void QItemModelMapDataMapping::setZPosRole(const QString &role)
 {
-    d_ptr->m_yPosRole = role;
+    d_ptr->m_zPosRole = role;
     emit mappingChanged();
 }
 
-QString QItemModelMapDataMapping::yPosRole() const
+QString QItemModelMapDataMapping::zPosRole() const
 {
-    return d_ptr->m_yPosRole;
+    return d_ptr->m_zPosRole;
 }
 
+/*!
+ * \property QItemModelMapDataMapping::valueRole
+ *
+ * Defines the value role for the mapping.
+ */
 void QItemModelMapDataMapping::setValueRole(const QString &role)
 {
     d_ptr->m_valueRole = role;
@@ -103,12 +155,17 @@ QString QItemModelMapDataMapping::valueRole() const
 }
 
 
+/*!
+ * Changes \a labelRole, \a xPosRole, \a zPosRole and \a valueRole to the mapping.
+ *
+ * Emits mappingChanged() signal after remapping.
+ */
 void QItemModelMapDataMapping::remap(const QString &labelRole, const QString &xPosRole,
-                                     const QString &yPosRole, const QString &valueRole)
+                                     const QString &zPosRole, const QString &valueRole)
 {
     d_ptr->m_labelRole = labelRole;
     d_ptr->m_xPosRole = xPosRole;
-    d_ptr->m_yPosRole = yPosRole;
+    d_ptr->m_zPosRole = zPosRole;
     d_ptr->m_valueRole = valueRole;
 
     emit mappingChanged();
diff --git a/src/datavis3d/data/qitemmodelmapdatamapping.h b/src/datavis3d/data/qitemmodelmapdatamapping.h
index 79080a65..5155f2b6 100644
--- a/src/datavis3d/data/qitemmodelmapdatamapping.h
+++ b/src/datavis3d/data/qitemmodelmapdatamapping.h
@@ -29,15 +29,15 @@ class QItemModelMapDataMappingPrivate;
 class QT_DATAVIS3D_EXPORT QItemModelMapDataMapping : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString labelRole READ labelRole WRITE setLabelRole)
-    Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole)
-    Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole)
-    Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole)
+    Q_PROPERTY(QString labelRole READ labelRole WRITE setLabelRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged)
 public:
     explicit QItemModelMapDataMapping();
     QItemModelMapDataMapping(const QItemModelMapDataMapping &other);
     QItemModelMapDataMapping(const QString &labelRole, const QString &xPosRole,
-                             const QString &yPosRole, const QString &valueRole);
+                             const QString &zPosRole, const QString &valueRole);
     virtual ~QItemModelMapDataMapping();
 
     QItemModelMapDataMapping &operator=(const QItemModelMapDataMapping &other);
@@ -46,13 +46,13 @@ public:
     QString labelRole() const;
     void setXPosRole(const QString &role);
     QString xPosRole() const;
-    void setYPosRole(const QString &role);
-    QString yPosRole() const;
+    void setZPosRole(const QString &role);
+    QString zPosRole() const;
     void setValueRole(const QString &role);
     QString valueRole() const;
 
     void remap(const QString &labelRole, const QString &xPosRole,
-               const QString &yPosRole, const QString &valueRole);
+               const QString &zPosRole, const QString &valueRole);
 signals:
     void mappingChanged();
 
diff --git a/src/datavis3d/data/qitemmodelmapdatamapping_p.h b/src/datavis3d/data/qitemmodelmapdatamapping_p.h
index 99618942..c289f565 100644
--- a/src/datavis3d/data/qitemmodelmapdatamapping_p.h
+++ b/src/datavis3d/data/qitemmodelmapdatamapping_p.h
@@ -43,7 +43,7 @@ public:
 private:
     QString m_labelRole;
     QString m_xPosRole;
-    QString m_yPosRole;
+    QString m_zPosRole;
     QString m_valueRole;
 
     QItemModelMapDataMapping *q_ptr;
diff --git a/src/datavis3d/data/qitemmodelmapdataproxy.cpp b/src/datavis3d/data/qitemmodelmapdataproxy.cpp
index f9ebd6c7..a222a68f 100644
--- a/src/datavis3d/data/qitemmodelmapdataproxy.cpp
+++ b/src/datavis3d/data/qitemmodelmapdataproxy.cpp
@@ -263,7 +263,7 @@ void QItemModelMapDataProxyPrivate::resolveModel()
     QHash<int, QByteArray> roleHash = m_itemModel->roleNames();
     const int labelRole = roleHash.key(m_mapping->labelRole().toLatin1(), noRoleIndex);
     const int xPosRole = roleHash.key(m_mapping->xPosRole().toLatin1(), noRoleIndex);
-    const int yPosRole = roleHash.key(m_mapping->yPosRole().toLatin1(), noRoleIndex);
+    const int zPosRole = roleHash.key(m_mapping->zPosRole().toLatin1(), noRoleIndex);
     // Default valueRole to display role if no mapping
     const int valueRole = roleHash.key(m_mapping->valueRole().toLatin1(), Qt::DisplayRole);
     const int columnCount = m_itemModel->columnCount();
@@ -282,8 +282,8 @@ void QItemModelMapDataProxyPrivate::resolveModel()
             qreal yPos(qreal(0.0));
             if (xPosRole != noRoleIndex)
                 xPos = index.data(xPosRole).toReal();
-            if (yPosRole != noRoleIndex)
-                yPos = index.data(yPosRole).toReal();
+            if (zPosRole != noRoleIndex)
+                yPos = index.data(zPosRole).toReal(); // z position is mapped to y of QPoint
             (*newProxyArray)[runningCount].setMapPosition(QPointF(xPos, yPos));
             (*newProxyArray)[runningCount].setValue(index.data(valueRole).toReal());
             runningCount++;
diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.cpp b/src/datavis3d/data/qitemmodelscatterdatamapping.cpp
index 0b430b79..7eac2362 100644
--- a/src/datavis3d/data/qitemmodelscatterdatamapping.cpp
+++ b/src/datavis3d/data/qitemmodelscatterdatamapping.cpp
@@ -20,12 +20,32 @@
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
+/*!
+ * \class QItemModelScatterDataMapping
+ * \inmodule QtDataVis3D
+ * \brief Data model mapping for Q3DScatter.
+ * \since 1.0.0
+ *
+ * QItemModelScatterDataMapping is used to define roles for mapping data in QAbstractItemModel to
+ * Q3DScatter.
+ *
+ * TO BE CHECKED (add more explanations and/or example)
+ *
+ * \sa QItemModelScatterDataProxy
+ */
+
+/*!
+ * Constructs QItemModelScatterDataMapping.
+ */
 QItemModelScatterDataMapping::QItemModelScatterDataMapping()
     : QObject(0),
       d_ptr(new QItemModelScatterDataMappingPrivate(this))
 {
 }
 
+/*!
+ * Constructs a copy of \a other.
+ */
 QItemModelScatterDataMapping::QItemModelScatterDataMapping(
         const QItemModelScatterDataMapping &other)
     : QObject(0),
@@ -34,31 +54,37 @@ QItemModelScatterDataMapping::QItemModelScatterDataMapping(
     operator=(other);
 }
 
-QItemModelScatterDataMapping::QItemModelScatterDataMapping(const QString &labelRole,
-                                                           const QString &xPosRole,
+/*!
+ * Constructs QItemModelScatterDataMapping with \a xPosRole, \a yPosRole, \a zPosRole and
+ * \a valueRole.
+ */
+QItemModelScatterDataMapping::QItemModelScatterDataMapping(const QString &xPosRole,
                                                            const QString &yPosRole,
                                                            const QString &zPosRole,
                                                            const QString &valueRole)
     : QObject(0),
       d_ptr(new QItemModelScatterDataMappingPrivate(this))
 {
-    Q_UNUSED(labelRole);
     Q_UNUSED(valueRole);
-    //d_ptr->m_labelRole = labelRole;
     d_ptr->m_xPosRole = xPosRole;
     d_ptr->m_yPosRole = yPosRole;
     d_ptr->m_zPosRole = zPosRole;
     //d_ptr->m_valueRole = valueRole;
 }
 
+/*!
+ * Destroys QItemModelScatterDataMapping.
+ */
 QItemModelScatterDataMapping::~QItemModelScatterDataMapping()
 {
 }
 
+/*!
+ *  Assigns a copy of \a other to this object.
+ */
 QItemModelScatterDataMapping &QItemModelScatterDataMapping::operator=(
         const QItemModelScatterDataMapping &other)
 {
-    //d_ptr->m_labelRole = other.d_ptr->m_labelRole;
     d_ptr->m_xPosRole = other.d_ptr->m_xPosRole;
     d_ptr->m_yPosRole = other.d_ptr->m_yPosRole;
     d_ptr->m_zPosRole = other.d_ptr->m_zPosRole;
@@ -67,17 +93,11 @@ QItemModelScatterDataMapping &QItemModelScatterDataMapping::operator=(
     return *this;
 }
 
-//void QItemModelScatterDataMapping::setLabelRole(const QString &role)
-//{
-//    d_ptr->m_labelRole = role;
-//    emit mappingChanged();
-//}
-
-//QString QItemModelScatterDataMapping::labelRole() const
-//{
-//    return d_ptr->m_labelRole;
-//}
-
+/*!
+ * \property QItemModelScatterDataMapping::xPosRole
+ *
+ * Defines the x position role for the mapping.
+ */
 void QItemModelScatterDataMapping::setXPosRole(const QString &role)
 {
     d_ptr->m_xPosRole = role;
@@ -89,6 +109,11 @@ QString QItemModelScatterDataMapping::xPosRole() const
     return d_ptr->m_xPosRole;
 }
 
+/*!
+ * \property QItemModelScatterDataMapping::yPosRole
+ *
+ * Defines the y position role for the mapping.
+ */
 void QItemModelScatterDataMapping::setYPosRole(const QString &role)
 {
     d_ptr->m_yPosRole = role;
@@ -100,6 +125,11 @@ QString QItemModelScatterDataMapping::yPosRole() const
     return d_ptr->m_yPosRole;
 }
 
+/*!
+ * \property QItemModelScatterDataMapping::zPosRole
+ *
+ * Defines the z position role for the mapping.
+ */
 void QItemModelScatterDataMapping::setZPosRole(const QString &role)
 {
     d_ptr->m_zPosRole = role;
@@ -122,13 +152,15 @@ QString QItemModelScatterDataMapping::zPosRole() const
 //    return d_ptr->m_valueRole;
 //}
 
-void QItemModelScatterDataMapping::remap(const QString &labelRole, const QString &xPosRole,
-                                         const QString &yPosRole, const QString &zPosRole,
-                                         const QString &valueRole)
+/*!
+ * Changes \a xPosRole, \a yPosRole, \a zPosRole and \a valueRole to the mapping.
+ *
+ * Emits mappingChanged() signal after remapping.
+ */
+void QItemModelScatterDataMapping::remap(const QString &xPosRole, const QString &yPosRole,
+                                         const QString &zPosRole, const QString &valueRole)
 {
-    Q_UNUSED(labelRole);
     Q_UNUSED(valueRole);
-    //d_ptr->m_labelRole = labelRole;
     d_ptr->m_xPosRole = xPosRole;
     d_ptr->m_yPosRole = yPosRole;
     d_ptr->m_zPosRole = zPosRole;
diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.h b/src/datavis3d/data/qitemmodelscatterdatamapping.h
index f4a2cfe6..43a65c8d 100644
--- a/src/datavis3d/data/qitemmodelscatterdatamapping.h
+++ b/src/datavis3d/data/qitemmodelscatterdatamapping.h
@@ -29,34 +29,31 @@ class QItemModelScatterDataMappingPrivate;
 class QT_DATAVIS3D_EXPORT QItemModelScatterDataMapping : public QObject
 {
     Q_OBJECT
-    //Q_PROPERTY(QString labelRole READ labelRole WRITE setLabelRole)
-    Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole)
-    Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole)
-    Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole)
-    //Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole)
+    Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY mappingChanged)
+    Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY mappingChanged)
+    //Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged)
 public:
     explicit QItemModelScatterDataMapping();
     QItemModelScatterDataMapping(const QItemModelScatterDataMapping &other);
-    QItemModelScatterDataMapping(const QString &labelRole, const QString &xPosRole,
-                                 const QString &yPosRole, const QString &zPosRole,
-                                 const QString &valueRole);
+    QItemModelScatterDataMapping(const QString &xPosRole, const QString &yPosRole,
+                                  const QString &zPosRole, const QString &valueRole);
     virtual ~QItemModelScatterDataMapping();
 
     QItemModelScatterDataMapping &operator=(const QItemModelScatterDataMapping &other);
 
-    //void setLabelRole(const QString &role);
-    //QString labelRole() const;
     void setXPosRole(const QString &role);
     QString xPosRole() const;
     void setYPosRole(const QString &role);
     QString yPosRole() const;
     void setZPosRole(const QString &role);
     QString zPosRole() const;
+    // TODO: This is a placeholder for scatter item size
     //void setValueRole(const QString &role);
     //QString valueRole() const;
 
-    void remap(const QString &labelRole, const QString &xPosRole,
-               const QString &yPosRole, const QString &zPosRole, const QString &valueRole);
+    void remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole,
+               const QString &valueRole);
 signals:
     void mappingChanged();
 
@@ -64,7 +61,6 @@ private:
     QScopedPointer<QItemModelScatterDataMappingPrivate> d_ptr;
 };
 
-
 QT_DATAVIS3D_END_NAMESPACE
 
 #endif