diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:57 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:57 +0200 |
| commit | b92958a299221678ae3cac4d57d1a67cbaf0270d (patch) | |
| tree | 6c3b6c7916f3c46cf9d81514968856d74dd137fc /src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp | |
| parent | 26277a94e10b9bb542017be369c95f399eba6213 (diff) | |
| parent | 88e67e7686fa564e81a770a18879cc281e620222 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6d6b7e405d4023a17e49c001040894980dca0c95
Diffstat (limited to 'src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp')
| -rw-r--r-- | src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index bc5bf97f..a8ef0aa5 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -59,7 +59,7 @@ QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const return points; qreal adjustedMin = min() + 0.5; - qreal offset = (qCeil(adjustedMin) - adjustedMin) * delta; + qreal offset = (qRound(adjustedMin) - adjustedMin) * delta; int count = qFloor(range); if (count < 1) @@ -80,7 +80,7 @@ QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& la qreal d = (max() - min()) / gridRect.height(); for (int i = 0; i < layout.count() - 1; ++i) { - qreal x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5)); + int x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5)); if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) { result << m_categoriesAxis->categories().at(x); } else { |