diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/charts/legendmarkers/mainwidget.cpp | 2 | ||||
| -rw-r--r-- | src/charts/domain/polardomain.cpp | 4 | ||||
| -rw-r--r-- | src/charts/piechart/piesliceitem.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index b1c22d3b..138038d5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.10.0 diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp index 78f8bc74..2cfe570e 100644 --- a/examples/charts/legendmarkers/mainwidget.cpp +++ b/examples/charts/legendmarkers/mainwidget.cpp @@ -82,7 +82,7 @@ void MainWidget::addSeries() int offset = m_chart->series().count(); for (int i = 0; i < 360; i++) { qreal x = offset * 20 + i; - data.append(QPointF(i, qSin(2.0 * 3.141592 * x / 360.0))); + data.append(QPointF(i, qSin(qDegreesToRadians(x)))); } series->append(data); diff --git a/src/charts/domain/polardomain.cpp b/src/charts/domain/polardomain.cpp index 1d5154e4..3c6e6b57 100644 --- a/src/charts/domain/polardomain.cpp +++ b/src/charts/domain/polardomain.cpp @@ -89,8 +89,8 @@ QVector<QPointF> PolarDomain::calculateGeometryPoints(const QVector<QPointF> &ve QPointF PolarDomain::polarCoordinateToPoint(qreal angularCoordinate, qreal radialCoordinate) const { - qreal dx = qSin(angularCoordinate * (M_PI / 180)) * radialCoordinate; - qreal dy = qCos(angularCoordinate * (M_PI / 180)) * radialCoordinate; + qreal dx = qSin(qDegreesToRadians(angularCoordinate)) * radialCoordinate; + qreal dy = qCos(qDegreesToRadians(angularCoordinate)) * radialCoordinate; return QPointF(dx, -dy); } diff --git a/src/charts/piechart/piesliceitem.cpp b/src/charts/piechart/piesliceitem.cpp index 19d6e4ef..05a790e4 100644 --- a/src/charts/piechart/piesliceitem.cpp +++ b/src/charts/piechart/piesliceitem.cpp @@ -43,8 +43,8 @@ QT_CHARTS_BEGIN_NAMESPACE QPointF offset(qreal angle, qreal length) { - qreal dx = qSin(angle * (M_PI / 180)) * length; - qreal dy = qCos(angle * (M_PI / 180)) * length; + qreal dx = qSin(qDegreesToRadians(angle)) * length; + qreal dy = qCos(qDegreesToRadians(angle)) * length; return QPointF(dx, -dy); } |