Merge remote-tracking branch 'origin/develop'

Change-Id: I3b63e58db8a5555ada270f81f88fa3b04cecada9

1 files changed, 93 insertions, 0 deletions

diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
new file mode 100644
index 00000000..cc16e770
--- /dev/null
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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 QtDataVisualization 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
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QtDataVisualization API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+#ifndef DECLARATIVESCATTER_P_H
+#define DECLARATIVESCATTER_P_H
+
+#include "datavisualizationglobal_p.h"
+#include "abstractdeclarative_p.h"
+#include "scatter3dcontroller_p.h"
+#include "declarativescatter_p.h"
+#include "q3dvalueaxis.h"
+#include "qscatterdataproxy.h"
+
+#include <QAbstractItemModel>
+#include <QQuickItem>
+#include <QObject>
+
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+
+class DeclarativeScatter : public AbstractDeclarative
+{
+    Q_OBJECT
+    Q_PROPERTY(QScatterDataProxy *dataProxy READ dataProxy WRITE setDataProxy)
+    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX)
+    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY)
+    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ)
+    Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType)
+    Q_PROPERTY(bool objectSmoothingEnabled READ isObjectSmoothingEnabled WRITE setObjectSmoothingEnabled)
+    Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
+    Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
+    Q_ENUMS(QtDataVisualization::QDataVis::MeshStyle)
+
+public:
+    explicit DeclarativeScatter(QQuickItem *parent = 0);
+    ~DeclarativeScatter();
+
+    Q_INVOKABLE void setObjectColor(const QColor &baseColor, bool uniform = true);
+
+    QScatterDataProxy *dataProxy() const;
+    void setDataProxy(QScatterDataProxy *dataProxy);
+
+    Q3DValueAxis *axisX() const;
+    void setAxisX(Q3DValueAxis *axis);
+    Q3DValueAxis *axisY() const;
+    void setAxisY(Q3DValueAxis *axis);
+    Q3DValueAxis *axisZ() const;
+    void setAxisZ(Q3DValueAxis *axis);
+
+    void setObjectType(QDataVis::MeshStyle style);
+    QDataVis::MeshStyle objectType() const;
+
+    void setObjectSmoothingEnabled(bool enabled);
+    bool isObjectSmoothingEnabled() const;
+
+    void setMeshFileName(const QString &objFileName);
+    QString meshFileName() const;
+
+protected:
+    Scatter3DController *m_shared;
+    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
+
+private:
+    QSize m_initialisedSize;
+};
+
+QT_DATAVISUALIZATION_END_NAMESPACE
+
+#endif