Merge branch 'develop' into mergebranch

Conflicts:
	examples/qmlbars/qml/qmlbars/main.qml
	examples/qmlscatter/qml/qmlscatter/main.qml
	examples/qmlsurface/qml/qmlsurface/main.qml
	src/datavisualization/data/qitemmodelbardatamapping.cpp
	src/datavisualization/data/qitemmodelscatterdatamapping.cpp
	src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
	src/datavisualization/engine/drawer.cpp

Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1

1 files changed, 60 insertions, 0 deletions

diff --git a/examples/custominput/scatterdatamodifier.h b/examples/custominput/scatterdatamodifier.h
new file mode 100644
index 00000000..fc0bc789
--- /dev/null
+++ b/examples/custominput/scatterdatamodifier.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 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
+**
+****************************************************************************/
+
+#ifndef SCATTERDATAMODIFIER_H
+#define SCATTERDATAMODIFIER_H
+
+#include "custominputhandler.h"
+
+#include <QtDataVisualization/q3dscatter.h>
+#include <QtGui/QFont>
+#include <QtCore/QTimer>
+#include <QPropertyAnimation>
+#include <QSequentialAnimationGroup>
+#include <QVector3D>
+
+using namespace QtDataVisualization;
+
+class ScatterDataModifier : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ScatterDataModifier(Q3DScatter *scatter);
+    ~ScatterDataModifier();
+
+    void addData();
+    void toggleCameraAnimation();
+    void start();
+
+public slots:
+    void changeShadowQuality(int quality);
+    void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+    void triggerSelection();
+
+signals:
+    void shadowQualityChanged(int quality);
+
+private:
+    Q3DScatter *m_graph;
+    QPropertyAnimation *m_animationCameraX;
+    QSequentialAnimationGroup *m_animationCameraY;
+    CustomInputHandler *m_inputHandler;
+    QTimer *m_selectionTimer;
+};
+
+#endif