HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1543:047096c16fcf

Fixed signaling in QLegend

Tero Ahola -

r1543:047096c16fcf

parent child

Context file:

r1543:047096c16fcf

Collapse all files

src/legend/qlegend.cpp +3 -6

                 if (d_ptr->m_brush != brush) {
                     d_ptr->m_brush = brush;
                     update();
+                    emit colorChanged(brush.color());
                 }
             }
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                     setBrush(b);
-                    emit colorChanged(color);
                 }
             }
                 if (d_ptr->m_pen != pen) {
                     d_ptr->m_pen = pen;
                     update();
+                    emit borderColorChanged(pen.color());
                 }
             }
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
-                    emit borderColorChanged(color);
                 }
             }
             void QLegend::setLabelBrush(const QBrush &brush)
             {
                 if (d_ptr->m_labelBrush != brush) {
                     d_ptr->m_labelBrush = brush;
                     foreach (LegendMarker *marker, d_ptr->markers()) {
                         marker->setLabelBrush(d_ptr->m_labelBrush);
                     }
-                    emit labelBrushChanged(brush);
+                    emit labelColorChanged(brush.color());
                 }
             }
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                     setLabelBrush(b);
-                    emit labelColorChanged(color);
                 }
             }

src/legend/qlegend.h 0 -1

                 void colorChanged(QColor color);
                 void borderColorChanged(QColor color);
                 void fontChanged(QFont font);
-                void labelBrushChanged(QBrush brush);
                 void labelColorChanged(QColor color);
             private:

tests/auto/qchart/tst_qchart.cpp +38 -1

@@ -360,7 +360,44 void tst_QChart::legend_data()
360		360
361	void tst_QChart::legend()	361	void tst_QChart::legend()
362	{	362	{
363	Q~~VERIFY~~(m_chart->legend());	363	QLegend *legend = m_chart->legend();
		364	QVERIFY(legend);
		365
		366	// Colors related signals
		367	QSignalSpy colorSpy(legend, SIGNAL(colorChanged(QColor)));
		368	QSignalSpy borderColorSpy(legend, SIGNAL(borderColorChanged(QColor)));
		369	QSignalSpy labelColorSpy(legend, SIGNAL(labelColorChanged(QColor)));
		370
		371	// colorChanged
		372	legend->setColor(QColor("aliceblue"));
		373	QCOMPARE(colorSpy.count(), 1);
		374	QBrush b = legend->brush();
		375	b.setColor(QColor("aqua"));
		376	legend->setBrush(b);
		377	QCOMPARE(colorSpy.count(), 2);
		378
		379	// borderColorChanged
		380	legend->setBorderColor(QColor("aliceblue"));
		381	QCOMPARE(borderColorSpy.count(), 1);
		382	QPen p = legend->pen();
		383	p.setColor(QColor("aqua"));
		384	legend->setPen(p);
		385	QCOMPARE(borderColorSpy.count(), 2);
		386
		387	// labelColorChanged
		388	legend->setLabelColor(QColor("lightsalmon"));
		389	QCOMPARE(labelColorSpy.count(), 1);
		390	b = legend->labelBrush();
		391	b.setColor(QColor("lightseagreen"));
		392	legend->setLabelBrush(b);
		393	QCOMPARE(labelColorSpy.count(), 2);
		394
		395	// fontChanged
		396	QSignalSpy fontSpy(legend, SIGNAL(fontChanged(QFont)));
		397	QFont f = legend->font();
		398	f.setBold(!f.bold());
		399	legend->setFont(f);
		400	QCOMPARE(fontSpy.count(), 1);
364	}	401	}
365		402
366	void tst_QChart::margins_data()	403	void tst_QChart::margins_data()

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml 0 -1

                 legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                 legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
                 legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
-                legend.onLabelBrushChanged:        console.log("legend.onLabelBrushChanged: " + brush);
                 axisX.onColorChanged:               console.log("axisX.onColorChanged: " + color);
                 axisX.onLabelsVisibleChanged:       console.log("axisX.onLabelsVisibleChanged: " + visible);

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