HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r691:02b456949de5

Fix setting custom color to pie. Now the pie knows if the color is set by the user.

Jani Honkonen -

r691:02b456949de5

parent child

Context file:

r691:02b456949de5

Collapse all files

src/charttheme.cpp +18 -8

@@ -206,20 +206,30 void ChartTheme::decorate(QScatterSeries* series, int index,bool force)
206		206
207	void ChartTheme::decorate(QPieSeries* series, int index, bool force)	207	void ChartTheme::decorate(QPieSeries* series, int index, bool force)
208	{	208	{
209	QPen pen;
210	QBrush brush;
211
212	for (int i(0); i < series->slices().count(); i++) {	209	for (int i(0); i < series->slices().count(); i++) {
213	if (pen == series->slices().at(i)->slicePen() \|\| force) {	210
214	QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);	211	QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
215	series->slices().at(i)->setSlicePen(penColor);
216	}
217		212
218	// Get color for a slice from a gradient linearly, beginning from the start of the gradient	213	// Get color for a slice from a gradient linearly, beginning from the start of the gradient
219	qreal pos = (qreal) (i + 1) / (qreal) series->count();	214	qreal pos = (qreal) (i + 1) / (qreal) series->count();
220	if (brush == series->slices().at(i)->sliceBrush() \|\| force) {
221	QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);	215	QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
222	series->slices().at(i)->setSliceBrush(brushColor);	216
		217	QPieSlice::DataPtr s = series->slices().at(i)->data_ptr();
		218	PieSliceData data = s->m_data;
		219
		220	if (data.m_slicePen.isThemed() \|\| force) {
		221	data.m_slicePen = penColor;
		222	data.m_slicePen.setThemed(true);
		223	}
		224
		225	if (data.m_sliceBrush.isThemed() \|\| force) {
		226	data.m_sliceBrush = brushColor;
		227	data.m_sliceBrush.setThemed(true);
		228	}
		229
		230	if (s->m_data != data) {
		231	s->m_data = data;
		232	emit s->changed();
223	}	233	}
224	}	234	}
225	}	235	}

src/piechart/piechartitem.cpp +2 -3

             {
                 bool isEmpty = m_slices.isEmpty();
-                presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
+                presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series), false);
                 foreach (QPieSlice *s, slices) {
                     PieSliceItem* item = new PieSliceItem(this);
             void PieChartItem::handleSlicesRemoved(QList<QPieSlice*> slices)
             {
-                presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
+                presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series), false);
                 foreach (QPieSlice *s, slices) {
                     if (animator())
                 PieSliceData sliceData = slice->data_ptr()->m_data;
                 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
-                sliceData.m_angleSpan = slice->endAngle() - slice->startAngle();
                 return sliceData;
             }

src/piechart/pieslicedata_p.h +71 -9

@@ -4,37 +4,99
4	#include <qchartglobal.h>	4	#include <qchartglobal.h>
5	#include <QPen>	5	#include <QPen>
6	#include <QBrush>	6	#include <QBrush>
		7	#include <QDebug>
7		8
8	QTCOMMERCIALCHART_BEGIN_NAMESPACE	9	QTCOMMERCIALCHART_BEGIN_NAMESPACE
9		10
		11	template <class T>
		12	class Themed : public T
		13	{
		14	public:
		15	Themed():m_isThemed(true) {}
		16
		17	inline T &operator=(const T &other) { return T::operator =(other); }
		18
		19	inline bool operator!=(const T &other) { return T::operator !=(other); }
		20	inline bool operator!=(const Themed &other)
		21	{
		22	if (T::operator !=(other))
		23	return true;
		24
		25	if (m_isThemed != other.m_isThemed)
		26	return true;
		27
		28	return false;
		29	}
		30
		31	inline void setThemed(bool state) { m_isThemed = state; }
		32	inline bool isThemed() const { return m_isThemed; }
		33
		34	private:
		35	bool m_isThemed;
		36	};
		37
10	class PieSliceData	38	class PieSliceData
11	{	39	{
12	public:	40	public:
13	PieSliceData()	41	PieSliceData()
14	{	42	{
15	m_value = 0;	43	m_value = 0;
16	m_percentage = 0;	44
17	m_startAngle = 0;
18	m_angleSpan = 0;
19	m_isExploded = false;	45	m_isExploded = false;
20	m_explodeDistanceFactor = 0.15;	46	m_explodeDistanceFactor = 0.15;
21	m_labelVisible = false;	47
		48	m_isLabelVisible = false;
22	m_labelArmLengthFactor = 0.15;	49	m_labelArmLengthFactor = 0.15;
		50
		51	m_percentage = 0;
		52	m_radius = 0;
		53	m_startAngle = 0;
		54	m_angleSpan = 0;
		55	}
		56
		57	bool operator!=(const PieSliceData &other)
		58	{
		59	if (m_value != other.m_value)
		60	return true;
		61
		62	if (m_slicePen != other.m_slicePen \|\|
		63	m_sliceBrush != other.m_sliceBrush)
		64	return true;
		65
		66	if (m_isExploded != other.m_isExploded \|\|
		67	m_explodeDistanceFactor != other.m_explodeDistanceFactor)
		68	return true;
		69
		70	if (m_isLabelVisible != other.m_isLabelVisible \|\|
		71	m_labelText != other.m_labelText \|\|
		72	m_labelFont != other.m_labelFont \|\|
		73	m_labelArmLengthFactor != other.m_labelArmLengthFactor \|\|
		74	m_labelArmPen != other.m_labelArmPen)
		75	return true;
		76
		77	if (m_percentage != other.m_percentage \|\|
		78	m_center != other.m_center \|\|
		79	m_radius != other.m_radius \|\|
		80	m_startAngle != other.m_startAngle \|\|
		81	m_angleSpan != other.m_angleSpan)
		82	return true;
		83
		84	return false;
23	}	85	}
24		86
25	qreal m_value;	87	qreal m_value;
26		88
27	QPen m_slicePen;	89	Themed<QPen> m_slicePen;
28	QBrush m_sliceBrush;	90	Themed<QBrush> m_sliceBrush;
29		91
30	bool m_isExploded;	92	bool m_isExploded;
31	qreal m_explodeDistanceFactor;	93	qreal m_explodeDistanceFactor;
32		94
33	bool m_labelVisible;	95	bool m_isLabelVisible;
34	QString m_labelText;	96	QString m_labelText;
35	QFont m_labelFont;	97	Themed<QFont> m_labelFont;
36	qreal m_labelArmLengthFactor;	98	qreal m_labelArmLengthFactor;
37	QPen m_labelArmPen;	99	Themed<QPen> m_labelArmPen;
38		100
39	qreal m_percentage;	101	qreal m_percentage;
40	QPointF m_center;	102	QPointF m_center;

src/piechart/piesliceitem.cpp +1 -1

                 painter->drawPath(m_slicePath);
                 painter->restore();
-                if (m_data.m_labelVisible) {
+                if (m_data.m_isLabelVisible) {
                     painter->save();
                     painter->setPen(m_data.m_labelArmPen);
                     painter->drawPath(m_labelArmPath);

src/piechart/qpieslice.cpp +9 -5

             bool QPieSlice::isLabelVisible() const
             {
                 Q_D(const QPieSlice);
-                return d->m_data.m_labelVisible;
+                return d->m_data.m_isLabelVisible;
             }
             /*!
             }
             /*!
-                Gets the label arm lenght factor.
+                Gets the label arm length factor.
                 The factor is relative to pie radius. For example:
 .0 means the length is the same as the radius.
             void QPieSlice::setLabelVisible(bool visible)
             {
                 Q_D(QPieSlice);
-                if (d->m_data.m_labelVisible != visible) {
+                if (d->m_data.m_isLabelVisible != visible) {
-                    d->m_data.m_labelVisible = visible;
+                    d->m_data.m_isLabelVisible = visible;
                     emit changed();
                 }
             }
                 Q_D(QPieSlice);
                 if (d->m_data.m_slicePen != pen) {
                     d->m_data.m_slicePen = pen;
+                    d->m_data.m_slicePen.setThemed(false);
                     emit changed();
                 }
             }
                 Q_D(QPieSlice);
                 if (d->m_data.m_sliceBrush != brush) {
                     d->m_data.m_sliceBrush = brush;
+                    d->m_data.m_sliceBrush.setThemed(false);
                     emit changed();
                 }
             }
                 Q_D(QPieSlice);
                 if (d->m_data.m_labelArmPen != pen) {
                     d->m_data.m_labelArmPen = pen;
+                    d->m_data.m_labelArmPen.setThemed(false);
                     emit changed();
                 }
             }
                 Q_D(QPieSlice);
                 if (d->m_data.m_labelFont != font) {
                     d->m_data.m_labelFont = font;
+                    d->m_data.m_labelFont.setThemed(false);
                     emit changed();
                 }
             }
             /*!
-                Sets the label arm lenght \a factor.
+                Sets the label arm length \a factor.
                 The factor is relative to pie radius. For example:
 .0 means the length is the same as the radius.

src/piechart/qpiesliceprivate_p.h +1 0

             public:
                 friend class QPieSeriesPrivate;
+                friend class ChartTheme;
                 QPieSlice * const q_ptr;
                 PieSliceData m_data;
             };

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