HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r413:afa09ce7f031

Pie now actually withs the given rectangle and does not go over

Jani Honkonen -

r413:afa09ce7f031

parent child

Context file:

r413:afa09ce7f031

src/piechart/piepresenter.cpp +12 -2

                 foreach (QPieSlice* s, m_series->m_slices) {
                     // calculate the farthest point in the slice from the pie center
+                    // the arm
                     qreal centerAngle = s->m_startAngle + (s->m_angleSpan / 2);
-                    qreal len = pieRadius + s->labelArmLength() + s->explodeDistance();
+                    qreal len = pieRadius + PIESLICE_LABEL_GAP + s->labelArmLength() + s->explodeDistance();
                     QPointF dp(qSin(centerAngle*(PI/180)) * len, -qCos(centerAngle*(PI/180)) * len);
                     QPointF p = pieRect.center() + dp;
-                    // TODO: consider the label text
+                    // the label text
+                    QFontMetricsF fm(s->labelFont());
+                    QRectF labelRect = fm.boundingRect(s->label());
+                    if (centerAngle < 90 || centerAngle > 270)
+                        p += QPointF(0, -labelRect.height());
+                    if (centerAngle < 180)
+                        p += QPointF(labelRect.width(), 0);
+                    else
+                        p += QPointF(-labelRect.width(), 0);
                     // calculate how much the radius must get smaller to fit that point in the base rectangle
                     qreal dt = m_rect.top() - p.y();

src/piechart/pieslice.cpp +1 -1

                 // update label position
                 qreal radius = rect.height() / 2;
-                QPointF edgeCenter = rect.center() + offset(centerAngle, radius + 5);
+                QPointF edgeCenter = rect.center() + offset(centerAngle, radius + PIESLICE_LABEL_GAP);
                 m_slicelabel->setArmStartPoint(edgeCenter);
                 m_slicelabel->setArmAngle(centerAngle);
                 m_slicelabel->updateGeometry();

src/piechart/pieslice_p.h +2 0

             #include <QColor>
             #include <QPen>
+            #define PIESLICE_LABEL_GAP 5
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PiePresenter;
             class PieSliceLabel;

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