HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1353:e34fe2671696

barchart signals for properties and changes

sauimone -

r1353:e34fe2671696

parent child

Context file:

r1353:e34fe2671696

Collapse all files

src/barchart/qbarseries.cpp +41 -17

             bool QBarSeries::append(QBarSet *set)
             {
                 Q_D(QBarSeries);
-                return d->append(set);
+                bool success = d->append(set);
+                if (success) {
+                    QList<QBarSet*> sets;
+                    sets.append(set);
+                    emit barsetsAdded(sets);
+                }
+                return success;
             }
             /*!
             bool QBarSeries::remove(QBarSet *set)
             {
                 Q_D(QBarSeries);
-                return d->remove(set);
+                bool success = d->remove(set);
+                if (success) {
+                    QList<QBarSet*> sets;
+                    sets.append(set);
+                    emit barsetsRemoved(sets);
+                }
+                return success;
             }
             /*!
             bool QBarSeries::append(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
-                return d->append(sets);
+                bool success = d->append(sets);
+                if (success) {
+                    emit barsetsAdded(sets);
+                }
+                return success;
             }
             /*!
             bool QBarSeries::remove(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
-                return d->remove(sets);
+                bool success = d->remove(sets);
+                if (success) {
+                    emit barsetsRemoved(sets);
+                }
+                return success;
             }
             void QBarSeries::clear()
             {
                 Q_D(QBarSeries);
                 if (d->m_labelsVisible != visible) {
-                    d->m_labelsVisible = visible;
+                    d->setLabelsVisible(visible);
-                    emit d->labelsVisibleChanged(visible);
+                    emit labelsVisibleChanged();
                 }
             }
             void QBarSeriesPrivate::setVisible(bool visible)
             {
-                if (m_visible != visible) {
                 m_visible = visible;
                 emit updatedBars();
             }
-            bool QBarSeriesPrivate::isVisible() const
+            void QBarSeriesPrivate::setLabelsVisible(bool visible)
             {
-                return m_visible;
+                m_labelsVisible = visible;
+                emit labelsVisibleChanged(visible);
             }
             QString QBarSeriesPrivate::categoryName(int category)
             bool QBarSeriesPrivate::remove(QList<QBarSet* > sets)
             {
                 Q_Q(QBarSeries);
-                bool setsRemoved = false;
                 foreach (QBarSet* set, sets) {
-                    if (m_barSets.contains(set)) {
+                    if ((set == 0) || (!m_barSets.contains(set))) {
+                        // Fail if any of the sets is null or is not in series
+                        return false;
+                    }
+                    if (sets.count(set) != 1) {
+                        // Also fail if same set is more than once in given list.
+                        return false;
+                    }
+                }
+                foreach (QBarSet* set, sets) {
                     m_barSets.removeOne(set);
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
-                        setsRemoved = true;
                 }
-                if (setsRemoved) {
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 emit restructuredBars();        // this notifies barchartitem
+                return true;
-                return setsRemoved;
             }
             #include "moc_qbarseries.cpp"

src/barchart/qbarseries.h +5 0

             Q_SIGNALS:
                 void clicked(QBarSet *barset, int index);
                 void hovered(QBarSet* barset, bool status);
+                void visibleChanged();
+                void labelsVisibleChanged();
+                void barsetsAdded(QList<QBarSet*> sets);
+                void barsetsRemoved(QList<QBarSet*> sets);
             protected:
                 Q_DECLARE_PRIVATE(QBarSeries)

src/barchart/qbarseries_p.h +1 -1

                 qreal barMargin() const;
                 void setVisible(bool visible);
-                bool isVisible() const;
+                void setLabelsVisible(bool visible);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);

src/barchart/qbarset.cpp +107 -18

@@ -60,6 +60,7 QBarSet::~QBarSet()
60	void QBarSet::setName(const QString name)	60	void QBarSet::setName(const QString name)
61	{	61	{
62	d_ptr->m_name = name;	62	d_ptr->m_name = name;
		63	emit nameChanged();
63	}	64	}
64		65
65	/*!	66	/*!
@@ -78,8 +79,9 QString QBarSet::name() const
78	*/	79	*/
79	void QBarSet::append(const QPointF value)	80	void QBarSet::append(const QPointF value)
80	{	81	{
81	d_ptr->m_values.~~append~~(~~value~~);	82	int index = d_ptr->m_values.count();
82	emit d_ptr->restructuredBars();	83	d_ptr->append(value);
		84	emit valuesAdded(index, 1);
83	}	85	}
84		86
85	/*!	87	/*!
@@ -88,10 +90,9 void QBarSet::append(const QPointF value)
88	*/	90	*/
89	void QBarSet::append(const QList<QPointF> values)	91	void QBarSet::append(const QList<QPointF> values)
90	{	92	{
91	~~for~~ (int i=0; i<values.count(); i++) {	93	int index = d_ptr->m_values.count();
92	d_ptr->~~m_values~~.append(values.at(i));	94	d_ptr->append(values);
93	}	95	emit valuesAdded(index, values.count());
94	emit d_ptr->restructuredBars();
95	}	96	}
96		97
97	/*!	98	/*!
@@ -100,6 +101,7 void QBarSet::append(const QList<QPointF> values)
100	*/	101	*/
101	void QBarSet::append(const qreal value)	102	void QBarSet::append(const qreal value)
102	{	103	{
		104	// Convert to QPointF and use other append(QPointF) method.
103	append(QPointF(d_ptr->m_values.count(), value));	105	append(QPointF(d_ptr->m_values.count(), value));
104	}	106	}
105		107
@@ -111,11 +113,8 void QBarSet::append(const qreal value)
111	void QBarSet::append(const QList<qreal> values)	113	void QBarSet::append(const QList<qreal> values)
112	{	114	{
113	int index = d_ptr->m_values.count();	115	int index = d_ptr->m_values.count();
114	for (int i=0; i<values.count(); i++) {	116	d_ptr->append(values);
115	d_ptr->m_values.append(QPointF(index,values.at(i)));	117	emit valuesAdded(index, values.count());
116	index++;
117	}
118	emit d_ptr->restructuredBars();
119	}	118	}
120		119
121	/*!	120	/*!
@@ -145,18 +144,32 QBarSet& QBarSet::operator << (const QPointF &value)
145	*/	144	*/
146	void QBarSet::insert(const int index, const qreal value)	145	void QBarSet::insert(const int index, const qreal value)
147	{	146	{
148	d_ptr->~~m_values~~.insert(~~index~~, ~~QPointF~~(index, value));	147	d_ptr->insert(index, value);
149	// emit d_ptr->updatedBars();	148	emit valuesAdded(index,1);
		149	}
		150
		151	/*!
		152	Inserts new \a value on the \a index position.
		153	The value that is currently at this postion is moved to postion index + 1
		154	\sa remove()
		155	*/
		156	void QBarSet::insert(const int index, const QPointF value)
		157	{
		158	d_ptr->insert(index,value);
		159	emit valuesAdded(index,1);
150	}	160	}
151		161
152	/*!	162	/*!
153	Removes the value specified by \a index	163	Removes the value specified by \a index
154	\sa insert()	164	\sa insert()
155	*/	165	*/
156	~~void~~ QBarSet::remove(const int index)	166	bool QBarSet::remove(const int index, const int count)
157	{	167	{
158	d_ptr->~~m_values~~.removeAt(index);	168	bool success = d_ptr->remove(index,count);
159	// emit d_ptr->updatedBars();	169	if (success) {
		170	emit valuesRemoved(index,count);
		171	}
		172	return success;
160	}	173	}
161		174
162	/*!	175	/*!
@@ -164,8 +177,17 void QBarSet::remove(const int index)
164	*/	177	*/
165	void QBarSet::replace(const int index, const qreal value)	178	void QBarSet::replace(const int index, const qreal value)
166	{	179	{
167	d_ptr->~~m_values~~.replace(~~index~~,~~QPointF~~(index,value));	180	d_ptr->replace(index,value);
168	emit d_ptr->updatedBars();	181	emit valueChanged(index);
		182	}
		183
		184	/*!
		185	Sets a new value \a value to set, indexed by \a index
		186	*/
		187	void QBarSet::replace(const int index, const QPointF value)
		188	{
		189	d_ptr->replace(index,value);
		190	emit valueChanged(index);
169	}	191	}
170		192
171	/*!	193	/*!
@@ -222,6 +244,7 void QBarSet::setPen(const QPen &pen)
222	if(d_ptr->m_pen!=pen){	244	if(d_ptr->m_pen!=pen){
223	d_ptr->m_pen = pen;	245	d_ptr->m_pen = pen;
224	emit d_ptr->updatedBars();	246	emit d_ptr->updatedBars();
		247	emit penChanged();
225	}	248	}
226	}	249	}
227		250
@@ -241,6 +264,7 void QBarSet::setBrush(const QBrush &brush)
241	if(d_ptr->m_brush!=brush){	264	if(d_ptr->m_brush!=brush){
242	d_ptr->m_brush = brush;	265	d_ptr->m_brush = brush;
243	emit d_ptr->updatedBars();	266	emit d_ptr->updatedBars();
		267	emit brushChanged();
244	}	268	}
245	}	269	}
246		270
@@ -260,6 +284,7 void QBarSet::setLabelBrush(const QBrush &brush)
260	if(d_ptr->m_labelBrush!=brush){	284	if(d_ptr->m_labelBrush!=brush){
261	d_ptr->m_labelBrush = brush;	285	d_ptr->m_labelBrush = brush;
262	emit d_ptr->updatedBars();	286	emit d_ptr->updatedBars();
		287	emit labelBrushChanged();
263	}	288	}
264	}	289	}
265		290
@@ -279,6 +304,7 void QBarSet::setLabelFont(const QFont &font)
279	if(d_ptr->m_labelFont!=font) {	304	if(d_ptr->m_labelFont!=font) {
280	d_ptr->m_labelFont = font;	305	d_ptr->m_labelFont = font;
281	emit d_ptr->updatedBars();	306	emit d_ptr->updatedBars();
		307	emit labelFontChanged();
282	}	308	}
283		309
284	}	310	}
@@ -303,6 +329,69 QBarSetPrivate::~QBarSetPrivate()
303	{	329	{
304	}	330	}
305		331
		332	void QBarSetPrivate::append(QPointF value)
		333	{
		334	m_values.append(value);
		335	emit restructuredBars();
		336	}
		337
		338	void QBarSetPrivate::append(QList<QPointF> values)
		339	{
		340	for (int i=0; i<values.count(); i++) {
		341	m_values.append(values.at(i));
		342	}
		343	emit restructuredBars();
		344	}
		345
		346	void QBarSetPrivate::append(QList<qreal> values)
		347	{
		348	int index = m_values.count();
		349	for (int i=0; i<values.count(); i++) {
		350	m_values.append(QPointF(index,values.at(i)));
		351	index++;
		352	}
		353	emit restructuredBars();
		354	}
		355
		356	void QBarSetPrivate::insert(const int index, const qreal value)
		357	{
		358	m_values.insert(index, QPointF(index, value));
		359	emit restructuredBars();
		360	}
		361
		362	void QBarSetPrivate::insert(const int index, const QPointF value)
		363	{
		364	m_values.insert(index, value);
		365	emit restructuredBars();
		366	}
		367
		368	bool QBarSetPrivate::remove(const int index, const int count)
		369	{
		370	if ((index + count) > m_values.count()) {
		371	// cant remove more values than there are
		372	return false;
		373	}
		374	int c = count;
		375	while (c > 0) {
		376	m_values.removeAt(index);
		377	c--;
		378	}
		379	emit restructuredBars();
		380	return true;
		381	}
		382
		383	void QBarSetPrivate::replace(const int index, const qreal value)
		384	{
		385	m_values.replace(index,QPointF(index,value));
		386	emit updatedBars();
		387	}
		388
		389	void QBarSetPrivate::replace(const int index, const QPointF value)
		390	{
		391	m_values.replace(index,value);
		392	emit updatedBars();
		393	}
		394
306	#include "moc_qbarset.cpp"	395	#include "moc_qbarset.cpp"
307	#include "moc_qbarset_p.cpp"	396	#include "moc_qbarset_p.cpp"
308		397

src/barchart/qbarset.h +15 -1

                 QBarSet& operator << (const QPointF &value);
                 void insert(const int index, const qreal value);
-                void remove(const int index);
+                void insert(const int index, const QPointF value);
+                bool remove(const int index, const int count = 1);
                 void replace(const int index, const qreal value);
+                void replace(const int index, const QPointF value);
                 QPointF at(const int index) const;
                 QPointF operator [] (const int index) const;
                 int count() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
+            Q_SIGNALS:
+                void nameChanged();
+                void penChanged();
+                void brushChanged();
+                void labelChanged();
+                void labelBrushChanged();
+                void labelFontChanged();
+                void valuesAdded(int index, int count);
+                void valuesRemoved(int index, int count);
+                void valueChanged(int index);
             private:
                 QScopedPointer<QBarSetPrivate> d_ptr;
                 Q_DISABLE_COPY(QBarSet)

src/barchart/qbarset_p.h +11 0

@@ -46,6 +46,17 public:
46	QBarSetPrivate(const QString name, QBarSet *parent);	46	QBarSetPrivate(const QString name, QBarSet *parent);
47	~QBarSetPrivate();	47	~QBarSetPrivate();
48		48
		49	void append(QPointF value);
		50	void append(QList<QPointF> values);
		51	void append(QList<qreal> values);
		52
		53	void insert(const int index, const qreal value);
		54	void insert(const int index, const QPointF value);
		55	bool remove(const int index, const int count);
		56
		57	void replace(const int index, const qreal value);
		58	void replace(const int index, const QPointF value);
		59
49	Q_SIGNALS:	60	Q_SIGNALS:
50	void restructuredBars();	61	void restructuredBars();
51	void updatedBars();	62	void updatedBars();

tests/auto/qbarset/tst_qbarset.cpp +19 0

                 QFETCH(QString, name);
                 QFETCH(QString, result);
+                QSignalSpy nameSpy(m_barset,SIGNAL(nameChanged()));
                 m_barset->setName(name);
                 QCOMPARE(m_barset->name(), result);
+                QVERIFY(nameSpy.count() == 1);
             }
             void tst_QBarSet::append_data()
                 QCOMPARE(m_barset->count(), 0);
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
+                QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
                 qreal sum(0.0);
                 qreal value(0.0);
                 QCOMPARE(m_barset->count(), count);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), sum));
+                QVERIFY(valueSpy.count() == count);
             }
             void tst_QBarSet::appendOperator_data()
                 QCOMPARE(m_barset->count(), 0);
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
+                QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
                 qreal sum(0.0);
                 qreal value(0.0);
                 QCOMPARE(m_barset->count(), count);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), sum));
+                QVERIFY(valueSpy.count() == count);
             }
             void tst_QBarSet::insert_data()
             {
                 QCOMPARE(m_barset->count(), 0);
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
+                QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
                 m_barset->insert(0, 1.0);       // 1.0
                 QCOMPARE(m_barset->at(0).y(), 1.0);
                 QCOMPARE(m_barset->at(2).y(), 1.0);
                 QCOMPARE(m_barset->count(), 3);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), 6.0));
+                QVERIFY(valueSpy.count() == 3);
             }
             void tst_QBarSet::remove_data()
                 QCOMPARE(m_barset->count(), 0);
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
+                QSignalSpy valueSpy(m_barset,SIGNAL(valuesRemoved(int,int)));
                 m_barset->append(1.0);
                 m_barset->append(2.0);
                 m_barset->append(3.0);
                 QCOMPARE(m_barset->at(1).y(), 4.0);
                 QCOMPARE(m_barset->count(), 2);
                 QCOMPARE(m_barset->sum(), 6.0);
+                QVERIFY(valueSpy.count() == 2);
             }
             void tst_QBarSet::replace_data()
             {
                 QCOMPARE(m_barset->count(), 0);
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
+                QSignalSpy valueSpy(m_barset,SIGNAL(valueChanged(int)));
                 m_barset->append(1.0);
                 m_barset->append(2.0);
                 QCOMPARE(m_barset->at(1).y(), 2.0);
                 QCOMPARE(m_barset->at(2).y(), 3.0);
                 QCOMPARE(m_barset->at(3).y(), 6.0);
+                QVERIFY(valueSpy.count() == 2);
             }
             void tst_QBarSet::at_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