diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-14 11:19:28 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-14 11:27:55 +0300 |
commit | 824cf363f6ab999d2fc38ebdab1f7faae5559ad0 (patch) | |
tree | 7e86d13dae8619bffb2a22bd56a07de538d2f0ca /src/datavisualizationqml2 | |
parent | 5f9be2bd06a3f0f8286325ad1eb323aa692126eb (diff) |
Added option to use orthographic projection
Task-number: QTRD-3078
Change-Id: I07ebc2b7edd542cd28e405dfc80282f18b7a7314
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 13 | ||||
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 375c9bdb..ed122104 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -317,6 +317,9 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) &AbstractDeclarative::measureFpsChanged); QObject::connect(m_controller.data(), &Abstract3DController::currentFpsChanged, this, &AbstractDeclarative::currentFpsChanged); + + QObject::connect(m_controller.data(), &Abstract3DController::orthoProjectionChanged, this, + &AbstractDeclarative::orthoProjectionChanged); } void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window) @@ -664,6 +667,16 @@ qreal AbstractDeclarative::currentFps() const return m_controller->currentFps(); } +void AbstractDeclarative::setOrthoProjection(bool enable) +{ + m_controller->setOrthoProjection(enable); +} + +bool AbstractDeclarative::isOrthoProjection() const +{ + return m_controller->isOrthoProjection(); +} + void AbstractDeclarative::windowDestroyed(QObject *obj) { // Remove destroyed window from window lists diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 3dd07dca..837c632c 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -69,6 +69,7 @@ class AbstractDeclarative : public QQuickItem Q_PROPERTY(bool measureFps READ measureFps WRITE setMeasureFps NOTIFY measureFpsChanged REVISION 1) Q_PROPERTY(qreal currentFps READ currentFps NOTIFY currentFpsChanged REVISION 1) Q_PROPERTY(QQmlListProperty<QCustom3DItem> customItemList READ customItemList REVISION 1) + Q_PROPERTY(bool orthoProjection READ isOrthoProjection WRITE setOrthoProjection NOTIFY orthoProjectionChanged REVISION 1) public: enum SelectionFlag { @@ -163,6 +164,9 @@ public: bool measureFps() const; qreal currentFps() const; + void setOrthoProjection(bool enable); + bool isOrthoProjection() const; + public slots: virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0; virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0; @@ -195,6 +199,7 @@ signals: Q_REVISION(1) void measureFpsChanged(bool enabled); Q_REVISION(1) void currentFpsChanged(qreal fps); Q_REVISION(1) void elementSelected(QAbstract3DGraph::ElementType type); + Q_REVISION(1) void orthoProjectionChanged(bool enabled); private: QPointer<Abstract3DController> m_controller; |