diff options
Diffstat (limited to 'src/charts/axis')
7 files changed, 35 insertions, 30 deletions
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index 00db60eb..3d245b95 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -48,7 +48,7 @@ QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const return points; qreal adjustedMin = min() + 0.5; - qreal offset = (ceil(adjustedMin) - adjustedMin) * delta; + qreal offset = (qCeil(adjustedMin) - adjustedMin) * delta; int count = qFloor(range); if (count < 1) diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 536ca59e..620d876a 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -48,7 +48,7 @@ QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const return points; qreal adjustedMin = min() + 0.5; - qreal offset = (ceil(adjustedMin) - adjustedMin) * delta; + qreal offset = (qCeil(adjustedMin) - adjustedMin) * delta; int count = qFloor(range); if (count < 1) diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp index be07d143..d2ff57fc 100644 --- a/src/charts/axis/chartaxiselement.cpp +++ b/src/charts/axis/chartaxiselement.cpp @@ -23,6 +23,7 @@ #include <QtCore/QtMath> #include <QtCore/QDateTime> #include <QtGui/QTextDocument> +#include <cmath> QT_CHARTS_BEGIN_NAMESPACE @@ -271,7 +272,7 @@ QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks, return labels; if (format.isNull()) { - int n = qMax(int(-qFloor(log10((max - min) / (ticks - 1)))), 0) + 1; + int n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0) + 1; for (int i = 0; i < ticks; i++) { qreal value = min + (i * (max - min) / (ticks - 1)); labels << presenter()->numberToString(value, 'f', n); @@ -318,14 +319,14 @@ QStringList ChartAxisElement::createLogValueLabels(qreal min, qreal max, qreal b int firstTick; if (base > 1) - firstTick = ceil(log10(min) / log10(base)); + firstTick = qCeil(std::log10(min) / std::log10(base)); else - firstTick = ceil(log10(max) / log10(base)); + firstTick = qCeil(std::log10(max) / std::log10(base)); if (format.isNull()) { int n = 0; if (ticks > 1) - n = qMax(int(-qFloor(log10((max - min) / (ticks - 1)))), 0); + n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0); n++; for (int i = firstTick; i < ticks + firstTick; i++) { qreal value = qPow(base, i); @@ -371,7 +372,7 @@ QStringList ChartAxisElement::createDateTimeLabels(qreal min, qreal max,int tick if (max <= min || ticks < 1) return labels; - int n = qMax(int(-floor(log10((max - min) / (ticks - 1)))), 0); + int n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0); n++; for (int i = 0; i < ticks; i++) { qreal value = min + (i * (max - min) / (ticks - 1)); diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp index 30d1a6ba..ed401eda 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp @@ -23,6 +23,7 @@ #include <QtWidgets/QGraphicsLayout> #include <QtCore/QtMath> #include <QtCore/QDebug> +#include <cmath> QT_CHARTS_BEGIN_NAMESPACE @@ -42,11 +43,11 @@ QVector<qreal> ChartLogValueAxisX::calculateLayout() const { QVector<qreal> points; - qreal logMax = log10(m_axis->max()) / log10(m_axis->base()); - qreal logMin = log10(m_axis->min()) / log10(m_axis->base()); + qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base()); + qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base()); qreal leftEdge = logMin < logMax ? logMin : logMax; - qreal ceilEdge = ceil(leftEdge); - int tickCount = qAbs(ceil(logMax) - ceil(logMin)); + qreal ceilEdge = qCeil(leftEdge); + int tickCount = qAbs(qCeil(logMax) - qCeil(logMin)); points.resize(tickCount); const QRectF &gridRect = gridGeometry(); @@ -86,9 +87,9 @@ QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint QSizeF base = HorizontalAxis::sizeHint(which, constraint); QStringList ticksList; - qreal logMax = log10(m_axis->max()) / log10(m_axis->base()); - qreal logMin = log10(m_axis->min()) / log10(m_axis->base()); - int tickCount = qAbs(ceil(logMax) - ceil(logMin)); + qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base()); + qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base()); + int tickCount = qAbs(qCeil(logMax) - qCeil(logMin)); if (m_axis->max() > m_axis->min() && tickCount > 0) ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat()); else diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp index 0fc7329c..f0567767 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp @@ -23,6 +23,7 @@ #include <QtWidgets/QGraphicsLayout> #include <QtCore/QtMath> #include <QtCore/QDebug> +#include <cmath> QT_CHARTS_BEGIN_NAMESPACE @@ -41,11 +42,11 @@ ChartLogValueAxisY::~ChartLogValueAxisY() QVector<qreal> ChartLogValueAxisY::calculateLayout() const { QVector<qreal> points; - qreal logMax = log10(m_axis->max()) / log10(m_axis->base()); - qreal logMin = log10(m_axis->min()) / log10(m_axis->base()); + qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base()); + qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base()); qreal leftEdge = logMin < logMax ? logMin : logMax; - qreal ceilEdge = ceil(leftEdge); - int tickCount = qAbs(ceil(logMax) - ceil(logMin)); + qreal ceilEdge = qCeil(leftEdge); + int tickCount = qAbs(qCeil(logMax) - qCeil(logMin)); points.resize(tickCount); const QRectF &gridRect = gridGeometry(); @@ -86,9 +87,9 @@ QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint QSizeF base = VerticalAxis::sizeHint(which, constraint); QStringList ticksList; - qreal logMax = log10(m_axis->max()) / log10(m_axis->base()); - qreal logMin = log10(m_axis->min()) / log10(m_axis->base()); - int tickCount = qAbs(ceil(logMax) - ceil(logMin)); + qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base()); + qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base()); + int tickCount = qAbs(qCeil(logMax) - qCeil(logMin)); if (m_axis->max() > m_axis->min() && tickCount > 0) ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat()); else diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp index 7e75764b..8da03cfd 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp @@ -22,6 +22,7 @@ #include <QtCharts/QLogValueAxis> #include <QtCore/QtMath> #include <QtCore/QDebug> +#include <cmath> QT_CHARTS_BEGIN_NAMESPACE @@ -39,12 +40,12 @@ PolarChartLogValueAxisAngular::~PolarChartLogValueAxisAngular() QVector<qreal> PolarChartLogValueAxisAngular::calculateLayout() const { QLogValueAxis *logValueAxis = static_cast<QLogValueAxis *>(axis()); - const qreal logMax = log10(logValueAxis->max()) / log10(logValueAxis->base()); - const qreal logMin = log10(logValueAxis->min()) / log10(logValueAxis->base()); + const qreal logMax = std::log10(logValueAxis->max()) / std::log10(logValueAxis->base()); + const qreal logMin = std::log10(logValueAxis->min()) / std::log10(logValueAxis->base()); const qreal startEdge = logMin < logMax ? logMin : logMax; const qreal delta = 360.0 / qAbs(logMax - logMin); - const qreal initialSpan = (ceil(startEdge) - startEdge) * delta; - int tickCount = qAbs(ceil(logMax) - ceil(logMin)); + const qreal initialSpan = (qCeil(startEdge) - startEdge) * delta; + int tickCount = qAbs(qCeil(logMax) - qCeil(logMin)); QVector<qreal> points; points.resize(tickCount); diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp index 9c9fa030..97643c0d 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp @@ -22,6 +22,7 @@ #include <QtCharts/QLogValueAxis> #include <QtCore/QtMath> #include <QtCore/QDebug> +#include <cmath> QT_CHARTS_BEGIN_NAMESPACE @@ -39,16 +40,16 @@ PolarChartLogValueAxisRadial::~PolarChartLogValueAxisRadial() QVector<qreal> PolarChartLogValueAxisRadial::calculateLayout() const { QLogValueAxis *logValueAxis = static_cast<QLogValueAxis *>(axis()); - const qreal logMax = log10(logValueAxis->max()) / log10(logValueAxis->base()); - const qreal logMin = log10(logValueAxis->min()) / log10(logValueAxis->base()); + const qreal logMax = std::log10(logValueAxis->max()) / std::log10(logValueAxis->base()); + const qreal logMin = std::log10(logValueAxis->min()) / std::log10(logValueAxis->base()); const qreal innerEdge = logMin < logMax ? logMin : logMax; const qreal outerEdge = logMin > logMax ? logMin : logMax; const qreal delta = (axisGeometry().width() / 2.0) / qAbs(logMax - logMin); - const qreal initialSpan = (ceil(innerEdge) - innerEdge) * delta; - int tickCount = qAbs(ceil(logMax) - ceil(logMin)); + const qreal initialSpan = (qCeil(innerEdge) - innerEdge) * delta; + int tickCount = qAbs(qCeil(logMax) - qCeil(logMin)); // Extra tick if outer edge is exactly at the tick - if (outerEdge == ceil(outerEdge)) + if (outerEdge == qCeil(outerEdge)) tickCount++; QVector<qreal> points; |