From 5b8b37ebe42f9fb3cdc0bb269146c18ebbd56ed3 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 26 Sep 2014 13:41:31 +0300
Subject: Allow setting bounds for camera zoom level
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTRD-3337
Change-Id: I503dc4402907a2fdfa74ca86698b0e98a23b3b08
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 .../input/qtouch3dinputhandler.cpp                 | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'src/datavisualization/input/qtouch3dinputhandler.cpp')

diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index b811548b..20eebb58 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -22,18 +22,16 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-const float maxTapAndHoldJitter = 20.0f;
-const int maxPinchJitter = 10;
+static const float maxTapAndHoldJitter = 20.0f;
+static const int maxPinchJitter = 10;
 #if defined (Q_OS_ANDROID) || defined(Q_OS_IOS)
-const int maxSelectionJitter = 10;
+static const int maxSelectionJitter = 10;
 #else
-const int maxSelectionJitter = 5;
+static const int maxSelectionJitter = 5;
 #endif
-const int tapAndHoldTime = 250;
-const float rotationSpeed = 200.0f;
-const int minZoomLevel = 10;
-const int maxZoomLevel = 500;
-const float touchZoomDrift = 0.02f;
+static const int tapAndHoldTime = 250;
+static const float rotationSpeed = 200.0f;
+static const float touchZoomDrift = 0.02f;
 
 /*!
  * \class QTouch3DInputHandler
@@ -61,7 +59,7 @@ const float touchZoomDrift = 0.02f;
  *          \li Same as tap.
  *      \row
  *          \li Pinch
- *          \li Zoom in/out within default range (10...500%).
+ *          \li Zoom in/out within the allowable zoom range set for Q3DCamera.
  *      \row
  *          \li Tap on the primary view when the secondary view is visible
  *          \li Closes the secondary view.
@@ -193,16 +191,15 @@ void QTouch3DInputHandlerPrivate::handlePinchZoom(float distance, const QPoint &
             return;
         m_inputState = QAbstract3DInputHandlerPrivate::InputStatePinching;
         Q3DCamera *camera = q_ptr->scene()->activeCamera();
-        int zoomLevel = camera->zoomLevel();
+        int zoomLevel = int(camera->zoomLevel());
+        const int minZoomLevel = int(camera->minZoomLevel());
+        const int maxZoomLevel = int(camera->maxZoomLevel());
         float zoomRate = qSqrt(qSqrt(zoomLevel));
         if (newDistance > prevDist)
             zoomLevel += zoomRate;
         else
             zoomLevel -= zoomRate;
-        if (zoomLevel > maxZoomLevel)
-            zoomLevel = maxZoomLevel;
-        else if (zoomLevel < minZoomLevel)
-            zoomLevel = minZoomLevel;
+        zoomLevel = qBound(minZoomLevel, zoomLevel, maxZoomLevel);
 
         if (q_ptr->isZoomAtTargetEnabled()) {
             q_ptr->scene()->setGraphPositionQuery(pos);
-- 
cgit v1.2.3