diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-26 12:42:55 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-26 12:44:20 +0300 |
commit | 1da51fd24458710d6b740feaba73c21fe2b1273a (patch) | |
tree | 39a648e34a2884f39e4854fdb6b7cd8b79c2f6d8 /src/datavisualization | |
parent | a097124a5a2ac615be0d0078f94532daf8618260 (diff) |
Code cleanups
Task-number: QTRD-3149
Change-Id: I7db55daf41ea61548604e816d7a49b7bade450d2
Change-Id: I7db55daf41ea61548604e816d7a49b7bade450d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 13 | ||||
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 10 |
2 files changed, 1 insertions, 22 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 98b0c792..7e310ab8 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -762,19 +762,6 @@ QList<QAbstract3DInputHandler *> Abstract3DController::inputHandlers() const return m_inputHandlers; } -int Abstract3DController::zoomLevel() -{ - return m_scene->activeCamera()->zoomLevel(); -} - -void Abstract3DController::setZoomLevel(int zoomLevel) -{ - m_scene->activeCamera()->setZoomLevel(zoomLevel); - - m_changeTracker.zoomLevelChanged = true; - emitNeedRender(); -} - void Abstract3DController::addTheme(Q3DTheme *theme) { m_themeManager->addTheme(theme); diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index e359d40d..5869d388 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -33,13 +33,12 @@ #include "qabstract3daxis.h" #include "drawer_p.h" #include "qabstract3dinputhandler.h" -#include "qabstractdataproxy.h" +#include "qabstract3dgraph.h" #include "q3dscene_p.h" #include "qcustom3ditem.h" #include <QtGui/QLinearGradient> #include <QtCore/QTime> -class QFont; class QOpenGLFramebufferObject; QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -50,11 +49,9 @@ class QAbstract3DSeries; class ThemeManager; struct Abstract3DChangeBitField { - bool zoomLevelChanged : 1; bool themeChanged : 1; bool shadowQualityChanged : 1; bool selectionModeChanged : 1; - bool objFileChanged : 1; bool axisXTypeChanged : 1; bool axisYTypeChanged : 1; bool axisZTypeChanged : 1; @@ -89,11 +86,9 @@ struct Abstract3DChangeBitField { bool aspectRatioChanged : 1; Abstract3DChangeBitField() : - zoomLevelChanged(true), themeChanged(true), shadowQualityChanged(true), selectionModeChanged(true), - objFileChanged(true), axisXTypeChanged(true), axisYTypeChanged(true), axisZTypeChanged(true), @@ -223,9 +218,6 @@ public: virtual QAbstract3DInputHandler *activeInputHandler(); virtual QList<QAbstract3DInputHandler *> inputHandlers() const; - virtual int zoomLevel(); - virtual void setZoomLevel(int zoomLevel); - virtual void addTheme(Q3DTheme *theme); virtual void releaseTheme(Q3DTheme *theme); virtual void setActiveTheme(Q3DTheme *theme, bool force = true); |