summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJere Tuliniemi <jere.tuliniemi@qt.io>2022-06-14 12:15:24 +0300
committerJere Tuliniemi <jere.tuliniemi@qt.io>2022-07-26 07:25:12 +0000
commitf7d000029ce55101072ccfbd2451fd800b61695a (patch)
tree0011678b4fe316d501d6cb813b4d2ccfcb96c70b
parent47c24e5f05a65158301f1ba96a90af332a08870e (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: Janne Koskinen <janne.p.koskinen@qt.io>
-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 f24c8911..9f913df6 100644
--- a/src/charts/axis/cartesianchartaxis.cpp
+++ b/src/charts/axis/cartesianchartaxis.cpp
@@ -248,7 +248,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 cf610698..c230bd6a 100644
--- a/src/charts/axis/chartaxiselement.cpp
+++ b/src/charts/axis/chartaxiselement.cpp
@@ -345,7 +345,7 @@ bool ChartAxisElement::emptyAxis() const
{
return axisGeometry().isEmpty()
|| gridGeometry().isEmpty()
- || qFuzzyCompare(min(), max());
+ || qFuzzyIsNull(max() - min());
}
qreal ChartAxisElement::min() const