From 467e729eabece018cd42eeee0160f932983561b0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 7 Jan 2014 13:11:34 +0200 Subject: Rename axis classes Moved the '3D' in axis class names so that the classes would be in line with other '3D' classes. Task-number: QTRD-2674 Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba Reviewed-by: Mika Salmela --- src/datavisualizationqml2/declarativesurface.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/datavisualizationqml2/declarativesurface.cpp') diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 3ba5f923..efbec825 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "declarativesurface_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "qitemmodelsurfacedataproxy.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -50,32 +50,32 @@ DeclarativeSurface::~DeclarativeSurface() delete m_surfaceController; } -Q3DValueAxis *DeclarativeSurface::axisX() const +QValue3DAxis *DeclarativeSurface::axisX() const { - return static_cast(m_surfaceController->axisX()); + return static_cast(m_surfaceController->axisX()); } -void DeclarativeSurface::setAxisX(Q3DValueAxis *axis) +void DeclarativeSurface::setAxisX(QValue3DAxis *axis) { m_surfaceController->setAxisX(axis); } -Q3DValueAxis *DeclarativeSurface::axisY() const +QValue3DAxis *DeclarativeSurface::axisY() const { - return static_cast(m_surfaceController->axisY()); + return static_cast(m_surfaceController->axisY()); } -void DeclarativeSurface::setAxisY(Q3DValueAxis *axis) +void DeclarativeSurface::setAxisY(QValue3DAxis *axis) { m_surfaceController->setAxisY(axis); } -Q3DValueAxis *DeclarativeSurface::axisZ() const +QValue3DAxis *DeclarativeSurface::axisZ() const { - return static_cast(m_surfaceController->axisZ()); + return static_cast(m_surfaceController->axisZ()); } -void DeclarativeSurface::setAxisZ(Q3DValueAxis *axis) +void DeclarativeSurface::setAxisZ(QValue3DAxis *axis) { m_surfaceController->setAxisZ(axis); } -- cgit v1.2.3 From 997bc1f796938eb8347adfd79b6756ea8b2b3ab9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 9 Jan 2014 08:29:11 +0200 Subject: Invalid point/selection as constant property in qml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene Task-number: QTRD-2688 Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646 Reviewed-by: Pasi Keränen --- src/datavisualizationqml2/declarativesurface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/datavisualizationqml2/declarativesurface.cpp') diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index efbec825..d4b4083b 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -19,6 +19,7 @@ #include "declarativesurface_p.h" #include "qvalue3daxis.h" #include "qitemmodelsurfacedataproxy.h" +#include "declarativescene_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -33,7 +34,7 @@ DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) setSmooth(true); // Create the shared component on the main GUI thread. - m_surfaceController = new Surface3DController(boundingRect().toRect()); + m_surfaceController = new Surface3DController(boundingRect().toRect(), new Declarative3DScene); setSharedController(m_surfaceController); // TODO: Uncomment when doing QTRD-2669 -- cgit v1.2.3 From 450dc3e6d74ffe93a761a5e2491458935ecac7b7 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 9 Jan 2014 09:55:52 +0200 Subject: Make active axes properties in C++ Also provide axis changed signals both C++ and QML. Some other minor fixes, too. Task-number: QTRD-2669 Change-Id: Ib797bffd6720382cf26359a9059e1809efdf58da Reviewed-by: Mika Salmela --- src/datavisualizationqml2/declarativesurface.cpp | 27 +++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'src/datavisualizationqml2/declarativesurface.cpp') diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index d4b4083b..ceb733e2 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -29,21 +29,9 @@ DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) { setAcceptedMouseButtons(Qt::AllButtons); - // TODO: These seem to have no effect; find a way to activate anti-aliasing - setAntialiasing(true); - setSmooth(true); - // Create the shared component on the main GUI thread. m_surfaceController = new Surface3DController(boundingRect().toRect(), new Declarative3DScene); setSharedController(m_surfaceController); - - // TODO: Uncomment when doing QTRD-2669 -// connect(m_surfaceController, &Surface3DController::axisXChanged, -// this, &DeclarativeBars::axisXChanged); -// connect(m_surfaceController, &Surface3DController::axisYChanged, -// this, &DeclarativeBars::axisYChanged); -// connect(m_surfaceController, &Surface3DController::axisZChanged, -// this, &DeclarativeBars::axisZChanged); } DeclarativeSurface::~DeclarativeSurface() @@ -125,4 +113,19 @@ void DeclarativeSurface::removeSeries(QSurface3DSeries *series) series->setParent(this); // Reparent as removing will leave series parentless } +void DeclarativeSurface::handleAxisXChanged(QAbstract3DAxis *axis) +{ + emit axisXChanged(static_cast(axis)); +} + +void DeclarativeSurface::handleAxisYChanged(QAbstract3DAxis *axis) +{ + emit axisYChanged(static_cast(axis)); +} + +void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis) +{ + emit axisZChanged(static_cast(axis)); +} + 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/datavisualizationqml2/declarativesurface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualizationqml2/declarativesurface.cpp') diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index ceb733e2..b8fe285d 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -21,7 +21,7 @@ #include "qitemmodelsurfacedataproxy.h" #include "declarativescene_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : AbstractDeclarative(parent), @@ -128,4 +128,4 @@ void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast(axis)); } -QT_DATAVISUALIZATION_END_NAMESPACE +} -- 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/datavisualizationqml2/declarativesurface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualizationqml2/declarativesurface.cpp') diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index b8fe285d..64186293 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -21,7 +21,7 @@ #include "qitemmodelsurfacedataproxy.h" #include "declarativescene_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : AbstractDeclarative(parent), @@ -128,4 +128,4 @@ void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast(axis)); } -} +QT_END_NAMESPACE_DATAVISUALIZATION -- 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/datavisualizationqml2/declarativesurface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualizationqml2/declarativesurface.cpp') diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 64186293..c0e1ddcc 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -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