diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:16:32 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:16:32 +0100 |
commit | 6b3a1a975e1f0237e78c3d329411c15f00577b01 (patch) | |
tree | 214ec9eda59fa64bf0b877a1c934e9aed2bf1469 /src/charts/xychart | |
parent | 2a74ffa1721d512f1c22a3d33af0ddbbdf953a90 (diff) | |
parent | afd077876bd5203944a3ed73f4f1fb998f795ee2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I82091207292204b025b7cf3dcc30d38d24ff5455
Diffstat (limited to 'src/charts/xychart')
-rw-r--r-- | src/charts/xychart/qxyseries.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp index 40382d15..c85d5340 100644 --- a/src/charts/xychart/qxyseries.cpp +++ b/src/charts/xychart/qxyseries.cpp @@ -1001,6 +1001,9 @@ void QXYSeriesPrivate::initializeAnimations(QtCharts::QChart::AnimationOptions o void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points, const int offset) { + if (points.size() == 0) + return; + static const QString xPointTag(QLatin1String("@xPoint")); static const QString yPointTag(QLatin1String("@yPoint")); const int labelOffset = offset + 2; @@ -1010,7 +1013,8 @@ void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QP QFontMetrics fm(painter->font()); // m_points is used for the label here as it has the series point information // points variable passed is used for positioning because it has the coordinates - for (int i(0); i < m_points.size(); i++) { + const int pointCount = qMin(points.size(), m_points.size()); + for (int i(0); i < pointCount; i++) { QString pointLabel = m_pointLabelsFormat; pointLabel.replace(xPointTag, presenter()->numberToString(m_points.at(i).x())); pointLabel.replace(yPointTag, presenter()->numberToString(m_points.at(i).y())); |