HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1450:7bf1a442df6a

pie: add label position to slice

Jani Honkonen -

r1450:7bf1a442df6a

parent child

Context file:

r1450:7bf1a442df6a

Collapse all files

demos/piechartcustomization/mainwidget.cpp +10 -1

                 m_font = new QPushButton();
                 m_labelBrush = new QPushButton();
                 m_labelBrushTool = new BrushTool("Label brush", this);
+                m_labelPosition = new QComboBox(this);
+                m_labelPosition->addItem("Outside", QPieSlice::LabelOutside);
+                m_labelPosition->addItem("Inside", QPieSlice::LabelInside);
                 QPushButton *removeSlice = new QPushButton("Remove slice");
                 QFormLayout* sliceSettingsLayout = new QFormLayout();
                 sliceSettingsLayout->addRow("Brush", m_brush);
                 sliceSettingsLayout->addRow("Label visible", m_sliceLabelVisible);
                 sliceSettingsLayout->addRow("Label font", m_font);
-                sliceSettingsLayout->addRow("Label pen", m_labelBrush);
+                sliceSettingsLayout->addRow("Label brush", m_labelBrush);
+                sliceSettingsLayout->addRow("Label position", m_labelPosition);
                 sliceSettingsLayout->addRow("Label arm length", m_sliceLabelArmFactor);
                 sliceSettingsLayout->addRow("Exploded", m_sliceExploded);
                 sliceSettingsLayout->addRow("Explode distance", m_sliceExplodedFactor);
                 connect(m_sliceLabelArmFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSliceSettings()));
                 connect(m_sliceExploded, SIGNAL(toggled(bool)), this, SLOT(updateSliceSettings()));
                 connect(m_sliceExplodedFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSliceSettings()));
+                connect(m_labelPosition, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSliceSettings()));
                 connect(removeSlice, SIGNAL(clicked()), this, SLOT(removeSlice()));
                 // create chart view
                 m_slice->setLabelBrush(m_labelBrushTool->brush());
                 m_slice->setLabelVisible(m_sliceLabelVisible->isChecked());
                 m_slice->setLabelArmLengthFactor(m_sliceLabelArmFactor->value());
+                m_slice->setLabelPosition((QPieSlice::LabelPosition)m_labelPosition->currentIndex()); // assumes that index is in sync with the enum
                 m_slice->setExploded(m_sliceExploded->isChecked());
                 m_slice->setExplodeDistanceFactor(m_sliceExplodedFactor->value());
                 m_sliceLabelArmFactor->blockSignals(true);
                 m_sliceLabelArmFactor->setValue(slice->labelArmLengthFactor());
                 m_sliceLabelArmFactor->blockSignals(false);
+                m_labelPosition->blockSignals(true);
+                m_labelPosition->setCurrentIndex(slice->labelPosition()); // assumes that index is in sync with the enum
+                m_labelPosition->blockSignals(false);
                 // exploded
                 m_sliceExploded->blockSignals(true);

demos/piechartcustomization/mainwidget.h +1 0

                 PenTool *m_penTool;
                 QPushButton *m_font;
                 QPushButton *m_labelBrush;
+                QComboBox *m_labelPosition;
                 BrushTool *m_labelBrushTool;
             };

src/piechart/piechartitem.cpp +1 0

                     connect(slice, SIGNAL(brushChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(labelBrushChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(labelFontChanged()), this, SLOT(handleSliceChanged()));
+                    connect(slice, SIGNAL(labelPositionChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(labelArmLengthFactorChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(explodeDistanceFactorChanged()), this, SLOT(handleSliceChanged()));

src/piechart/pieslicedata_p.h +3 0

                     m_explodeDistanceFactor = 0.15;
                     m_isLabelVisible = false;
+                    m_labelPosition = QPieSlice::LabelOutside;
                     m_labelArmLengthFactor = 0.15;
                     m_percentage = 0;
                     if (m_isLabelVisible != other.m_isLabelVisible ||
                         m_labelText != other.m_labelText ||
                         m_labelFont != other.m_labelFont ||
+                        m_labelPosition != other.m_labelPosition ||
                         !qFuzzyIsNull(m_labelArmLengthFactor - other.m_labelArmLengthFactor) ||
                         m_labelBrush != other.m_labelBrush)
                         return true;
                 bool m_isLabelVisible;
                 QString m_labelText;
                 Themed<QFont> m_labelFont;
+                QPieSlice::LabelPosition m_labelPosition;
                 qreal m_labelArmLengthFactor;
                 Themed<QBrush> m_labelBrush;

src/piechart/piesliceitem.cpp +23 -19

                 if (m_data.m_isLabelVisible) {
                     painter->save();
-                    painter->setClipRect(parentItem()->boundingRect());
                     // Pen for label arm not defined in the QPieSeries api, let's use brush's color instead
                     // Also, the drawText actually uses the pen color for the text color (unlike QGraphicsSimpleTextItem)
                     painter->setPen(m_data.m_labelBrush.color());
-                    painter->drawPath(m_labelArmPath);
+                    painter->setBrush(m_data.m_labelBrush);
                     painter->setFont(m_data.m_labelFont);
-                    painter->drawText(m_labelTextRect.bottomLeft(), m_data.m_labelText);
+                    if (m_data.m_labelPosition == QPieSlice::LabelOutside) {
+                        painter->setClipRect(parentItem()->boundingRect());
+                        painter->strokePath(m_labelArmPath, m_data.m_labelBrush.color());
+                    } else { // QPieSlice::LabelInside
+                        painter->setClipPath(m_slicePath);
+                    }
+                    painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);
                     painter->restore();
                 }
             }
                 prepareGeometryChange();
-                // update slice path
+                // slice path
                 qreal centerAngle;
                 QPointF armStart;
                 m_slicePath = slicePath(m_data.m_center, m_data.m_radius, m_data.m_startAngle, m_data.m_angleSpan, &centerAngle, &armStart);
-                // update text rect
+                // text rect
-                m_labelTextRect = labelTextRect(m_data.m_labelFont, m_data.m_labelText);
+                QFontMetricsF fm(m_data.m_labelFont);
+                m_labelTextRect = QRectF(0, 0, fm.width(m_data.m_labelText), fm.height());
-                // update label arm path
+                // label arm path
                 QPointF labelTextStart;
                 m_labelArmPath = labelArmPath(armStart, centerAngle, m_data.m_radius * m_data.m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
-                // update text position
+                // text position
-                m_labelTextRect.moveBottomLeft(labelTextStart);
+                if (m_data.m_labelPosition == QPieSlice::LabelOutside)
+                    m_labelTextRect.moveBottomLeft(labelTextStart);
+                else {// QPieSlice::LabelInside
+                    QPointF sliceCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);
+                    m_labelTextRect.moveCenter(sliceCenter);
+                }
-                // update bounding rect
+                //  bounding rect
                 if (m_data.m_isLabelVisible)
                     m_boundingRect = m_slicePath.boundingRect().united(m_labelArmPath.boundingRect()).united(m_labelTextRect);
                 else
                      *textStart = parm2;
                 }
-                // elevate the text position a bit so that it does not hit the line
-                *textStart += QPointF(0, -3);
                 QPainterPath path;
                 path.moveTo(start);
                 path.lineTo(parm1);
                 return path;
             }
-            QRectF PieSliceItem::labelTextRect(QFont font, QString text)
-                QFontMetricsF fm(font);
-                return fm.boundingRect(text);
             #include "moc_piesliceitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piesliceitem_p.h 0 -1

                 void updateGeometry();
                 QPainterPath slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal *centerAngle, QPointF *armStart);
                 QPainterPath labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF *textStart);
-                QRectF labelTextRect(QFont font, QString text);
             private:
                 PieSliceData m_data;

src/piechart/qpieslice.cpp +39 0

@@ -39,6 +39,16 QTCOMMERCIALCHART_BEGIN_NAMESPACE
39	*/	39	*/
40		40
41	/*!	41	/*!
		42	\enum QPieSlice::LabelPosition
		43
		44	This enum describes the position of the slice label.
		45
		46	\value LabelOutside Label is outside the slice with an arm.
		47	\value LabelInside Label is centered inside the slice.
		48
		49	*/
		50
		51	/*!
42	\property QPieSlice::label	52	\property QPieSlice::label
43		53
44	Label of the slice.	54	Label of the slice.
@@ -239,6 +249,22 QTCOMMERCIALCHART_BEGIN_NAMESPACE
239	*/	249	*/
240		250
241	/*!	251	/*!
		252	\property QPieSlice::labelPosition
		253
		254	Position of the slice label.
		255
		256	\sa label, labelVisible
		257	*/
		258
		259	/*!
		260	\fn void QPieSlice::labelPositionChanged()
		261
		262	This signal is emitted when the label position of the slice has changed.
		263
		264	\sa labelPosition
		265	*/
		266
		267	/*!
242	\property QPieSlice::labelArmLengthFactor	268	\property QPieSlice::labelArmLengthFactor
243		269
244	Defines the length of the label arm.	270	Defines the length of the label arm.
@@ -438,6 +464,19 void QPieSlice::setExploded(bool exploded)
438	}	464	}
439	}	465	}
440		466
		467	QPieSlice::LabelPosition QPieSlice::labelPosition()
		468	{
		469	return d_ptr->m_data.m_labelPosition;
		470	}
		471
		472	void QPieSlice::setLabelPosition(LabelPosition position)
		473	{
		474	if (d_ptr->m_data.m_labelPosition != position) {
		475	d_ptr->m_data.m_labelPosition = position;
		476	emit labelPositionChanged();
		477	}
		478	}
		479
441	bool QPieSlice::isExploded() const	480	bool QPieSlice::isExploded() const
442	{	481	{
443	return d_ptr->m_data.m_isExploded;	482	return d_ptr->m_data.m_isExploded;

src/piechart/qpieslice.h +12 0

             class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject
             {
                 Q_OBJECT
+                Q_ENUMS(LabelPosition)
                 Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
                 Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
                 Q_PROPERTY(bool labelVisible READ isLabelVisible WRITE setLabelVisible NOTIFY labelVisibleChanged)
+                Q_PROPERTY(LabelPosition labelPosition READ labelPosition WRITE setLabelPosition NOTIFY labelPositionChanged)
                 Q_PROPERTY(bool exploded READ isExploded WRITE setExploded NOTIFY explodedChanged)
                 Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
                 Q_PROPERTY(qreal angleSpan READ angleSpan NOTIFY angleSpanChanged)
             public:
+                enum LabelPosition {
+                    LabelOutside,
+                    LabelInside
+                };
+            public:
                 explicit QPieSlice(QObject *parent = 0);
                 QPieSlice(QString label, qreal value, QObject *parent = 0);
                 virtual ~QPieSlice();
                 void setLabelVisible(bool visible = true);
                 bool isLabelVisible() const;
+                LabelPosition labelPosition();
+                void setLabelPosition(LabelPosition position);
                 void setExploded(bool exploded = true);
                 bool isExploded() const;
                 void labelChanged();
                 void valueChanged();
                 void labelVisibleChanged();
+                void labelPositionChanged();
                 void explodedChanged();
                 void penChanged();
                 void brushChanged();

tests/auto/qpieslice/tst_qpieslice.cpp +4 0

                 QSignalSpy brushSpy(&slice, SIGNAL(brushChanged()));
                 QSignalSpy labelBrushSpy(&slice, SIGNAL(labelBrushChanged()));
                 QSignalSpy labelFontSpy(&slice, SIGNAL(labelFontChanged()));
+                QSignalSpy labelPositionSpy(&slice, SIGNAL(labelPositionChanged()));
                 QSignalSpy labelArmLengthFactorSpy(&slice, SIGNAL(labelArmLengthFactorChanged()));
                 QSignalSpy explodeDistanceFactorSpy(&slice, SIGNAL(explodeDistanceFactorChanged()));
                 QSignalSpy colorSpy(&slice, SIGNAL(colorChanged()));
                 slice.setLabelBrush(QBrush(Qt::green));
                 slice.setLabelFont(QFont("Tahoma"));
                 slice.setLabelFont(QFont("Tahoma"));
+                slice.setLabelPosition(QPieSlice::LabelInside);
+                slice.setLabelPosition(QPieSlice::LabelInside);
                 slice.setLabelArmLengthFactor(0.1);
                 slice.setLabelArmLengthFactor(0.1);
                 slice.setExplodeDistanceFactor(0.1);
                 TRY_COMPARE(brushSpy.count(), 1);
                 TRY_COMPARE(labelBrushSpy.count(), 1);
                 TRY_COMPARE(labelFontSpy.count(), 1);
+                TRY_COMPARE(labelPositionSpy.count(), 1);
                 TRY_COMPARE(labelArmLengthFactorSpy.count(), 1);
                 TRY_COMPARE(explodeDistanceFactorSpy.count(), 1);
                 TRY_COMPARE(colorSpy.count(), 1);

tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +9 0

                     ignoreUnknownSignals: true
                     onValueChanged:             console.log("slice.onValueChanged: " + series.at(0).value);
                     onLabelVisibleChanged:      console.log("slice.onLabelVisibleChanged: " + series.at(0).labelVisible);
+                    onLabelPositionChanged:     console.log("slice.onLabelPositionChanged: " + series.at(0).labelPosition);
                     onExplodedChanged:          console.log("slice.onExplodedChanged: " + series.at(0).exploded);
                     onPenChanged:               console.log("slice.onPenChanged: " + series.at(0).pen);
                     onBorderColorChanged:       console.log("slice.onBorderColorChanged: " + series.at(0).borderColor);
                     onClicked: series.at(0).labelVisible = !series.at(0).labelVisible;
                 }
                 Button {
+                    text: "slice label position inside"
+                    onClicked: series.at(0).labelPosition = PieSlice.LabelInside;
+                }
+                Button {
+                    text: "slice label position outside"
+                    onClicked: series.at(0).labelPosition = PieSlice.LabelOutside;
+                }
+                Button {
                     text: "slice label arm len +"
                     onClicked: series.at(0).labelArmLengthFactor += 0.1;
                 }

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