HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r714:6705438d7ae7

Get pie slice label font and pen from theme

Jani Honkonen -

r714:6705438d7ae7

parent child

Context file:

r714:6705438d7ae7

Collapse all files

demos/piechartcustomization/main.cpp +11 -10

                     *m_series << new CustomSlice(30.0, "Slice 3");
                     *m_series << new CustomSlice(40.0, "Slice 4");
                     *m_series << new CustomSlice(50.0, "Slice 5");
+                    m_series->setLabelsVisible();
                     m_chartView->addSeries(m_series);
                     connect(m_series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*, Qt::MouseButtons)));
                     m_brush = new QPushButton();
                     m_brushTool = new BrushTool("Slice brush", this);
                     m_font = new QPushButton();
-                    m_labelArmPen = new QPushButton();
+                    m_labelPen = new QPushButton();
-                    m_labelArmPenTool = new PenTool("Label arm pen", this);
+                    m_labelPenTool = new PenTool("Label pen", 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 arm pen", m_labelArmPen);
+                    sliceSettingsLayout->addRow("Label pen", m_labelPen);
                     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_labelArmPen, SIGNAL(clicked()), m_labelArmPenTool, SLOT(show()));
+                    connect(m_labelPen, SIGNAL(clicked()), m_labelPenTool, SLOT(show()));
-                    connect(m_labelArmPenTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
+                    connect(m_labelPenTool, 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->setSlicePen(m_penTool->pen());
                     m_slice->setSliceBrush(m_brushTool->brush());
-                    m_slice->setLabelArmPen(m_labelArmPenTool->pen());
+                    m_slice->setLabelPen(m_labelPenTool->pen());
                     m_slice->setLabelVisible(m_sliceLabelVisible->isChecked());
                     m_slice->setLabelArmLengthFactor(m_sliceLabelArmFactor->value());
                     m_brushTool->setBrush(m_slice->originalBrush());
                     // label
-                    m_labelArmPen->setText(PenTool::name(m_slice->labelArmPen()));
+                    m_labelPen->setText(PenTool::name(m_slice->labelPen()));
-                    m_labelArmPenTool->setPen(m_slice->labelArmPen());
+                    m_labelPenTool->setPen(m_slice->labelPen());
                     m_font->setText(slice->labelFont().toString());
                     m_sliceLabelVisible->blockSignals(true);
                     m_sliceLabelVisible->setChecked(slice->isLabelVisible());
                 QPushButton *m_pen;
                 PenTool *m_penTool;
                 QPushButton *m_font;
-                QPushButton *m_labelArmPen;
+                QPushButton *m_labelPen;
-                PenTool *m_labelArmPenTool;
+                PenTool *m_labelPenTool;
             };
             int main(int argc, char *argv[])

src/charttheme.cpp +10 0

@@ -221,6 +221,16 void ChartTheme::decorate(QPieSeries* series, int index, bool force)
221	data.m_sliceBrush.setThemed(true);	221	data.m_sliceBrush.setThemed(true);
222	}	222	}
223		223
		224	if (data.m_labelPen.isThemed() \|\| force) {
		225	data.m_labelPen = QPen(m_titleBrush.color());
		226	data.m_labelPen.setThemed(true);
		227	}
		228
		229	if (data.m_labelFont.isThemed() \|\| force) {
		230	data.m_labelFont = m_masterFont;
		231	data.m_labelFont.setThemed(true);
		232	}
		233
224	if (s->m_data != data) {	234	if (s->m_data != data) {
225	s->m_data = data;	235	s->m_data = data;
226	emit s->changed();	236	emit s->changed();

src/piechart/pieslicedata_p.h +2 -2

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

src/piechart/piesliceitem.cpp +2 -4

                 painter->restore();
                 if (m_data.m_isLabelVisible) {
-                    painter->save();
+                    painter->setPen(m_data.m_labelPen);
-                    painter->setPen(m_data.m_labelArmPen);
                     painter->drawPath(m_labelArmPath);
-                    painter->restore();
+            		// 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);
                 }

src/piechart/qpieslice.cpp +8 -8

             }
             /*!
-                Returns the pen used to draw label arm in this slice.
+                Returns the pen used to draw the label in this slice.
                 \sa setLabelArmPen()
             */
-            QPen QPieSlice::labelArmPen() const
+            QPen QPieSlice::labelPen() const
             {
                 Q_D(const QPieSlice);
-                return d->m_data.m_labelArmPen;
+                return d->m_data.m_labelPen;
             }
             /*!
             }
             /*!
-                Sets the \a pen used to draw the label arm in this slice.
+                Sets the \a pen used to draw the label in this slice.
                 Note that applying a theme will override this.
                 \sa labelArmPen()
             */
-            void QPieSlice::setLabelArmPen(const QPen &pen)
+            void QPieSlice::setLabelPen(const QPen &pen)
             {
                 Q_D(QPieSlice);
-                if (d->m_data.m_labelArmPen != pen) {
+                if (d->m_data.m_labelPen != pen) {
-                    d->m_data.m_labelArmPen = pen;
+                    d->m_data.m_labelPen = pen;
-                    d->m_data.m_labelArmPen.setThemed(false);
+                    d->m_data.m_labelPen.setThemed(false);
                     emit changed();
                 }
             }

src/piechart/qpieslice.h +2 -2

                 QPen slicePen() const;
                 void setSliceBrush(const QBrush &brush);
                 QBrush sliceBrush() const;
-                void setLabelArmPen(const QPen &pen);
+                void setLabelPen(const QPen &pen);
-                QPen labelArmPen() const;
+                QPen labelPen() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void setLabelArmLengthFactor(qreal factor);

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