summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/input
diff options
context:
space:
mode:
authorKeränen Pasi <pasi.keranen@digia.com>2013-11-12 09:24:56 +0200
committerPasi Keränen <pasi.keranen@digia.com>2013-11-15 12:35:06 +0200
commitcc22cc40e889b5b2f0e49ce32f660395cef865b7 (patch)
tree03bb5365bbfc614cfb94ffe304e632eb16ce5493 /src/datavisualization/input
parent999ffa01d20f75a457da62d41c0fabfc32e5e1bb (diff)
Changes scene to be proxy for input position and selection communication.
Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/input')
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp1
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 357c97d3..0efdf41f 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -101,6 +101,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos
setInputState(QDataVis::InputStateOnScene);
// update mouse positions to prevent jumping when releasing or repressing a button
setInputPosition(mousePos);
+ scene()->setSelectionQueryPosition(mousePos);
}
} else if (Qt::MiddleButton == event->button()) {
// reset rotations
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 1d8bd929..6211ef9e 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -184,6 +184,7 @@ void QTouch3DInputHandlerPrivate::handleSelection(const QPointF &position)
else
q_ptr->setInputState(QDataVis::InputStateNone);
q_ptr->setPreviousInputPos(position.toPoint());
+ q_ptr->scene()->setSelectionQueryPosition(position.toPoint());
}
void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)