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 /src | |
| 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 'src')
| -rw-r--r-- | src/datavisualization/data/qbar3dseries.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp index c338b859..e2be7cc9 100644 --- a/src/datavisualization/data/qbar3dseries.cpp +++ b/src/datavisualization/data/qbar3dseries.cpp @@ -246,7 +246,7 @@ QPoint QBar3DSeries::invalidSelectionPosition() static inline float quaternionAngle(const QQuaternion &rotation) { - return qAcos(rotation.scalar()) * 360.0f / M_PI; + return qRadiansToDegrees(qAcos(rotation.scalar())) * 2.f; } /*! diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 9cfa0edc..fa8bae8e 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1150,7 +1150,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) // Need to determine if camera is below graph top float distanceToCenter = activeCamera->position().length() / activeCamera->zoomLevel() / m_autoScaleAdjustment * 100.0f; - qreal cameraAngle = qreal(activeCamera->yRotation()) / 180.0 * M_PI; + qreal cameraAngle = qDegreesToRadians(qreal(activeCamera->yRotation())); float cameraYPos = float(qSin(cameraAngle)) * distanceToCenter; m_yFlippedForGrid = cameraYPos < (m_scaleYWithBackground - m_oldCameraTarget.y()); } else if (m_useOrthoProjection && activeCamera->yRotation() == 0.0f) { |