summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJere Tuliniemi <jere.tuliniemi@qt.io>2022-06-14 12:15:24 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-14 13:27:50 +0000
commitde49cd36d8a7e31d95ff92da7397d2470e2419bf (patch)
treeced19110e6cb8f0372c7c24539cc2a681a3b7ba3 /src
parent0996c21732aa23c9b19f561c96a7bb3678cb581b (diff)
Fix axis vanishing with specific values
Charting values 1000000000000 and 1000000000001 with QValueAxis would not work since qFuzzyCompare fails with those values. Fixes: QTBUG-102392 Change-Id: I06dd9b1a86da97d7cc5a59c7fd3696a8165c6205 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 14688ccb30d28273c1d4f2c245e9fa07442151ed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/charts/axis/cartesianchartaxis.cpp2
-rw-r--r--src/charts/axis/chartaxiselement.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp
index d428dd5e..df05bbcc 100644
--- a/src/charts/axis/cartesianchartaxis.cpp
+++ b/src/charts/axis/cartesianchartaxis.cpp
@@ -274,7 +274,7 @@ bool CartesianChartAxis::emptyAxis() const
{
return axisGeometry().isEmpty()
|| gridGeometry().isEmpty()
- || qFuzzyCompare(min(), max());
+ || qFuzzyIsNull(max() - min());
}
void CartesianChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp
index 5701f55c..eada296d 100644
--- a/src/charts/axis/chartaxiselement.cpp
+++ b/src/charts/axis/chartaxiselement.cpp
@@ -373,7 +373,7 @@ bool ChartAxisElement::emptyAxis() const
{
return axisGeometry().isEmpty()
|| gridGeometry().isEmpty()
- || qFuzzyCompare(min(), max());
+ || qFuzzyIsNull(max() - min());
}
qreal ChartAxisElement::min() const