summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/abstract3dcontroller.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-01-21 12:01:27 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-01-21 12:07:00 +0200
commit1b1dfcaadf83c73d3f7c1c1cd893894a3aea0ecb (patch)
tree776666dbf0368ec412fcbb154c2fe27076f6d404 /src/datavisualization/engine/abstract3dcontroller.cpp
parent177f9d385c8cd062c4bad78cf6b794a96fa025ad (diff)
InputState enum divided
Task-number: QTRD-2683 Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller.cpp')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 1efbea8d..2cda94e2 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -68,8 +68,8 @@ Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scen
inputHandler = new QTouch3DInputHandler();
inputHandler->d_ptr->m_isDefaultHandler = true;
setActiveInputHandler(inputHandler);
- connect(inputHandler, &QAbstract3DInputHandler::inputStateChanged, this,
- &Abstract3DController::handleInputStateChanged);
+ connect(inputHandler, &QAbstract3DInputHandler::inputViewChanged, this,
+ &Abstract3DController::handleInputViewChanged);
connect(inputHandler, &QAbstract3DInputHandler::positionChanged, this,
&Abstract3DController::handleInputPositionChanged);
connect(m_scene->d_ptr.data(), &Q3DScenePrivate::needRender, this,
@@ -863,15 +863,15 @@ void Abstract3DController::handleAxisLabelFormatChanged(const QString &format)
handleAxisLabelFormatChangedBySender(sender());
}
-void Abstract3DController::handleInputStateChanged(QAbstract3DInputHandler::InputState state)
+void Abstract3DController::handleInputViewChanged(QAbstract3DInputHandler::InputView view)
{
- // When in automatic slicing mode, input state change to overview disables slice mode
+ // When in automatic slicing mode, input view change to primary disables slice mode
if (m_selectionMode.testFlag(QAbstract3DGraph::SelectionSlice)
- && state == QAbstract3DInputHandler::InputStateOnPrimaryView) {
+ && view == QAbstract3DInputHandler::InputViewOnPrimary) {
setSlicingActive(false);
}
- m_changeTracker.inputStateChanged = true;
+ m_changeTracker.inputViewChanged = true;
emitNeedRender();
}