HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1712:0c76e21b1f34

Added one more type of label placing on Pie chart

Marek Rosa -

r1712:0c76e21b1f34

parent child

Context file:

r1712:0c76e21b1f34

Collapse all files

demos/piechartcustomization/mainwidget.cpp +2 0

                 m_labelPosition = new QComboBox(this);
                 m_labelPosition->addItem("Outside", QPieSlice::LabelOutside);
                 m_labelPosition->addItem("Inside", QPieSlice::LabelInside);
+                m_labelPosition->addItem("Inside tangential", QPieSlice::LabelInsideTangential);
+                m_labelPosition->addItem("Inside normal", QPieSlice::LabelInsideNormal);
                 QFormLayout* sliceSettingsLayout = new QFormLayout();
                 sliceSettingsLayout->addRow("Label", m_sliceName);

examples/customchart/main.cpp +1 -1

             //![1]
                 QLineSeries* series = new QLineSeries();
-                *series << QPointF(0, 6) << QPointF(9, 4) << QPointF(15, 20) << QPointF(25, 12) << QPointF(39, 36);
+                *series << QPointF(0, 6) << QPointF(9, 4) << QPointF(15, 20) << QPointF(25, 12) << QPointF(29, 26);
                 QChart* chart = new QChart();
                 chart->legend()->hide();
                 chart->addSeries(series);

examples/donut/widget.cpp +2 -1

                     }
                     m_donuts.append(donut);
                     qreal phase = qrand() % 180;
+                    donut->setLabelsPosition(QPieSlice::LabelInsideTangential);
                     donut->setPieStartAngle(phase);
                     donut->setPieEndAngle(360 + phase);
                     chartView->chart()->addSeries(donut);
                 updateTimer = new QTimer(this);
                 connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateRotation()));
-                updateTimer->start(750);
+                updateTimer->start(1500);
             }
             Widget::~Widget()

examples/donutdrilldown/widget.cpp +5 -6

                 chartView->chart()->setAnimationOptions(QChart::AllAnimations);
                 mainData = new QPieSeries;
+                mainData->setPieSize(0.6);
                 for (int j = 0; j < 4; j++) {
                     // create new slice for the mainData
                     QPieSlice *slice = new QPieSlice;
-                    slice->setLabelPosition(QPieSlice::LabelInside);
                     slice->setLabelColor(Qt::white);
                     mainData->append(slice);
                     // create a new detailed data for the slice
                     QPieSeries *donut = new QPieSeries;
                     donut->setDonut();
-                    donut->setLabelsVisible();
                     donut->setDonutInnerSize(mainData->pieSize());
-                    donut->setPieSize(mainData->pieSize() + 0.2);
+                    donut->setPieSize(mainData->pieSize() + 0.15);
                     // when mainData slice is redrawn make sure the detailed data slices are aligned with it
                     connect(slice, SIGNAL(startAngleChanged()), this, SLOT(updatedStartAngle()));
                         qreal value = 10 + qrand() % 100;
                         QPieSlice *slice = new QPieSlice(QString("%1").arg(value), value);
                         donut->append(slice);
-                        donut->slices().last()->setLabelVisible(true);
-                        donut->slices().last()->setLabelColor(Qt::white);
                     }
+                    donut->setLabelsPosition(QPieSlice::LabelOutside);
+                    donut->setLabelsVisible();
                     detailedData.append(donut);
                     // update the value and label of mainData
                 }
                 mainData->setLabelsVisible();
+                mainData->setLabelsPosition(QPieSlice::LabelInside);
                 chartView->chart()->addSeries(mainData);
                 for (int i = 0; i < detailedData.count(); i++)
                     chartView->chart()->addSeries(detailedData.at(i));

src/piechart/piesliceitem.cpp +37 -13

@@ -84,17 +84,33 void PieSliceItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*op
84	painter->setPen(m_data.m_labelBrush.color());	84	painter->setPen(m_data.m_labelBrush.color());
85	painter->setBrush(m_data.m_labelBrush);	85	painter->setBrush(m_data.m_labelBrush);
86	painter->setFont(m_data.m_labelFont);	86	painter->setFont(m_data.m_labelFont);
87	if (m_data.m_donut) {	87
88	painter->translate(m_labelTextRect.center());	88	switch (m_data.m_labelPosition)
89	painter->rotate(m_data.m_startAngle + m_data.m_angleSpan / 2);	89	{
90	painter->drawText(-m_labelTextRect.width() / 2, -m_labelTextRect.height() / 2, m_labelTextRect.width(), m_labelTextRect.height(), Qt::AlignCenter, m_data.m_labelText);	90	case QPieSlice::LabelOutside:
91	} else if (m_data.m_labelPosition == QPieSlice::LabelOutside) {
92	painter->setClipRect(parentItem()->boundingRect());	91	painter->setClipRect(parentItem()->boundingRect());
93	painter->strokePath(m_labelArmPath, m_data.m_labelBrush.color());	92	painter->strokePath(m_labelArmPath, m_data.m_labelBrush.color());
94	painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);	93	painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);
95	} else { // QPieSlice::LabelInside	94	break;
		95	case QPieSlice::LabelInside:
96	painter->setClipPath(m_slicePath);	96	painter->setClipPath(m_slicePath);
97	painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);	97	painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);
		98	break;
		99	case QPieSlice::LabelInsideTangential:
		100	painter->setClipPath(m_slicePath);
		101	painter->translate(m_labelTextRect.center());
		102	painter->rotate(m_data.m_startAngle + m_data.m_angleSpan / 2);
		103	painter->drawText(-m_labelTextRect.width() / 2, -m_labelTextRect.height() / 2, m_labelTextRect.width(), m_labelTextRect.height(), Qt::AlignCenter, m_data.m_labelText);
		104	break;
		105	case QPieSlice::LabelInsideNormal:
		106	painter->setClipPath(m_slicePath);
		107	painter->translate(m_labelTextRect.center());
		108	if (m_data.m_startAngle + m_data.m_angleSpan / 2 < 180)
		109	painter->rotate(m_data.m_startAngle + m_data.m_angleSpan / 2 - 90);
		110	else
		111	painter->rotate(m_data.m_startAngle + m_data.m_angleSpan / 2 + 90);
		112	painter->drawText(-m_labelTextRect.width() / 2, -m_labelTextRect.height() / 2, m_labelTextRect.width(), m_labelTextRect.height(), Qt::AlignCenter, m_data.m_labelText);
		113	break;
98	}	114	}
99		115
100	painter->restore();	116	painter->restore();
@@ -146,14 +162,22 void PieSliceItem::updateGeometry()
146	m_labelArmPath = labelArmPath(armStart, centerAngle, m_data.m_radius * m_data.m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);	162	m_labelArmPath = labelArmPath(armStart, centerAngle, m_data.m_radius * m_data.m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
147		163
148	// text position	164	// text position
149	if (m_data.m_~~donut~~) {	165	switch (m_data.m_labelPosition)
150	QPointF donutCenter = m_data.m_center + offset(centerAngle, m_data.m_innerRadius + (m_data.m_radius - m_data.m_innerRadius) / 2);	166	{
151	m_labelTextRect.moveCenter(donutCenter);	167	case QPieSlice::LabelOutside:
152	} else if (m_data.m_labelPosition == QPieSlice::LabelOutside) {
153	m_labelTextRect.moveBottomLeft(labelTextStart);	168	m_labelTextRect.moveBottomLeft(labelTextStart);
154	} else {// QPieSlice::LabelInside	169	break;
155	QPointF sliceCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);	170	case QPieSlice::LabelInside:
156	m_labelTextRect.moveCenter(sliceCenter);	171	case QPieSlice::LabelInsideTangential:
		172	case QPieSlice::LabelInsideNormal:{
		173	QPointF textCenter;
		174	if (m_data.m_donut)
		175	textCenter = m_data.m_center + offset(centerAngle, m_data.m_innerRadius + (m_data.m_radius - m_data.m_innerRadius) / 2);
		176	else
		177	textCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);
		178	m_labelTextRect.moveCenter(textCenter);
		179	break;
		180	}
157	}	181	}
158		182
159	// bounding rect	183	// bounding rect

src/piechart/qpieseries.cpp +7 0

                     s->setLabelVisible(visible);
             }
+            void QPieSeries::setLabelsPosition(QPieSlice::LabelPosition position)
+            {
+                Q_D(QPieSeries);
+                foreach (QPieSlice* s, d->m_slices)
+                    s->setLabelPosition(position);
+            }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/piechart/qpieseries.h +3 -1

             #define PIESERIES_H
             #include <qabstractseries.h>
+            #include <QPieSlice>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSeriesPrivate;
-            class QPieSlice;
+            //class QPieSlice;
             class QTCOMMERCIALCHART_EXPORT QPieSeries : public QAbstractSeries
             {
                 qreal pieEndAngle() const;
                 void setLabelsVisible(bool visible = true);
+                void setLabelsPosition(QPieSlice::LabelPosition position);
             Q_SIGNALS:
                 void added(QList<QPieSlice*> slices);

src/piechart/qpieslice.h +3 -1

             public:
                 enum LabelPosition {
                     LabelOutside,
-                    LabelInside
+                    LabelInside,
+                    LabelInsideTangential,
+                    LabelInsideNormal
                 };
             public:

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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