HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2696:85326bf48cb4

Fix point label position for QXYSeries...

Titta Heikkala -

r2696:85326bf48cb4

parent child

Context file:

r2696:85326bf48cb4

src/linechart/linechartitem.cpp +1 -1

                 }
                 if (m_pointLabelsVisible)
-                    m_series->d_func()->drawSeriesPointLabels(painter, m_points);
+                    m_series->d_func()->drawSeriesPointLabels(painter, m_points, m_linePen.width() / 2);
                 painter->restore();

src/scatterchart/scatterchartitem.cpp +5 -2

                 painter->save();
                 painter->setClipRect(clipRect);
-                if (m_pointLabelsVisible)
+                if (m_pointLabelsVisible) {
-                    m_series->d_func()->drawSeriesPointLabels(painter, m_points);
+                    m_series->d_func()->drawSeriesPointLabels(painter, m_points,
+                                                              m_series->markerSize() / 2
+                                                              + m_series->pen().width());
+                }
                 painter->restore();
             }

src/splinechart/splinechartitem.cpp +1 -1

                 }
                 if (m_pointLabelsVisible)
-                    m_series->d_func()->drawSeriesPointLabels(painter, m_points);
+                    m_series->d_func()->drawSeriesPointLabels(painter, m_points, m_linePen.width() / 2);
                 painter->restore();
             }

src/xychart/qxyseries.cpp +4 -3

                 QAbstractSeriesPrivate::initializeAnimations(options);
             }
-            void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points)
+            void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points,
+                                                         const int offset)
             {
                 static const QString xPointTag(QLatin1String("@xPoint"));
                 static const QString yPointTag(QLatin1String("@yPoint"));
-                const int labelOffset = 2;
+                const int labelOffset = offset + 2;
                 painter->setFont(m_pointLabelsFont);
                 painter->setPen(QPen(m_pointLabelsColor));
                     int pointLabelWidth = fm.width(pointLabel);
                     QPointF position(points.at(i));
                     position.setX(position.x() - pointLabelWidth / 2);
-                    position.setY(position.y() - painter->pen().width() / 2 - labelOffset);
+                    position.setY(position.y() - labelOffset);
                     painter->drawText(position, pointLabel);
                 }

src/xychart/qxyseries_p.h +2 -1

                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const;
-                void drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points);
+                void drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points,
+                                           const int offset = 0);
             Q_SIGNALS:
                 void updated();

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages