HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1537:7402b18c3d59

Color and border color properties of XYSeries

Tero Ahola -

r1537:7402b18c3d59

parent child

Context file:

r1537:7402b18c3d59

Collapse all files

src/scatterchart/qscatterseries.cpp +29 -7

                 return QAbstractSeries::SeriesTypeScatter;
             }
+            void QScatterSeries::setPen(const QPen &pen)
+            {
+                Q_D(QXYSeries);
+                if (d->m_pen != pen) {
+                    bool emitColorChanged = d->m_pen.color() != pen.color();
+                    d->m_pen = pen;
+                    emit d->updated();
+                    if (emitColorChanged)
+                        emit borderColorChanged(pen.color());
+                }
+            }
+            void QScatterSeries::setBrush(const QBrush &brush)
+            {
+                Q_D(QScatterSeries);
+                if (d->m_brush != brush) {
+                    bool emitColorChanged = d->m_brush.color() != brush.color();
+                    d->m_brush = brush;
+                    emit d->updated();
+                    if (emitColorChanged)
+                        emit colorChanged(brush.color());
+                }
+            }
             void QScatterSeries::setColor(const QColor &color)
             {
                 QBrush b = brush();
                 if (b.color() != color) {
                     b.setColor(color);
                     setBrush(b);
-                    emit colorChanged(color);
                 }
             }
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
-                    emit borderColorChanged(color);
                 }
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QScatterSeriesPrivate::QScatterSeriesPrivate(QScatterSeries* q):QXYSeriesPrivate(q),
+            QScatterSeriesPrivate::QScatterSeriesPrivate(QScatterSeries* q) :
-               m_shape(QScatterSeries::MarkerShapeCircle),
+                QXYSeriesPrivate(q),
-               m_size(15.0)
+                m_shape(QScatterSeries::MarkerShapeCircle),
+                m_size(15.0)
             {
+            }
-            };
             Chart* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {

src/scatterchart/qscatterseries.h +2 0

                 explicit QScatterSeries(QObject *parent = 0);
                 ~QScatterSeries();
                 QAbstractSeries::SeriesType type() const;
+                void setPen(const QPen &pen);
+                void setBrush(const QBrush &brush);
                 void setColor(const QColor &color);
                 QColor color() const;
                 void setBorderColor(const QColor &color);

src/scatterchart/qscatterseries_p.h +1 -2

             private:
                 QScatterSeries::MarkerShape m_shape;
                 qreal m_size;
-                Q_DECLARE_PUBLIC(QScatterSeries);
+                Q_DECLARE_PUBLIC(QScatterSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxyseries.cpp +4 -2

             void QXYSeries::setPen(const QPen &pen)
             {
                 Q_D(QXYSeries);
-                if (d->m_pen!=pen) {
+                if (d->m_pen != pen) {
+                    bool emitColorChanged = d->m_pen.color() != pen.color();
                     d->m_pen = pen;
                     emit d->updated();
+                    if (emitColorChanged)
+                        emit colorChanged(pen.color());
                 }
             }
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
-                    emit colorChanged(color);
                 }
             }

src/xychart/qxyseries.h +2 -2

                 QXYSeries& operator << (const QPointF &point);
                 QXYSeries& operator << (const QList<QPointF> &points);
-                void setPen(const QPen &pen);
+                virtual void setPen(const QPen &pen);
                 QPen pen() const;
-                void setBrush(const QBrush &brush);
+                virtual void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 virtual void setColor(const QColor &color);

src/xychart/qxyseries_p.h +1 -2

                 bool m_pointsVisible;
             private:
-                Q_DECLARE_PUBLIC(QXYSeries);
+                Q_DECLARE_PUBLIC(QXYSeries)
                 friend class QScatterSeries;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

tests/auto/qscatterseries/tst_qscatterseries.cpp +31 0

@@ -35,6 +35,8 public slots:
35	private slots:	35	private slots:
36	void qscatterseries_data();	36	void qscatterseries_data();
37	void qscatterseries();	37	void qscatterseries();
		38	void scatterChangedSignals();
		39
38	protected:	40	protected:
39	void pointsVisible_data();	41	void pointsVisible_data();
40	};	42	};
@@ -94,6 +96,35 void tst_QScatterSeries::qscatterseries()
94	QTest::qWaitForWindowShown(m_view);	96	QTest::qWaitForWindowShown(m_view);
95	}	97	}
96		98
		99	void tst_QScatterSeries::scatterChangedSignals()
		100	{
		101	QScatterSeries series = qobject_cast<QScatterSeries >(m_series);
		102	QVERIFY(series);
		103
		104	QSignalSpy colorSpy(series, SIGNAL(colorChanged(QColor)));
		105	QSignalSpy borderColorSpy(series, SIGNAL(borderColorChanged(QColor)));
		106
		107	// Color
		108	series->setColor(QColor("blueviolet"));
		109	TRY_COMPARE(colorSpy.count(), 1);
		110
		111	// Border color
		112	series->setBorderColor(QColor("burlywood"));
		113	TRY_COMPARE(borderColorSpy.count(), 1);
		114
		115	// Pen
		116	QPen p = series->pen();
		117	p.setColor("lightpink");
		118	series->setPen(p);
		119	TRY_COMPARE(borderColorSpy.count(), 2);
		120
		121	// Brush
		122	QBrush b = series->brush();
		123	b.setColor("lime");
		124	series->setBrush(b);
		125	TRY_COMPARE(colorSpy.count(), 2);
		126	}
		127
97	QTEST_MAIN(tst_QScatterSeries)	128	QTEST_MAIN(tst_QScatterSeries)
98		129
99	#include "tst_qscatterseries.moc"	130	#include "tst_qscatterseries.moc"

tests/auto/qxyseries/tst_qxyseries.cpp +21 -1

@@ -399,11 +399,31 void tst_QXYSeries::pointsVisible_raw()
399	void tst_QXYSeries::changedSignals()	399	void tst_QXYSeries::changedSignals()
400	{	400	{
401	QSignalSpy visibleSpy(m_series, SIGNAL(visibleChanged()));	401	QSignalSpy visibleSpy(m_series, SIGNAL(visibleChanged()));
		402	QSignalSpy nameSpy(m_series, SIGNAL(nameChanged()));
		403	QSignalSpy colorSpy(m_series, SIGNAL(colorChanged(QColor)));
402		404
		405	// Visibility
403	m_series->setVisible(false);	406	m_series->setVisible(false);
404	m_series->setVisible(false);	407	m_series->setVisible(false);
405	TRY_COMPARE(visibleSpy.count(), 1);	408	TRY_COMPARE(visibleSpy.count(), 1);
406	m_series->setVisible(true);	409	m_series->setVisible(true);
407	TRY_COMPARE(visibleSpy.count(), 2);	410	TRY_COMPARE(visibleSpy.count(), 2);
408	}
409		411
		412	// Color
		413	m_series->setColor(QColor("aliceblue"));
		414	TRY_COMPARE(colorSpy.count(), 1);
		415
		416	// Pen and Brush
		417	QPen p = m_series->pen();
		418	p.setColor("aquamarine");
		419	m_series->setPen(p);
		420	QBrush b = m_series->brush();
		421	b.setColor("beige");
		422	m_series->setBrush(b);
		423	TRY_COMPARE(colorSpy.count(), 2);
		424
		425	// Verify all the signals again, to make sure no extra signals were emitted
		426	TRY_COMPARE(visibleSpy.count(), 2);
		427	TRY_COMPARE(nameSpy.count(), 0);
		428	TRY_COMPARE(colorSpy.count(), 2);
		429	}

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