HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1780:94c0d22f0f14

Optimization: line series now uses QPainter::drawLine

Tero Ahola -

r1780:94c0d22f0f14

parent child

Context file:

r1780:94c0d22f0f14

Collapse all files

src/linechart/linechartitem.cpp +5 -1

                 painter->save();
                 painter->setPen(m_linePen);
                 painter->setClipRect(clipRect());
-                painter->drawPath(m_path);
+                // Draw lines
+                const QVector<QPointF> &points = geometryPoints();
+                for (int i(1); i < points.size();i++)
+                    painter->drawLine(points.at(i-1), points.at(i));
+                // Draw points
                 if (m_pointsVisible){
                     painter->setPen(m_pointPen);
                     painter->drawPoints(geometryPoints());

tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +33 -21

@@ -45,31 +45,43 ChartView {
45	XYPoint { x: 10; y: 3 }	45	XYPoint { x: 10; y: 3 }
46	XYPoint { x: 11; y: 3 }	46	XYPoint { x: 11; y: 3 }
47	}	47	}
48	lowerSeries: LineSeries {
49	XYPoint { x: 0; y: 0 }
50	XYPoint { x: 1; y: 0 }
51	XYPoint { x: 2; y: 0 }
52	XYPoint { x: 3; y: 0 }
53	XYPoint { x: 4; y: 0 }
54	XYPoint { x: 5; y: 0 }
55	XYPoint { x: 6; y: 0 }
56	XYPoint { x: 7; y: 0 }
57	XYPoint { x: 8; y: 0 }
58	XYPoint { x: 9; y: 0 }
59	XYPoint { x: 10; y: 0 }
60	XYPoint { x: 11; y: 0 }
61	}
62		48
63	onNameChanged: console.log(~~"areaSeries~~.onNameChanged: " + name);	49	onNameChanged: console.log(name + ".onNameChanged: " + name);
64	onVisibleChanged: console.log(~~"areaSeries~~.onVisibleChanged: " + visible);	50	onVisibleChanged: console.log(name + ".onVisibleChanged: " + visible);
65	onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y);	51	onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y);
66	onSelected: console.log(~~"areaSeries~~.onSelected");	52	onSelected: console.log(name + ".onSelected");
67	onColorChanged: console.log(~~"areaSeries~~.onColorChanged: " + color);	53	onColorChanged: console.log(name + ".onColorChanged: " + color);
68	onBorderColorChanged: console.log(~~"areaSeries~~.onBorderColorChanged: " + borderColor);	54	onBorderColorChanged: console.log(name + ".onBorderColorChanged: " + borderColor);
69	// onCountChanged: console.log(~~"areaSeries~~.onCountChanged: " + count);	55	// onCountChanged: console.log(name + ".onCountChanged: " + count);
70		56
71	Component.onCompleted: {	57	Component.onCompleted: {
72	createDefaultAxes();	58	createDefaultAxes();
		59	}
		60	}
		61
		62	AreaSeries {
		63	name: "area 2"
		64
		65	upperSeries: LineSeries {
		66	XYPoint { x: 0; y: 0.5 }
		67	XYPoint { x: 1; y: 1.5 }
		68	XYPoint { x: 2; y: 0.3 }
		69	XYPoint { x: 3; y: 1.5 }
		70	XYPoint { x: 4; y: 0.1 }
		71	XYPoint { x: 5; y: 0.3 }
		72	XYPoint { x: 6; y: 1.2 }
		73	XYPoint { x: 7; y: 1.3 }
		74	XYPoint { x: 8; y: 0.2 }
		75	XYPoint { x: 9; y: 0.1 }
		76	XYPoint { x: 10; y: 3.2 }
		77	XYPoint { x: 11; y: 4.6 }
73	}	78	}
		79
		80	onNameChanged: console.log(name + ".onNameChanged: " + name);
		81	onVisibleChanged: console.log(name + ".onVisibleChanged: " + visible);
		82	onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y);
		83	onSelected: console.log(name + ".onSelected");
		84	onColorChanged: console.log(name + ".onColorChanged: " + color);
		85	onBorderColorChanged: console.log(name + ".onBorderColorChanged: " + borderColor);
74	}	86	}
75	}	87	}

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +2 -2

             import QtCommercial.Chart 1.0
             ChartView {
-                title: "Grouped bar series"
+                title: "Bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                     setAxisX(myAxis,mySeries);
                 }
-            }
  No newline at end of file

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