diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:16 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:35 +0300 |
commit | 50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch) | |
tree | ba5b78cc2187709f33ccc6da9d7581c7f63729f6 /src/datavisualization/input/q3dinputhandler.cpp | |
parent | 0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff) |
Refactored MeshStyle and InputState
Task-number: QTRD-2362
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/input/q3dinputhandler.cpp')
-rw-r--r-- | src/datavisualization/input/q3dinputhandler.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index bbbde7d8..f6e73a7d 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -88,14 +88,14 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos if (Qt::LeftButton == event->button()) { if (scene()->isSlicingActive()) { if (scene()->isPointInPrimarySubView(mousePos)) { - setInputState(QDataVis::InputOnOverview); + setInputState(QDataVis::InputStateOnOverview); } else if (scene()->isPointInSecondarySubView(mousePos)) { - setInputState(QDataVis::InputOnSlice); + setInputState(QDataVis::InputStateOnSlice); } else { - setInputState(QDataVis::InputNone); + setInputState(QDataVis::InputStateNone); } } else { - setInputState(QDataVis::InputOnScene); + setInputState(QDataVis::InputStateOnScene); // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); } @@ -105,7 +105,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos } else if (Qt::RightButton == event->button()) { // disable rotating when in slice view if (!scene()->isSlicingActive()) - setInputState(QDataVis::InputRotating); + setInputState(QDataVis::InputStateRotating); // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); } @@ -122,11 +122,11 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP #if defined (Q_OS_ANDROID) Q_UNUSED(mousePos); #else - if (QDataVis::InputRotating == inputState()) { + if (QDataVis::InputStateRotating == inputState()) { // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); } - setInputState(QDataVis::InputNone); + setInputState(QDataVis::InputStateNone); #endif } @@ -140,7 +140,7 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) #if defined (Q_OS_ANDROID) Q_UNUSED(mousePos); #else - if (QDataVis::InputRotating == inputState()) { + if (QDataVis::InputStateRotating == inputState()) { // Calculate mouse movement since last frame QPointF rotations = scene()->activeCamera()->rotations(); float xRotation = rotations.x(); |