From 9a1b163e1fdd99a838c082805c687205b766da25 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 22 Feb 2017 20:35:39 +0100 Subject: Use qRadiansToDegrees() and qDegreesToRadians() more widely They document intent more clearly than arithmetic with pi does. Also eliminate some hand-rolled RADIANS_TO_DEGREES constants in favor of calling qRadiansToDegrees(). Change-Id: I7ca5e876b3591433bf681b56ad51c4cb409ac59f Reviewed-by: Lorn Potter --- .../sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp') diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp index 1411f44..6a1f170 100644 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp @@ -44,7 +44,6 @@ QT_BEGIN_NAMESPACE -#define RADIANS_TO_DEGREES 57.2957795 #define TIMER_TIMEOUT 750 QTwistSensorGestureRecognizer::QTwistSensorGestureRecognizer(QObject *parent) : QSensorGestureRecognizer(parent) @@ -155,7 +154,7 @@ void QTwistSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) if (!detecting && !checking&& dataList.count() > 21) dataList.removeFirst(); - qreal angle = qAtan(x / qSqrt(y*y + z*z)) * RADIANS_TO_DEGREES; + qreal angle = qRadiansToDegrees(qAtan(x / qSqrt(y * y + z * z))); if (qAbs(angle) > 2) { if (detecting) { @@ -177,7 +176,7 @@ void QTwistSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) if (!detecting && increaseCount > 3 && qAbs(angle) > 30) { decreaseCount = 0; detecting = true; - detectedAngle = qAtan(y / qSqrt(x*x + z*z)) * RADIANS_TO_DEGREES; + detectedAngle = qRadiansToDegrees(qAtan(y / qSqrt(x * x + z * z))); } } else { increaseCount = 0; -- cgit v1.2.1