diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-09 15:52:53 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 08:20:59 +0300 |
commit | f15bcc41a2be8aa2267f4abf23e99bac72b594b4 (patch) | |
tree | 771fd956942b19054a2fa635a4d6d8741e54fdaa /src/datavisualizationqml2/abstractdeclarative.cpp | |
parent | e9dc0f74f5cc06eb5edc3c16a63c9e6e89422584 (diff) |
Fix selectedElement qmldesigner crash
Also fix some minor inconsistencies in the API.
Change-Id: Ia31321a1f70d132173a909fef68fd3b59e06e080
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative.cpp')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 15 |
1 files changed, 14 insertions, 1 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(); |