diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2017-01-12 18:02:46 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-14 08:21:29 +0000 |
commit | af03eef4ab3cc41a6148d1f73fef1193f4fc4dcb (patch) | |
tree | ccedb2a89986524e00a374f21ffb77b8b37dba38 /tests | |
parent | 53fcf914e278ed4395a4873af2b64272c5d7882c (diff) |
Use qRadiansToDegrees() and qDegreesToRadians() more widely
These document what the arithmetic is actually doing; and save us an
ad-hoc use of an approximate value for pi while we're about it.
Task-number: QTBUG-58083
Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/manual/directional/scatterdatamodifier.cpp | 13 | ||||
-rw-r--r-- | tests/manual/galaxy/star.cpp | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/tests/manual/directional/scatterdatamodifier.cpp b/tests/manual/directional/scatterdatamodifier.cpp index a11278fa..2a98625d 100644 --- a/tests/manual/directional/scatterdatamodifier.cpp +++ b/tests/manual/directional/scatterdatamodifier.cpp @@ -42,7 +42,6 @@ using namespace QtDataVisualization; const int numberOfCols = 8; const int numberOfRows = 8; const float limit = 8.0f; -const float PI = 3.14159f; #define HEDGEHOG ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) @@ -97,18 +96,18 @@ void ScatterDataModifier::addData() for (float i = 0; i < numberOfRows; i++) { float latAngle = float(i) * latAngleStep + 40.0f; - float radius = qSin(latAngle * PI / 180.0f) * limit; - float y = qCos(latAngle * PI / 180.0f) * 1.0f; + float radius = qSin(qDegreesToRadians(latAngle)) * limit; + float y = qCos(qDegreesToRadians(latAngle)) * 1.0f; #ifdef HEDGEHOG - float angleZ = (qAtan((y * limit / 2.0f) / radius) * 180.0f / PI); + float angleZ = qRadiansToDegrees(qAtan((y * limit / 2.0f) / radius)); QQuaternion rotationZ = QQuaternion::fromAxisAndAngle(QVector3D(0.0f, 0.0f, 1.0f), angleZ - 90.0f); #endif for (float j = 0; j < numberOfCols; j++) { float angle = float(j) * angleStep; - float x = qCos(angle * PI / 180.0f) * radius; - float z = qSin(angle * PI / 180.0f) * radius; + float x = qCos(qDegreesToRadians(angle)) * radius; + float z = qSin(qDegreesToRadians(angle)) * radius; - float angleY = (qAtan(z / x) * 180.0f / PI); + float angleY = qRadiansToDegrees(qAtan(z / x)); if (x < 0) angleY = 180.0f + angleY; if (x > 0 && z < 0) diff --git a/tests/manual/galaxy/star.cpp b/tests/manual/galaxy/star.cpp index 1513c93b..ca6b66f0 100644 --- a/tests/manual/galaxy/star.cpp +++ b/tests/manual/galaxy/star.cpp @@ -31,8 +31,6 @@ #include <QtCore/qmath.h> -static const double DEG_TO_RAD = M_PI / 180.0; - Star::Star() : m_theta(0), m_a(0), @@ -49,7 +47,7 @@ const void Star::calcXY() const QVector2D &p = m_center; qreal beta = -m_angle; - qreal alpha = theta * DEG_TO_RAD; + qreal alpha = qDegreesToRadians(theta); // temporaries to save cpu time qreal cosalpha = qCos(alpha); |