From 594fc157103ea419091425e5315cb6a82ef82654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 2 Oct 2013 08:46:19 +0300 Subject: Android rotate fixed Task-number: QTRD-2360 + updated input handler documentation Change-Id: Ie8ab299b9acaef749773df5d5bbcf0e16d17f18c Reviewed-by: Mika Salmela --- .../input/qtouch3dinputhandler.cpp | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'src/datavisualization/input/qtouch3dinputhandler.cpp') diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index ab97332f..fd7ce39c 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -25,20 +25,41 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE const qreal maxTapAndHoldJitter = 20; const int maxPinchJitter = 10; +#if defined (Q_OS_ANDROID) +const int maxSelectionJitter = 10; +#else const int maxSelectionJitter = 5; +#endif const int tapAndHoldTime = 250; const float rotationSpeed = 200.0f; const int minZoomLevel = 10; const int maxZoomLevel = 500; /*! - \class QTouch3DInputHandler - \inmodule QtDataVisualization - \brief Basic touch display based input handler. - \since 1.0.0 - - QTouch3DInputHandler is the basic input handler for touch screen devices. -*/ + * \class QTouch3DInputHandler + * \inmodule QtDataVisualization + * \brief Basic touch display based input handler. + * \since 1.0.0 + * + * QTouch3DInputHandler is the basic input handler for touch screen devices. + * + * Default touch input handler has the following functionalty: + * \table + * \header + * \li Gesture \li Action + * \row + * \li Touch-And-Move \li Rotate graph within limits set for Q3DCamera + * \row + * \li Tap \li Select item under pointer or remove selection if none + * \row + * \li Tap-And-Hold \li Select item under pointer or remove selection if none + * \row + * \li Pinch \li Zoom in/out within default range (10...500%) + * \row + * \li Tap on secondary view \li Return to primary view when in slice mode + * \note Slice mode is available in Q3DBars and Q3DSurface only + * \endtable + */ /*! * Constructs the basic touch display input handler. An optional \a parent parameter can be given -- cgit v1.2.3