Replace code with simpler but equivalent code

The if-branching is unnecessary because
  ceil(a-b) == -floor(b-a)

Also add comments to clarify subtle differences in seemingly
identical code snippets.

Fixes: QTBUG-103906
Change-Id: Idfd72e4aecf53805183f5b2741336d805fbfbb6a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 0d1f32381d70f0f551fd3a02040650938cd8ac6d)

1 files changed, 8 insertions, 12 deletions

diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp
index 17f36e61..9d49123f 100644
--- a/src/charts/axis/chartaxiselement.cpp
+++ b/src/charts/axis/chartaxiselement.cpp
@@ -430,13 +430,11 @@ QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks,
                 labels << presenter()->numberToString(value, 'f', n);
             }
         } else {
-            qreal value = tickAnchor;
-            if (value > min)
-                value = value - int((value - min) / tickInterval) * tickInterval;
-            else
-                value = value + qCeil((min - value) / tickInterval) * tickInterval;
+            const qreal ticksFromAnchor = (tickAnchor - min) / tickInterval;
+            const qreal firstMajorTick = tickAnchor - std::floor(ticksFromAnchor) * tickInterval;
 
-            while (value <= max || qFuzzyCompare(value, max)) {
+            qreal value = firstMajorTick;
+            while (value <= max) {
                 labels << presenter()->numberToString(value, 'f', n);
                 value += tickInterval;
             }
@@ -472,13 +470,11 @@ QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks,
                 labels << formatLabel(formatSpec, array, value, precision, preStr, postStr);
             }
         } else {
-            qreal value = tickAnchor;
-            if (value > min)
-                value = value - int((value - min) / tickInterval) * tickInterval;
-            else
-                value = value + qCeil((min - value) / tickInterval) * tickInterval;
+            const qreal ticksFromAnchor = (tickAnchor - min) / tickInterval;
+            const qreal firstMajorTick = tickAnchor - std::floor(ticksFromAnchor) * tickInterval;
 
-            while (value <= max || qFuzzyCompare(value, max)) {
+            qreal value = firstMajorTick;
+            while (value <= max) {
                 labels << formatLabel(formatSpec, array, value, precision, preStr, postStr);
                 value += tickInterval;
             }