diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 12:19:18 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 14:22:32 +0200 |
| commit | e029d0ea1d486dd3dbbfa4519a2125da202f22e4 (patch) | |
| tree | fc9f87f637a9adcca5a555355d96717d43eddc77 /src/datavisualization/input/qtouch3dinputhandler.cpp | |
| parent | e7e01ec065d3874d28e9e28d213783c4275d8813 (diff) | |
Change qreals to floats
+ Fix default axes to sensible
+ Fix some rounding errors in surface creation
Task-number: QTRD-2622
Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/input/qtouch3dinputhandler.cpp')
| -rw-r--r-- | src/datavisualization/input/qtouch3dinputhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index 6211ef9e..b36fdb99 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -23,7 +23,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE -const qreal maxTapAndHoldJitter = 20; +const float maxTapAndHoldJitter = 20.0f; const int maxPinchJitter = 10; #if defined (Q_OS_ANDROID) const int maxSelectionJitter = 10; @@ -145,7 +145,7 @@ QTouch3DInputHandlerPrivate::~QTouch3DInputHandlerPrivate() delete m_holdTimer; } -void QTouch3DInputHandlerPrivate::handlePinchZoom(qreal distance) +void QTouch3DInputHandlerPrivate::handlePinchZoom(float distance) { int newDistance = distance; int prevDist = q_ptr->prevDistance(); @@ -154,7 +154,7 @@ void QTouch3DInputHandlerPrivate::handlePinchZoom(qreal distance) q_ptr->setInputState(QDataVis::InputStateOnPinch); Q3DCamera *camera = q_ptr->scene()->activeCamera(); int zoomLevel = camera->zoomLevel(); - qreal zoomRate = qSqrt(qSqrt(zoomLevel)); + float zoomRate = qSqrt(qSqrt(zoomLevel)); if (newDistance > prevDist) zoomLevel += zoomRate; else |