diff options
Diffstat (limited to 'src/datavisualizationqml2')
6 files changed, 25 insertions, 10 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index a6dee6eb..f7ccbf21 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -308,7 +308,7 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) QObject::connect(m_controller.data(), &Abstract3DController::selectionModeChanged, this, &AbstractDeclarative::handleSelectionModeChange); QObject::connect(m_controller.data(), &Abstract3DController::elementSelected, this, - &AbstractDeclarative::selectedElementChanged); + &AbstractDeclarative::handleSelectedElementChange); QObject::connect(m_controller.data(), &Abstract3DController::axisXChanged, this, &AbstractDeclarative::handleAxisXChanged); @@ -327,6 +327,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) QObject::connect(m_controller.data(), &Abstract3DController::aspectRatioChanged, this, &AbstractDeclarative::aspectRatioChanged); + QObject::connect(m_controller.data(), &Abstract3DController::optimizationHintsChanged, this, + &AbstractDeclarative::handleOptimizationHintChange); } void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window) @@ -532,6 +534,17 @@ void AbstractDeclarative::handleShadowQualityChange(QAbstract3DGraph::ShadowQual emit shadowQualityChanged(ShadowQuality(quality)); } +void AbstractDeclarative::handleSelectedElementChange(QAbstract3DGraph::ElementType type) +{ + emit selectedElementChanged(ElementType(type)); +} + +void AbstractDeclarative::handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints) +{ + int intHints = int(hints); + emit optimizationHintsChanged(OptimizationHints(intHints)); +} + void AbstractDeclarative::render() { updateWindowParameters(); diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index ebe8b49c..dfcd9537 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -132,6 +132,8 @@ public: virtual void setShadowQuality(ShadowQuality quality); virtual AbstractDeclarative::ShadowQuality shadowQuality() const; + virtual AbstractDeclarative::ElementType selectedElement() const; + virtual bool shadowsSupported() const; virtual void setMsaaSamples(int samples); @@ -185,8 +187,6 @@ public: void setOrthoProjection(bool enable); bool isOrthoProjection() const; - AbstractDeclarative::ElementType selectedElement() const; - void setAspectRatio(qreal ratio); qreal aspectRatio() const; @@ -211,6 +211,8 @@ protected: virtual void updateWindowParameters(); virtual void handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode); virtual void handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality); + virtual void handleSelectedElementChange(QAbstract3DGraph::ElementType type); + virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints); virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); signals: @@ -224,10 +226,10 @@ signals: void renderingModeChanged(AbstractDeclarative::RenderingMode mode); Q_REVISION(1) void measureFpsChanged(bool enabled); Q_REVISION(1) void currentFpsChanged(qreal fps); - Q_REVISION(1) void selectedElementChanged(QAbstract3DGraph::ElementType type); + Q_REVISION(1) void selectedElementChanged(AbstractDeclarative::ElementType type); Q_REVISION(1) void orthoProjectionChanged(bool enabled); Q_REVISION(1) void aspectRatioChanged(qreal ratio); - Q_REVISION(1) void optimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints); + Q_REVISION(1) void optimizationHintsChanged(AbstractDeclarative::OptimizationHints hints); private: QPointer<Abstract3DController> m_controller; diff --git a/src/datavisualizationqml2/designer/default/Bars3D.qml b/src/datavisualizationqml2/designer/default/Bars3D.qml index 9f8c72e3..10fefe53 100644 --- a/src/datavisualizationqml2/designer/default/Bars3D.qml +++ b/src/datavisualizationqml2/designer/default/Bars3D.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDataVisualization 1.0 +import QtDataVisualization 1.1 Bars3D { width: 300 diff --git a/src/datavisualizationqml2/designer/default/Scatter3D.qml b/src/datavisualizationqml2/designer/default/Scatter3D.qml index d38a9755..b08d4e24 100644 --- a/src/datavisualizationqml2/designer/default/Scatter3D.qml +++ b/src/datavisualizationqml2/designer/default/Scatter3D.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDataVisualization 1.0 +import QtDataVisualization 1.1 Scatter3D { width: 300 diff --git a/src/datavisualizationqml2/designer/default/Surface3D.qml b/src/datavisualizationqml2/designer/default/Surface3D.qml index fde097df..77ee476e 100644 --- a/src/datavisualizationqml2/designer/default/Surface3D.qml +++ b/src/datavisualizationqml2/designer/default/Surface3D.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDataVisualization 1.0 +import QtDataVisualization 1.1 Surface3D { width: 300 diff --git a/src/datavisualizationqml2/plugins.qmltypes b/src/datavisualizationqml2/plugins.qmltypes index 71decd74..6a580536 100644 --- a/src/datavisualizationqml2/plugins.qmltypes +++ b/src/datavisualizationqml2/plugins.qmltypes @@ -158,7 +158,7 @@ Module { Signal { name: "selectedElementChanged" revision: 1 - Parameter { name: "type"; type: "QAbstract3DGraph::ElementType" } + Parameter { name: "type"; type: "AbstractDeclarative::ElementType" } } Signal { name: "orthoProjectionChanged" @@ -173,7 +173,7 @@ Module { Signal { name: "optimizationHintsChanged" revision: 1 - Parameter { name: "hints"; type: "QAbstract3DGraph::OptimizationHints" } + Parameter { name: "hints"; type: "AbstractDeclarative::OptimizationHints" } } Method { name: "handleAxisXChanged" |