HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1342:8e3983e15cdc

Visible property to abstract series

Tero Ahola -

r1342:8e3983e15cdc

parent child

Context file:

r1342:8e3983e15cdc

Collapse all files

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +51 -10

@@ -27,7 +27,7 Rectangle {
27	height: parent.height	27	height: parent.height
28		28
29	ChartView {	29	ChartView {
30	id: chart	30	id: chartView
31	title: "Top-5 car brand shares in Finland"	31	title: "Top-5 car brand shares in Finland"
32	anchors.fill: parent	32	anchors.fill: parent
33	theme: ChartView.ChartThemeLight	33	theme: ChartView.ChartThemeLight
@@ -53,6 +53,7 Rectangle {
53	BarSeries {	53	BarSeries {
54	name: "Others"	54	name: "Others"
55	barMargin: 0	55	barMargin: 0
		56	visible: false
56	HBarModelMapper {	57	HBarModelMapper {
57	model: customModel	58	model: customModel
58	firstBarSetRow: 6	59	firstBarSetRow: 6
@@ -62,10 +63,9 Rectangle {
62	}	63	}
63		64
64	LineSeries {	65	LineSeries {
65	id: lineSeries
66	name: "Volkswagen"	66	name: "Volkswagen"
		67	visible: false
67	HXYModelMapper {	68	HXYModelMapper {
68	id: lineSeriesMapper
69	model: customModel	69	model: customModel
70	xRow: 0	70	xRow: 0
71	yRow: 1	71	yRow: 1
@@ -73,6 +73,50 Rectangle {
73	}	73	}
74	}	74	}
75		75
		76	LineSeries {
		77	name: "Toyota"
		78	visible: false
		79	HXYModelMapper {
		80	model: customModel
		81	xRow: 0
		82	yRow: 2
		83	first: 2
		84	}
		85	}
		86
		87	LineSeries {
		88	name: "Ford"
		89	visible: false
		90	HXYModelMapper {
		91	model: customModel
		92	xRow: 0
		93	yRow: 2
		94	first: 2
		95	}
		96	}
		97
		98	LineSeries {
		99	name: "Skoda"
		100	visible: false
		101	HXYModelMapper {
		102	model: customModel
		103	xRow: 0
		104	yRow: 3
		105	first: 2
		106	}
		107	}
		108
		109	LineSeries {
		110	name: "Volvo"
		111	visible: false
		112	HXYModelMapper {
		113	model: customModel
		114	xRow: 0
		115	yRow: 4
		116	first: 2
		117	}
		118	}
		119
76	PieSeries {	120	PieSeries {
77	id: pieSeries	121	id: pieSeries
78	size: 0.4	122	size: 0.4
@@ -80,15 +124,12 Rectangle {
80	verticalPosition: 0.4	124	verticalPosition: 0.4
81	onClicked: {	125	onClicked: {
82	// Show the selection by exploding the slice	126	// Show the selection by exploding the slice
83	for (var i = 0; i < pieSeries.count; i++)	127	slice.exploded = !slice.exploded;
84	pieSeries.at(i).exploded = false;
85	slice.exploded = true;
86		128
87	// Update the line series to show the yearly data for this slice	129	// Update the line series to show the yearly data for this slice
88	lineSeries.name = slice.label;	130	for (var i = 0; i < chartView.count; i++) {
89	for (var j = 0; j < customModel.rowCount; j++) {	131	if (chartView.series(i).name == slice.label) {
90	if (customModel.at(j, 1) == slice.label) {	132	chartView.series(i).visible = slice.exploded;
91	lineSeriesMapper.yRow = j;
92	}	133	}
93	}	134	}
94	}	135	}

src/areachart/areachartitem.cpp +3 0

                     m_lower = new AreaBoundItem(this,m_series->lowerSeries(),presenter);
                 QObject::connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
+                QObject::connect(m_series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 QObject::connect(this,SIGNAL(clicked(QPointF)),areaSeries,SIGNAL(clicked(QPointF)));
                 handleUpdated();
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
+                if (m_series->isVisible()) {
                     painter->save();
                     painter->setPen(m_linePen);
                     painter->setBrush(m_brush);
                     }
                     painter->restore();
                 }
+            }
             void AreaChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {

src/barchart/barchartitem.cpp +1 0

                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
+                connect(series, SIGNAL(visibleChanged()), this, SLOT(handleLayoutChanged()));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 handleDataStructureChanged();
             }

src/barchart/qbarseries.cpp 0 -18

@@ -183,24 +183,6 QList<QBarSet*> QBarSeries::barSets() const
183	}	183	}
184		184
185	/*!	185	/*!
186	Sets the visibility of series to \a visible
187	*/
188	void QBarSeries::setVisible(bool visible)
189	{
190	Q_D(QBarSeries);
191	d->setVisible(visible);
192	}
193
194	/*!
195	Returns the visibility of series
196	*/
197	bool QBarSeries::isVisible() const
198	{
199	Q_D(const QBarSeries);
200	return d->isVisible();
201	}
202
203	/*!
204	Sets the visibility of labels in series to \a visible	186	Sets the visibility of labels in series to \a visible
205	*/	187	*/
206	void QBarSeries::setLabelsVisible(bool visible)	188	void QBarSeries::setLabelsVisible(bool visible)

src/barchart/qbarseries.h +1 -4

             {
                 Q_OBJECT
                 Q_PROPERTY(qreal barMargin READ barMargin WRITE setBarMargin)
-                Q_PROPERTY(int count READ barsetCount) // TODO: categoryCount to be removed
+                Q_PROPERTY(int count READ barsetCount)
-                Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible)
             public:
                 QList<QBarSet*> barSets() const;
                 void clear();
-                void setVisible(bool visible = true);
-                bool isVisible() const;
                 void setLabelsVisible(bool visible = true);
                 bool isLabelsVisible() const;

src/linechart/linechartitem.cpp +3 0

             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
+                if (m_series->isVisible()) {
                     painter->save();
                     painter->setPen(m_linePen);
                     painter->setClipRect(clipRect());
                     }
                     painter->restore();
                 }
+            }
             void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {

src/qabstractseries.cpp +22 -2

             {
                 if (name != d_ptr->m_name) {
                     d_ptr->m_name = name;
-                    nameChanged();
+                    emit nameChanged();
                 }
             }
             }
             /*!
+                Sets the visibility of series to \a visible
+            */
+            void QAbstractSeries::setVisible(bool visible)
+            {
+                if (visible != d_ptr->m_visible) {
+                    d_ptr->m_visible = visible;
+                    emit visibleChanged();
+                }
+            }
+            /*!
+                Returns the visibility of series
+            */
+            bool QAbstractSeries::isVisible() const
+            {
+                return d_ptr->m_visible;
+            }
+            /*!
                 \brief Returns the chart where series belongs to.
                 Set automatically when the series is added to the chart
             QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries* q):
                 q_ptr(q),
                 m_chart(0),
-                m_dataset(0)
+                m_dataset(0),
+                m_visible(true)
             {
             }

src/qabstractseries.h +4 0

             {
                 Q_OBJECT
                 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+                Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
                 Q_ENUMS(SeriesType)
             public:
                 virtual SeriesType type() const = 0;
                 void setName(const QString& name);
                 QString name() const;
+                void setVisible(bool visible = true);
+                bool isVisible() const;
                 QChart* chart() const;
             Q_SIGNALS:
                 void nameChanged();
+                void visibleChanged();
             protected:
                 QScopedPointer<QAbstractSeriesPrivate> d_ptr;

src/qabstractseries_p.h +1 0

                 QChart *m_chart;
                 ChartDataSet *m_dataset;
                 QString m_name;
+                bool m_visible;
                 friend class QAbstractSeries;
                 friend class ChartDataSet;

src/scatterchart/scatterchartitem.cpp +1 0

                 m_size(15)
             {
                 QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);

src/splinechart/splinechartitem.cpp +3 0

             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
             {
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
+                if (m_series->isVisible()) {
                     painter->save();
                     painter->setClipRect(clipRect());
                     painter->setPen(m_linePen);
                     }
                     painter->restore();
                 }
+            }
             void SplineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {

src/xychart/qxyseries.cpp +1 -1

             */
             QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent) : QAbstractSeries(d, parent)
             {
             }
             /*!
                 Destroys the object. Series added to QChartView or QChart instances are owned by those,
                 and are deleted when mentioned object are destroyed.

tests/auto/qbarset/tst_qbarset.cpp 0 -1

                 // Test adding data to the sets
                 *set1 << 1 << 2 << 1 << 3;
                 *set2 << 2 << 1 << 3 << 1;
-                QTest::qWait(3000);
             }
             QTEST_MAIN(tst_QBarSet)

tests/auto/qxyseries/tst_qxyseries.cpp +12 0

@@ -348,3 +348,15 void tst_QXYSeries::pointsVisible_raw()
348	TRY_COMPARE(spy0.count(), 0);	348	TRY_COMPARE(spy0.count(), 0);
349	QCOMPARE(m_series->pointsVisible(), pointsVisible);	349	QCOMPARE(m_series->pointsVisible(), pointsVisible);
350	}	350	}
		351
		352	void tst_QXYSeries::changedSignals()
		353	{
		354	QSignalSpy visibleSpy(m_series, SIGNAL(visibleChanged()));
		355
		356	m_series->setVisible(false);
		357	m_series->setVisible(false);
		358	TRY_COMPARE(visibleSpy.count(), 1);
		359	m_series->setVisible(true);
		360	TRY_COMPARE(visibleSpy.count(), 2);
		361	}
		362

tests/auto/qxyseries/tst_qxyseries.h +1 0

                 void replace_chart();
                 void replace_chart_animation_data();
                 void replace_chart_animation();
+                void changedSignals();
             protected:
                 void append_data();
                 void count_data();

tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +4 0

                 property variant series
                 Button {
+                    text: "visible"
+                    onClicked: series.visible = !series.visible;
+                }
+                Button {
                     text: "color"
                     onClicked: series.color = main.nextColor();
                 }

tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +12 -12

@@ -28,18 +28,6 Flow {
28	property variant series	28	property variant series
29		29
30	Button {	30	Button {
31	text: "set 1 color"
32	onClicked: series.at(0).color = main.nextColor();
33	}
34	Button {
35	text: "set 1 border color"
36	onClicked: series.at(0).borderColor = main.nextColor();
37	}
38	Button {
39	text: "set 1 label color"
40	onClicked: series.at(0).labelColor = main.nextColor();
41	}
42	Button {
43	text: "visible"	31	text: "visible"
44	onClicked: series.visible = !series.visible;	32	onClicked: series.visible = !series.visible;
45	}	33	}
@@ -56,6 +44,18 Flow {
56	onClicked: series.barMargin -= 0.1;	44	onClicked: series.barMargin -= 0.1;
57	}	45	}
58	Button {	46	Button {
		47	text: "set 1 color"
		48	onClicked: series.at(0).color = main.nextColor();
		49	}
		50	Button {
		51	text: "set 1 border color"
		52	onClicked: series.at(0).borderColor = main.nextColor();
		53	}
		54	Button {
		55	text: "set 1 label color"
		56	onClicked: series.at(0).labelColor = main.nextColor();
		57	}
		58	Button {
59	text: "set 1 font size +"	59	text: "set 1 font size +"
60	onClicked: series.at(0).labelFont.pixelSize += 1;	60	onClicked: series.at(0).labelFont.pixelSize += 1;
61	}	61	}

tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +4 0

                 property variant series
                 Button {
+                    text: "visible"
+                    onClicked: series.visible = !series.visible;
+                }
+                Button {
                     text: "color"
                     onClicked: series.color = main.nextColor();
                 }

tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +44 -40

@@ -28,6 +28,50 Flow {
28	property variant series	28	property variant series
29		29
30	Button {	30	Button {
		31	text: "visible"
		32	onClicked: series.visible = !series.visible;
		33	}
		34	Button {
		35	text: "series hpos +"
		36	onClicked: series.horizontalPosition += 0.1;
		37	}
		38	Button {
		39	text: "series hpos -"
		40	onClicked: series.horizontalPosition -= 0.1;
		41	}
		42	Button {
		43	text: "series vpos +"
		44	onClicked: series.verticalPosition += 0.1;
		45	}
		46	Button {
		47	text: "series vpos -"
		48	onClicked: series.verticalPosition -= 0.1;
		49	}
		50	Button {
		51	text: "series size +"
		52	onClicked: series.size += 0.1;
		53	}
		54	Button {
		55	text: "series size -"
		56	onClicked: series.size -= 0.1;
		57	}
		58	Button {
		59	text: "series start angle +"
		60	onClicked: series.startAngle += 0.1;
		61	}
		62	Button {
		63	text: "series start angle -"
		64	onClicked: series.startAngle -= 0.1;
		65	}
		66	Button {
		67	text: "series end angle +"
		68	onClicked: series.endAngle += 0.1;
		69	}
		70	Button {
		71	text: "series end angle -"
		72	onClicked: series.endAngle -= 0.1;
		73	}
		74	Button {
31	text: "slice color"	75	text: "slice color"
32	onClicked: series.at(0).color = main.nextColor();	76	onClicked: series.at(0).color = main.nextColor();
33	}	77	}
@@ -71,44 +115,4 Flow {
71	text: "slice explode dist -"	115	text: "slice explode dist -"
72	onClicked: series.at(0).explodeDistanceFactor -= 0.1;	116	onClicked: series.at(0).explodeDistanceFactor -= 0.1;
73	}	117	}
74	Button {
75	text: "series hpos +"
76	onClicked: series.horizontalPosition += 0.1;
77	}
78	Button {
79	text: "series hpos -"
80	onClicked: series.horizontalPosition -= 0.1;
81	}
82	Button {
83	text: "series vpos +"
84	onClicked: series.verticalPosition += 0.1;
85	}
86	Button {
87	text: "series vpos -"
88	onClicked: series.verticalPosition -= 0.1;
89	}
90	Button {
91	text: "series size +"
92	onClicked: series.size += 0.1;
93	}
94	Button {
95	text: "series size -"
96	onClicked: series.size -= 0.1;
97	}
98	Button {
99	text: "series start angle +"
100	onClicked: series.startAngle += 0.1;
101	}
102	Button {
103	text: "series start angle -"
104	onClicked: series.startAngle -= 0.1;
105	}
106	Button {
107	text: "series end angle +"
108	onClicked: series.endAngle += 0.1;
109	}
110	Button {
111	text: "series end angle -"
112	onClicked: series.endAngle -= 0.1;
113	}
114	}	118	}

tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +4 0

                 property variant series
                 Button {
+                    text: "visible"
+                    onClicked: series.visible = !series.visible;
+                }
+                Button {
                     text: "color"
                     onClicked: series.color = main.nextColor();
                 }

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