Integrated item model mappings to item model proxies

Separate mapping object was redundant.

Task-number: QTRD-2564
Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 26 insertions, 11 deletions

diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index 891950c1..7c63ce2a 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -20,7 +20,6 @@
 #define QITEMMODELSCATTERDATAPROXY_H
 
 #include <QtDataVisualization/qscatterdataproxy.h>
-#include <QtDataVisualization/qitemmodelscatterdatamapping.h>
 #include <QAbstractItemModel>
 #include <QStringList>
 
@@ -31,30 +30,46 @@ class QItemModelScatterDataProxyPrivate;
 class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy
 {
     Q_OBJECT
-    Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel)
-    Q_PROPERTY(QItemModelScatterDataMapping* activeMapping READ activeMapping WRITE setActiveMapping)
+    Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged)
+    Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole NOTIFY xPosRoleChanged)
+    Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY yPosRoleChanged)
+    Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY zPosRoleChanged)
 
 public:
-    explicit QItemModelScatterDataProxy();
-    explicit QItemModelScatterDataProxy(const QAbstractItemModel *itemModel,
-                                        QItemModelScatterDataMapping *mapping);
+    explicit QItemModelScatterDataProxy(QObject *parent = 0);
+    QItemModelScatterDataProxy(const QAbstractItemModel *itemModel, QObject *parent = 0);
+    QItemModelScatterDataProxy(const QAbstractItemModel *itemModel,
+                               const QString &xPosRole, const QString &yPosRole,
+                               const QString &zPosRole, QObject *parent = 0);
     virtual ~QItemModelScatterDataProxy();
 
     void setItemModel(const QAbstractItemModel *itemModel);
     const QAbstractItemModel *itemModel() const;
 
-    void setActiveMapping(QItemModelScatterDataMapping *mapping);
-    QItemModelScatterDataMapping *activeMapping() const;
-    void addMapping(QItemModelScatterDataMapping *mapping);
-    void releaseMapping(QItemModelScatterDataMapping *mapping);
-    QList<QItemModelScatterDataMapping *> mappings() 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 remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole);
+
+signals:
+    void itemModelChanged(const QAbstractItemModel* itemModel);
+    void xPosRoleChanged(QString role);
+    void yPosRoleChanged(QString role);
+    void zPosRoleChanged(QString role);
 
 protected:
     QItemModelScatterDataProxyPrivate *dptr();
     const QItemModelScatterDataProxyPrivate *dptrc() const;
 
 private:
+    void connectItemModelHandler();
     Q_DISABLE_COPY(QItemModelScatterDataProxy)
+
+    friend class ScatterItemModelHandler;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE