Change rotations to use angle and vector in APIs

Quaternions are pain in the behind to use, especially
in QML, so change them to angle + vector combinations.

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

1 files changed, 12 insertions, 6 deletions

diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index accfeb18..ec2deee2 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -34,7 +34,8 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa
     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)
-    Q_PROPERTY(QString rotationRole READ rotationRole WRITE setRotationRole NOTIFY rotationRoleChanged)
+    Q_PROPERTY(QString rotationAxisRole READ rotationAxisRole WRITE setRotationAxisRole NOTIFY rotationAxisRoleChanged)
+    Q_PROPERTY(QString rotationAngleRole READ rotationAngleRole WRITE setRotationAngleRole NOTIFY rotationAngleRoleChanged)
 
 public:
     explicit QItemModelScatterDataProxy(QObject *parent = 0);
@@ -44,7 +45,8 @@ public:
                                const QString &zPosRole, QObject *parent = 0);
     QItemModelScatterDataProxy(const QAbstractItemModel *itemModel,
                                const QString &xPosRole, const QString &yPosRole,
-                               const QString &zPosRole, const QString &rotationRole,
+                               const QString &zPosRole, const QString &rotationAxisRole,
+                               const QString &rotationAngleRole,
                                QObject *parent = 0);
     virtual ~QItemModelScatterDataProxy();
 
@@ -57,17 +59,21 @@ public:
     QString yPosRole() const;
     void setZPosRole(const QString &role);
     QString zPosRole() const;
-    void setRotationRole(const QString &role);
-    QString rotationRole() const;
+    void setRotationAxisRole(const QString &role);
+    QString rotationAxisRole() const;
+    void setRotationAngleRole(const QString &role);
+    QString rotationAngleRole() const;
 
-    void remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole);
+    void remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole,
+               const QString &rotationAxis, const QString &rotationAngle);
 
 signals:
     void itemModelChanged(const QAbstractItemModel* itemModel);
     void xPosRoleChanged(QString role);
     void yPosRoleChanged(QString role);
     void zPosRoleChanged(QString role);
-    void rotationRoleChanged(QString role);
+    void rotationAxisRoleChanged(QString role);
+    void rotationAngleRoleChanged(QString role);
 
 protected:
     QItemModelScatterDataProxyPrivate *dptr();