HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1307:7b3a3ea4ca65

Use labelBrush instead of labelPen for text labels

Tero Ahola -

r1307:7b3a3ea4ca65

parent child

Context file:

r1307:7b3a3ea4ca65

Collapse all files

demos/piechartcustomization/mainwidget.cpp +8 -8

                 m_brush = new QPushButton();
                 m_brushTool = new BrushTool("Slice brush", this);
                 m_font = new QPushButton();
-                m_labelPen = new QPushButton();
+                m_labelBrush = new QPushButton();
-                m_labelPenTool = new PenTool("Label pen", this);
+                m_labelBrushTool = new BrushTool("Label brush", this);
                 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_labelPen);
+                sliceSettingsLayout->addRow("Label pen", m_labelBrush);
                 sliceSettingsLayout->addRow("Label arm length", m_sliceLabelArmFactor);
                 sliceSettingsLayout->addRow("Exploded", m_sliceExploded);
                 sliceSettingsLayout->addRow("Explode distance", m_sliceExplodedFactor);
                 connect(m_brush, SIGNAL(clicked()), m_brushTool, SLOT(show()));
                 connect(m_brushTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
                 connect(m_font, SIGNAL(clicked()), this, SLOT(showFontDialog()));
-                connect(m_labelPen, SIGNAL(clicked()), m_labelPenTool, SLOT(show()));
+                connect(m_labelBrush, SIGNAL(clicked()), m_labelBrushTool, SLOT(show()));
-                connect(m_labelPenTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
+                connect(m_labelBrushTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
                 connect(m_sliceLabelVisible, SIGNAL(toggled(bool)), this, SLOT(updateSliceSettings()));
                 connect(m_sliceLabelVisible, SIGNAL(toggled(bool)), this, SLOT(updateSliceSettings()));
                 connect(m_sliceLabelArmFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSliceSettings()));
                 m_slice->setPen(m_penTool->pen());
                 m_slice->setBrush(m_brushTool->brush());
-                m_slice->setLabelPen(m_labelPenTool->pen());
+                m_slice->setLabelBrush(m_labelBrushTool->brush());
                 m_slice->setLabelVisible(m_sliceLabelVisible->isChecked());
                 m_slice->setLabelArmLengthFactor(m_sliceLabelArmFactor->value());
                 m_brushTool->setBrush(m_slice->originalBrush());
                 // label
-                m_labelPen->setText(PenTool::name(m_slice->labelPen()));
+                m_labelBrush->setText(BrushTool::name(m_slice->labelBrush()));
-                m_labelPenTool->setPen(m_slice->labelPen());
+                m_labelBrushTool->setBrush(m_slice->labelBrush());
                 m_font->setText(slice->labelFont().toString());
                 m_sliceLabelVisible->blockSignals(true);
                 m_sliceLabelVisible->setChecked(slice->isLabelVisible());

demos/piechartcustomization/mainwidget.h +2 -2

                 QPushButton *m_pen;
                 PenTool *m_penTool;
                 QPushButton *m_font;
-                QPushButton *m_labelPen;
+                QPushButton *m_labelBrush;
-                PenTool *m_labelPenTool;
+                BrushTool *m_labelBrushTool;
             };
             #endif // MAINWIDGET_H

plugins/declarative/declarativepieseries.cpp +5 -4

             QColor DeclarativePieSlice::labelColor()
             {
-                return labelPen().color();
+                return labelBrush().color();
             }
             void DeclarativePieSlice::setLabelColor(QColor color)
             {
-                QPen p = labelPen();
+                // TODO: use brush instead for label color
-                p.setColor(color);
+                QBrush b = labelBrush();
-                setLabelPen(p);
+                b.setColor(color);
+                setLabelBrush(b);
             }
             DeclarativePieSeries::DeclarativePieSeries(QObject *parent) :

src/barchart/qbarset.cpp 0 -19

@@ -267,25 +267,6 QBrush QBarSet::brush() const
267	}	267	}
268		268
269	/*!	269	/*!
270	Sets \a pen of the values that are drawn on top of this barset
271	*/
272	void QBarSet::setLabelPen(const QPen &pen)
273	{
274	if(d_ptr->m_labelPen!=pen){
275	d_ptr->m_labelPen = pen;
276	emit d_ptr->updatedBars();
277	}
278	}
279
280	/*!
281	Returns pen of the values that are drawn on top of this barset
282	*/
283	QPen QBarSet::labelPen() const
284	{
285	return d_ptr->m_labelPen;
286	}
287
288	/*!
289	Sets \a brush of the values that are drawn on top of this barset	270	Sets \a brush of the values that are drawn on top of this barset
290	*/	271	*/
291	void QBarSet::setLabelBrush(const QBrush &brush)	272	void QBarSet::setLabelBrush(const QBrush &brush)

src/barchart/qbarset.h 0 -3

                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
-                void setLabelPen(const QPen &pen);
-                QPen labelPen() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;

src/barchart/qbarset_p.h 0 -1

                 QList<QPointF> m_values;
                 QPen m_pen;
                 QBrush m_brush;
-                QPen m_labelPen;
                 QBrush m_labelBrush;
                 QFont m_labelFont;

src/charttheme.cpp +2 -2

                     if (d->m_data.m_sliceBrush.isThemed() || m_force)
                         d->setBrush(brushColor, true);
-                    if (d->m_data.m_labelPen.isThemed() || m_force)
+                    if (d->m_data.m_labelBrush.isThemed() || m_force)
-                        d->setLabelPen(QPen(m_titleBrush.color()), true);
+                        d->setLabelBrush(QBrush(m_titleBrush.color()), true);
                     if (d->m_data.m_labelFont.isThemed() || m_force)
                         d->setLabelFont(m_labelFont, true);

src/piechart/piechartitem.cpp +1 -1

                     connect(slice, SIGNAL(explodedChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(penChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(brushChanged()), this, SLOT(handleSliceChanged()));
-                    connect(slice, SIGNAL(labelPenChanged()), this, SLOT(handleSliceChanged()));
+                    connect(slice, SIGNAL(labelBrushChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(labelFontChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(labelArmLengthFactorChanged()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(explodeDistanceFactorChanged()), this, SLOT(handleSliceChanged()));

src/piechart/pieslicedata_p.h +2 -2

                         m_labelText != other.m_labelText ||
                         m_labelFont != other.m_labelFont ||
                         !qFuzzyIsNull(m_labelArmLengthFactor - other.m_labelArmLengthFactor) ||
-                        m_labelPen != other.m_labelPen)
+                        m_labelBrush != other.m_labelBrush)
                         return true;
                     if (!qFuzzyIsNull(m_percentage - other.m_percentage) ||
                 QString m_labelText;
                 Themed<QFont> m_labelFont;
                 qreal m_labelArmLengthFactor;
-                Themed<QPen> m_labelPen;
+                Themed<QBrush> m_labelBrush;
                 qreal m_percentage;
                 QPointF m_center;

src/piechart/piesliceitem.cpp +3 -2

                 if (m_data.m_isLabelVisible) {
                     painter->save();
                     painter->setClipRect(parentItem()->boundingRect());
-                    painter->setPen(m_data.m_labelPen);
+                    // 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);
-            		// the pen color will affect the font color as well
                     painter->setFont(m_data.m_labelFont);
                     painter->drawText(m_labelTextRect.bottomLeft(), m_data.m_labelText);
                     painter->restore();

src/piechart/qpieslice.cpp +15 -15

                 Label of the slice.
-                \sa labelVisible, labelPen, labelFont, labelArmLengthFactor
+                \sa labelVisible, labelBrush, labelFont, labelArmLengthFactor
             */
             /*!
                 Default is not visible.
-                \sa label, labelPen, labelFont, labelArmLengthFactor
+                \sa label, labelBrush, labelFont, labelArmLengthFactor
             */
             /*!
             */
             /*!
-                \property QPieSlice::labelPen
+                \property QPieSlice::labelBrush
                 Pen used to draw label and label arm of the slice.
             */
             /*!
-                \fn void QPieSlice::labelPenChanged()
+                \fn void QPieSlice::labelBrushChanged()
                 This signal is emitted when the label pen of the slice has changed.
-                \sa labelPen
+                \sa labelBrush
             */
             /*!
                 Default value is 0.15
-                \sa label, labelVisible, labelPen, labelFont
+                \sa label, labelVisible, labelBrush, labelFont
             */
             /*!
                 return d_ptr->m_data.m_sliceBrush;
             }
-            void QPieSlice::setLabelPen(const QPen &pen)
+            void QPieSlice::setLabelBrush(const QBrush &brush)
             {
-                d_ptr->setLabelPen(pen, false);
+                d_ptr->setLabelBrush(brush, false);
             }
-            QPen QPieSlice::labelPen() const
+            QBrush QPieSlice::labelBrush() const
             {
-                return d_ptr->m_data.m_labelPen;
+                return d_ptr->m_data.m_labelBrush;
             }
             void QPieSlice::setLabelFont(const QFont &font)
                 }
             }
-            void QPieSlicePrivate::setLabelPen(const QPen &pen, bool themed)
+            void QPieSlicePrivate::setLabelBrush(const QBrush &brush, bool themed)
             {
-                if (m_data.m_labelPen != pen) {
+                if (m_data.m_labelBrush != brush) {
-                    m_data.m_labelPen = pen;
+                    m_data.m_labelBrush = brush;
-                    m_data.m_labelPen.setThemed(themed);
+                    m_data.m_labelBrush.setThemed(themed);
-                    emit q_ptr->labelPenChanged();
+                    emit q_ptr->labelBrushChanged();
                 }
             }

src/piechart/qpieslice.h +4 -4

                 Q_PROPERTY(bool exploded READ isExploded WRITE setExploded NOTIFY explodedChanged)
                 Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
                 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
-                Q_PROPERTY(QPen labelPen READ labelPen WRITE setLabelPen NOTIFY labelPenChanged)
+                Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
                 Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
                 Q_PROPERTY(qreal labelArmLengthFactor READ labelArmLengthFactor WRITE setLabelArmLengthFactor)
                 Q_PROPERTY(qreal explodeDistanceFactor READ explodeDistanceFactor WRITE setExplodeDistanceFactor)
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
-                void setLabelPen(const QPen &pen);
+                void setLabelBrush(const QBrush &brush);
-                QPen labelPen() const;
+                QBrush labelBrush() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void explodedChanged();
                 void penChanged();
                 void brushChanged();
-                void labelPenChanged();
+                void labelBrushChanged();
                 void labelFontChanged();
                 void labelArmLengthFactorChanged();
                 void explodeDistanceFactorChanged();

src/piechart/qpieslice_p.h +1 -1

                 void setPen(const QPen &pen, bool themed);
                 void setBrush(const QBrush &brush, bool themed);
-                void setLabelPen(const QPen &pen, bool themed);
+                void setLabelBrush(const QBrush &brush, bool themed);
                 void setLabelFont(const QFont &font, bool themed);
                 void setPercentage(qreal percentage);

tests/auto/qbarset/tst_qbarset.cpp 0 -18

@@ -60,8 +60,6 private slots:
60	void setPen();	60	void setPen();
61	void setBrush_data();	61	void setBrush_data();
62	void setBrush();	62	void setBrush();
63	void setLabelPen_data();
64	void setLabelPen();
65	void setLabelBrush_data();	63	void setLabelBrush_data();
66	void setLabelBrush();	64	void setLabelBrush();
67	void setLabelFont_data();	65	void setLabelFont_data();
@@ -380,22 +378,6 void tst_QBarSet::setBrush()
380	QVERIFY(m_barset->brush() == brush);	378	QVERIFY(m_barset->brush() == brush);
381	}	379	}
382		380
383	void tst_QBarSet::setLabelPen_data()
384	{
385
386	}
387
388	void tst_QBarSet::setLabelPen()
389	{
390	QVERIFY(m_barset->labelPen() == QPen());
391
392	QPen pen;
393	pen.setColor(QColor(128,128,128,128));
394	m_barset->setLabelPen(pen);
395
396	QVERIFY(m_barset->labelPen() == pen);
397	}
398
399	void tst_QBarSet::setLabelBrush_data()	381	void tst_QBarSet::setLabelBrush_data()
400	{	382	{
401		383

tests/auto/qpieslice/tst_qpieslice.cpp +12 -12

                 QVERIFY(!slice1.isExploded());
                 QCOMPARE(slice1.pen(), QPen());
                 QCOMPARE(slice1.brush(), QBrush());
-                QCOMPARE(slice1.labelPen(), QPen());
+                QCOMPARE(slice1.labelBrush(), QBrush());
                 QCOMPARE(slice1.labelFont(), QFont());
                 QCOMPARE(slice1.labelArmLengthFactor(), 0.15); // default value
                 QCOMPARE(slice1.explodeDistanceFactor(), 0.15); // default value
                 QVERIFY(!slice2.isExploded());
                 QCOMPARE(slice2.pen(), QPen());
                 QCOMPARE(slice2.brush(), QBrush());
-                QCOMPARE(slice2.labelPen(), QPen());
+                QCOMPARE(slice2.labelBrush(), QBrush());
                 QCOMPARE(slice2.labelFont(), QFont());
                 QCOMPARE(slice2.labelArmLengthFactor(), 0.15); // default value
                 QCOMPARE(slice2.explodeDistanceFactor(), 0.15); // default value
                 QSignalSpy explodedSpy(&slice, SIGNAL(explodedChanged()));
                 QSignalSpy penSpy(&slice, SIGNAL(penChanged()));
                 QSignalSpy brushSpy(&slice, SIGNAL(brushChanged()));
-                QSignalSpy labelPenSpy(&slice, SIGNAL(labelPenChanged()));
+                QSignalSpy labelBrushSpy(&slice, SIGNAL(labelBrushChanged()));
                 QSignalSpy labelFontSpy(&slice, SIGNAL(labelFontChanged()));
                 QSignalSpy labelArmLengthFactorSpy(&slice, SIGNAL(labelArmLengthFactorChanged()));
                 QSignalSpy explodeDistanceFactorSpy(&slice, SIGNAL(explodeDistanceFactorChanged()));
                 slice.setPen(QPen(Qt::red));
                 slice.setBrush(QBrush(Qt::red));
                 slice.setBrush(QBrush(Qt::red));
-                slice.setLabelPen(QPen(Qt::green));
+                slice.setLabelBrush(QBrush(Qt::green));
-                slice.setLabelPen(QPen(Qt::green));
+                slice.setLabelBrush(QBrush(Qt::green));
                 slice.setLabelFont(QFont("Tahoma"));
                 slice.setLabelFont(QFont("Tahoma"));
                 slice.setLabelArmLengthFactor(0.1);
                 TRY_COMPARE(explodedSpy.count(), 1);
                 TRY_COMPARE(penSpy.count(), 1);
                 TRY_COMPARE(brushSpy.count(), 1);
-                TRY_COMPARE(labelPenSpy.count(), 1);
+                TRY_COMPARE(labelBrushSpy.count(), 1);
                 TRY_COMPARE(labelFontSpy.count(), 1);
                 TRY_COMPARE(labelArmLengthFactorSpy.count(), 1);
                 TRY_COMPARE(explodeDistanceFactorSpy.count(), 1);
                 s1->setPen(p1);
                 QBrush b1(Qt::red);
                 s1->setBrush(b1);
-                s1->setLabelPen(p1);
+                s1->setLabelBrush(b1);
                 QFont f1("Consolas");
                 s1->setLabelFont(f1);
                 // check that customizations persist
                 QCOMPARE(s1->pen(), p1);
                 QCOMPARE(s1->brush(), b1);
-                QCOMPARE(s1->labelPen(), p1);
+                QCOMPARE(s1->labelBrush(), b1);
                 QCOMPARE(s1->labelFont(), f1);
                 // remove a slice
                 series->remove(s2);
                 QCOMPARE(s1->pen(), p1);
                 QCOMPARE(s1->brush(), b1);
-                QCOMPARE(s1->labelPen(), p1);
+                QCOMPARE(s1->labelBrush(), b1);
                 QCOMPARE(s1->labelFont(), f1);
                 // add a slice
                 series->append("slice 4", 4);
                 QCOMPARE(s1->pen(), p1);
                 QCOMPARE(s1->brush(), b1);
-                QCOMPARE(s1->labelPen(), p1);
+                QCOMPARE(s1->labelBrush(), b1);
                 QCOMPARE(s1->labelFont(), f1);
                 // insert a slice
                 series->insert(0, new QPieSlice("slice 5", 5));
                 QCOMPARE(s1->pen(), p1);
                 QCOMPARE(s1->brush(), b1);
-                QCOMPARE(s1->labelPen(), p1);
+                QCOMPARE(s1->labelBrush(), b1);
                 QCOMPARE(s1->labelFont(), f1);
                 // change theme
                 view.chart()->setTheme(QChart::ChartThemeHighContrast);
                 QVERIFY(s1->pen() != p1);
                 QVERIFY(s1->brush() != b1);
-                QVERIFY(s1->labelPen() != p1);
+                QVERIFY(s1->labelBrush() != b1);
                 QVERIFY(s1->labelFont() != f1);
             }

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