Merge remote-tracking branch 'origin/develop'

Change-Id: I544af544ecd946cdcccfe9c17d03e47f8d0c1151

1 files changed, 60 insertions, 0 deletions

diff --git a/src/datavis3d/data/qitemmodelscatterdataproxy.h b/src/datavis3d/data/qitemmodelscatterdataproxy.h
new file mode 100644
index 00000000..f609e84b
--- /dev/null
+++ b/src/datavis3d/data/qitemmodelscatterdataproxy.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVis3D module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#ifndef QITEMMODELSCATTERDATAPROXY_H
+#define QITEMMODELSCATTERDATAPROXY_H
+
+#include <QtDataVis3D/qscatterdataproxy.h>
+#include <QtDataVis3D/qitemmodelscatterdatamapping.h>
+#include <QAbstractItemModel>
+#include <QStringList>
+
+QT_DATAVIS3D_BEGIN_NAMESPACE
+
+class QItemModelScatterDataProxyPrivate;
+
+class QT_DATAVIS3D_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy
+{
+    Q_OBJECT
+
+public:
+    explicit QItemModelScatterDataProxy();
+    explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
+                                        QItemModelScatterDataMapping *mapping);
+    virtual ~QItemModelScatterDataProxy();
+
+    // Doesn't gain ownership of the model, but does connect to it to listen for data changes.
+    void setItemModel(QAbstractItemModel *itemModel);
+    QAbstractItemModel *itemModel();
+
+    // Map scatter role (xPos, yPos, zPos) to role in model
+    // Doesn't gain ownership of mapping, but does connect to it to listen for mapping changes.
+    // Modifying mapping that is set to proxy will trigger dataset re-resolving.
+    void setMapping(QItemModelScatterDataMapping *mapping);
+    QItemModelScatterDataMapping *mapping();
+
+protected:
+    QItemModelScatterDataProxyPrivate *dptr();
+
+private:
+    Q_DISABLE_COPY(QItemModelScatterDataProxy)
+};
+
+QT_DATAVIS3D_END_NAMESPACE
+
+#endif