diff options
Diffstat (limited to 'src/datavisualization')
| -rw-r--r-- | src/datavisualization/data/qbar3dseries.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/doc/qtdatavis3d.qdocconf | 3 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 2 |
3 files changed, 4 insertions, 3 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/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf index 63aa334d..71eb43ec 100644 --- a/src/datavisualization/doc/qtdatavis3d.qdocconf +++ b/src/datavisualization/doc/qtdatavis3d.qdocconf @@ -49,4 +49,5 @@ navigation.landingpage = Qt Data Visualization navigation.cppclassespage = Qt Data Visualization C++ Classes navigation.qmltypespage = Qt Data Visualization QML Types -manifestmeta.highlighted.names += "QtDataVisualization/Bars Example" +manifestmeta.highlighted.names = "QtDataVisualization/Bars Example" \ + "QtDataVisualization/Qt Quick 2 Surface Multiseries Example" diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 9fa1eeb8..cad9b97c 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1154,7 +1154,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) { |