diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2017-02-22 20:35:39 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-03-06 14:43:34 +0000 |
| commit | 9a1b163e1fdd99a838c082805c687205b766da25 (patch) | |
| tree | c9ce4b7fc05d93280628043c98c4e24b5c34e901 /src/plugins/sensorgestures | |
| parent | bd1e063980355c82bb20af81a826a2860248ce6a (diff) | |
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 <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/sensorgestures')
| -rw-r--r-- | src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp index f2f0a786..33688706 100644 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp @@ -41,7 +41,6 @@ #include <QtCore/qmath.h> -#define RADIANS_TO_DEGREES 57.2957795 #define TIMER_TIMEOUT 250 QT_BEGIN_NAMESPACE @@ -117,8 +116,8 @@ void QPickupSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading const qreal ydiff = pYaxis - y; const qreal zdiff = pZaxis - z; - qreal pitch = qAtan(y / qSqrt(x*x + z*z)) * RADIANS_TO_DEGREES; - qreal roll = qAtan(x / qSqrt(y*y + z*z)) * RADIANS_TO_DEGREES; + qreal pitch = qRadiansToDegrees(qAtan(y / qSqrt(x * x + z * z))); + qreal roll = qRadiansToDegrees(qAtan(x / qSqrt(y * y + z * z))); if ((qAbs(xdiff) < 0.7 && qAbs(ydiff) < .7 && qAbs(zdiff) < .7) || z < 0) { diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp index 1411f44c..6a1f1706 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; |