HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r209:c977a59b6d90

Fix issue with pie label not drawn correctly when first created

Jani Honkonen -

r209:c977a59b6d90

parent child

Context file:

r209:c977a59b6d90

src/piechart/piepresenter.cpp +2 0

                 PieSlice *slice = new PieSlice(this);
                 slice->setPieRect(m_pieRect);
                 slice->updateData(sliceData);
+                slice->updateGeometry();
+                slice->update();
                 m_slices.insert(sliceData, slice);
                 // connect signals

src/piechart/pieslice.cpp +3 -5

                 // update label position
                 qreal radius = rect.height() / 2;
                 QPointF edgeCenter = rect.center() + offset(centerAngle, radius + 5);
                 m_slicelabel->setArmStartPoint(edgeCenter);
                 m_slicelabel->setArmAngle(centerAngle);
                 m_slicelabel->updateGeometry();
                 m_pen = sliceData->pen();
                 m_brush = sliceData->brush();
-                updateGeometry();
-                update();
                 m_slicelabel->setVisible(sliceData->isLabelVisible());
                 m_slicelabel->setText(sliceData->label());
                 m_slicelabel->setPen(sliceData->labelPen());
                 m_slicelabel->setFont(sliceData->labelFont());
                 m_slicelabel->setArmLength(sliceData->labelArmLenght());
-                m_slicelabel->updateGeometry(); // text size & font modifies the geometry
+                updateGeometry();
+                update();
                 m_slicelabel->update();
             }

src/piechart/pieslicelabel.cpp +9 -3

             #include <QPainter>
             #include <qmath.h>
             #include <QGraphicsTextItem>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             #define PI 3.14159265
             PieSliceLabel::PieSliceLabel(QGraphicsItem* parent)
-                :QGraphicsItem(parent)
+                :QGraphicsItem(parent),
+                m_armAngle(0),
+                m_armLength(0)
             {
-                // set defaults
-                m_pen = QPen(Qt::black);
             }
             void PieSliceLabel::paint(QPainter *painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/)
                 // TODO: do we need a pen for text?
                 painter->setFont(m_font);
                 painter->drawText(m_textRect, m_text);
+                //qDebug() << "PieSliceLabel::paint" << m_text << m_textRect;
             }
             void PieSliceLabel::updateGeometry()
                 m_armPath = path;
                 m_textRect = textRect;
                 m_rect = path.boundingRect().united(m_textRect);
+                //qDebug() << "PieSliceLabel::updateGeometry" << m_text << m_armStartPoint << m_armLength << m_armAngle << m_textRect;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

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