From 06dd7be52f2bcd23b9a622a17d3d0e8963a7dd17 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Mon, 13 Jan 2014 14:51:10 +0200 Subject: Direction for scatter items Task-number: QTRD-2654 Change-Id: Ib21e6d75fa43de45387ad6225973aa8a11ffc0c9 Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qabstract3dseries.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/datavisualization/data/qabstract3dseries.h') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index ebe73510..b03b574d 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -67,6 +67,7 @@ public: MeshBevelCube, MeshSphere, MeshMinimal, + MeshArrow, MeshPoint }; -- cgit v1.2.3 From 2d31d2416643598b15664c766326f18c5b698c79 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 14 Jan 2014 10:08:28 +0200 Subject: Add series name property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Don't call updateScene for every render cycle +Fixed item label update when format or name changes +Misc cosmetic fixes Task-number: QTRD-2736 Task-number: QTRD-2571 Change-Id: I43aa6b8e3202b09529b17a22bb24d05fcb545609 Reviewed-by: Tomi Korpipää --- src/datavisualization/data/qabstract3dseries.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/datavisualization/data/qabstract3dseries.h') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index b03b574d..bbcf60ad 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -47,6 +47,7 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject Q_PROPERTY(QLinearGradient singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged) Q_PROPERTY(QColor multiHighlightColor READ multiHighlightColor WRITE setMultiHighlightColor NOTIFY multiHighlightColorChanged) Q_PROPERTY(QLinearGradient multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged) + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: enum SeriesType { @@ -109,6 +110,9 @@ public: void setMultiHighlightGradient(const QLinearGradient &gradient); QLinearGradient multiHighlightGradient() const; + void setName(const QString &name); + QString name() const; + signals: void itemLabelFormatChanged(QString format); void visibilityChanged(bool visible); @@ -122,6 +126,7 @@ signals: void singleHighlightGradientChanged(QLinearGradient gradient); void multiHighlightColorChanged(QColor color); void multiHighlightGradientChanged(QLinearGradient gradient); + void nameChanged(QString name); protected: QScopedPointer d_ptr; @@ -135,6 +140,7 @@ private: friend class Scatter3DController; friend class QBar3DSeries; friend class SeriesRenderCache; + friend class Abstract3DRenderer; }; QT_DATAVISUALIZATION_END_NAMESPACE -- cgit v1.2.3 From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 Jan 2014 11:34:59 +0200 Subject: Removed QDataVis and namespace macros - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qabstract3dseries.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/data/qabstract3dseries.h') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index bbcf60ad..615d882e 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -19,13 +19,12 @@ #ifndef QABSTRACT3DSERIES_H #define QABSTRACT3DSERIES_H -#include #include #include #include #include -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QAbstract3DSeriesPrivate; @@ -143,6 +142,6 @@ private: friend class Abstract3DRenderer; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif -- cgit v1.2.3 From 8674307d6bafabfcaedfe175b883313f0e7d88b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 13:33:57 +0200 Subject: Reintroduced namespace macros Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qabstract3dseries.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qabstract3dseries.h') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index 615d882e..df6dada8 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -24,7 +24,7 @@ #include #include -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DSeriesPrivate; @@ -142,6 +142,6 @@ private: friend class Abstract3DRenderer; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif -- cgit v1.2.3 From 71b501d31ae7c5d3aab987b54acccecce1136896 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 24 Jan 2014 13:45:18 +0200 Subject: Added series rotation and bar item rotation support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2654 Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f Reviewed-by: Tomi Korpipää --- src/datavisualization/data/qabstract3dseries.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/datavisualization/data/qabstract3dseries.h') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index df6dada8..5e7fe016 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -23,6 +23,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -38,6 +39,7 @@ 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(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) @@ -91,6 +93,9 @@ public: void setMeshSmooth(bool enable); bool isMeshSmooth() const; + void setMeshRotation(const QQuaternion &rotation); + QQuaternion meshRotation() const; + void setUserDefinedMesh(const QString &fileName); QString userDefinedMesh() const; @@ -117,6 +122,7 @@ signals: void visibilityChanged(bool visible); void meshChanged(Mesh mesh); void meshSmoothChanged(bool enabled); + void meshRotationChanged(QQuaternion rotation); void userDefinedMeshChanged(QString fileName); void colorStyleChanged(Q3DTheme::ColorStyle style); void baseColorChanged(QColor color); -- cgit v1.2.3 From 3b57eb8aaef9886a9975b7b861f31bdf8ed15fdb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 27 Jan 2014 08:18:03 +0200 Subject: Fix copyright year Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qabstract3dseries.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/data/qabstract3dseries.h') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index 5e7fe016..ebb22b7f 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -- cgit v1.2.3