diff options
Diffstat (limited to 'src/datavisualization/data/qabstract3dseries.h')
| -rw-r--r-- | src/datavisualization/data/qabstract3dseries.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index c45bb801..b0396126 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -23,7 +23,7 @@ #include <QObject> #include <QScopedPointer> #include <QLinearGradient> -#include <QQuaternion> +#include <QVector3D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -39,7 +39,8 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibilityChanged) Q_PROPERTY(Mesh mesh READ mesh WRITE setMesh NOTIFY meshChanged) Q_PROPERTY(bool meshSmooth READ isMeshSmooth WRITE setMeshSmooth NOTIFY meshSmoothChanged) - Q_PROPERTY(QQuaternion meshRotation READ meshRotation WRITE setMeshRotation NOTIFY meshRotationChanged) + Q_PROPERTY(QVector3D meshRotationAxis READ meshRotationAxis WRITE setMeshRotationAxis NOTIFY meshRotationAxisChanged) + Q_PROPERTY(float meshRotationAngle READ meshRotationAngle WRITE setMeshRotationAngle NOTIFY meshRotationAngleChanged) Q_PROPERTY(QString userDefinedMesh READ userDefinedMesh WRITE setUserDefinedMesh NOTIFY userDefinedMeshChanged) Q_PROPERTY(QtDataVisualization::Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged) Q_PROPERTY(QColor baseColor READ baseColor WRITE setBaseColor NOTIFY baseColorChanged) @@ -93,8 +94,10 @@ public: void setMeshSmooth(bool enable); bool isMeshSmooth() const; - void setMeshRotation(const QQuaternion &rotation); - QQuaternion meshRotation() const; + void setMeshRotationAxis(const QVector3D &axis); + QVector3D meshRotationAxis() const; + void setMeshRotationAngle(float angle); + float meshRotationAngle() const; void setUserDefinedMesh(const QString &fileName); QString userDefinedMesh() const; @@ -122,7 +125,8 @@ signals: void visibilityChanged(bool visible); void meshChanged(Mesh mesh); void meshSmoothChanged(bool enabled); - void meshRotationChanged(QQuaternion rotation); + void meshRotationAxisChanged(QVector3D axis); + void meshRotationAngleChanged(float angle); void userDefinedMeshChanged(QString fileName); void colorStyleChanged(Q3DTheme::ColorStyle style); void baseColorChanged(QColor color); |