diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-17 13:56:57 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-17 14:50:20 +0200 |
| commit | c42c5a5fb801ea1f6c11c44f4719f9b175fc38d8 (patch) | |
| tree | 77b4fe80a363389ccebc106a97f784f55b60a3dd /src/datavisualization/engine/abstract3dcontroller.cpp | |
| parent | fba185e6c2fa5158aa60ba4468c1f1a70177f77a (diff) | |
Fix various issues for previous commit
Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller.cpp')
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 7392b714..9835dbe4 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -29,6 +29,7 @@ #include "qtouch3dinputhandler.h" #include "qabstract3dseries_p.h" #include "thememanager_p.h" +#include "q3dscene_p.h" #include <QThread> @@ -53,7 +54,7 @@ Abstract3DController::Abstract3DController(QRect initialViewport, QObject *paren // Set initial theme setTheme(new Q3DTheme(Q3DTheme::ThemeQt)); - m_scene->setViewport(initialViewport); + m_scene->d_ptr->setViewport(initialViewport); // Populate the scene m_scene->activeLight()->setPosition(defaultLightPos); @@ -67,10 +68,8 @@ Abstract3DController::Abstract3DController(QRect initialViewport, QObject *paren &Abstract3DController::handleInputStateChanged); connect(inputHandler, &QAbstract3DInputHandler::positionChanged, this, &Abstract3DController::handleInputPositionChanged); - connect(m_scene, &Q3DScene::needRender, this, + connect(m_scene->d_ptr.data(), &Q3DScenePrivate::needRender, this, &Abstract3DController::emitNeedRender); - connect(m_scene, &Q3DScene::devicePixelRatioChanged, this, - &Abstract3DController::handlePixelRatioChanged); } Abstract3DController::~Abstract3DController() @@ -357,13 +356,6 @@ void Abstract3DController::wheelEvent(QWheelEvent *event) m_activeInputHandler->wheelEvent(event); } -void Abstract3DController::handlePixelRatioChanged(float ratio) -{ - Q_UNUSED(ratio); - - emitNeedRender(); -} - void Abstract3DController::handleThemeColorStyleChanged(Q3DTheme::ColorStyle style) { // Set value for series that have not explicitly set this value |