HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1278:86b61f579398

XY model mappers to QML api

Tero Ahola -

r1278:86b61f579398

parent child

Context file:

r1278:86b61f579398

Collapse all files

demos/qmlchart/qml/qmlchart/View4.qml +2 0

                     title: "Scatters"
                     anchors.fill: parent
                     theme: ChartView.ChartThemeBlueCerulean
+                    axisX.max: 4
+                    axisY.max: 4
                     ScatterSeries {
                         id: scatter1

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +38 -20

@@ -31,28 +31,39 Rectangle {
31	title: "Custom model example"	31	title: "Custom model example"
32	anchors.fill: parent	32	anchors.fill: parent
33	theme: ChartView.ChartThemeLight	33	theme: ChartView.ChartThemeLight
		34	axisX.max: 20
		35	axisY.max: 20
34		36
35	// For dynamic data we use a custom data model derived from QAbstractiItemModel	37	// For dynamic data we use a custom data model derived from QAbstractiItemModel
36	CustomModel {	38	CustomModel {
37	id: customModel	39	id: customModel
38	CustomModelElement { values: [~~"Volkswagen"~~, ~~13.5~~, ~~4.4~~] }	40	CustomModelElement { values: [index, "Manufacturer", 1, 2] }
39	CustomModelElement { values: [~~"Toyota"~~, ~~10.9~~, ~~4.2~~] }	41	CustomModelElement { values: [1, "Volkswagen", 13.5, 12.5] }
40	CustomModelElement { values: [~~"Ford"~~, ~~8.6~~, ~~3.0~~] }	42	CustomModelElement { values: [2, "Toyota", 10.9, 9.9] }
41	CustomModelElement { values: [~~"Skoda"~~, ~~8.2~~, ~~1.9~~] }	43	CustomModelElement { values: [3, "Ford", 8.6, 7.6] }
42	CustomModelElement { values: [~~"Volvo"~~, ~~6.8~~, ~~1.5~~] }	44	CustomModelElement { values: [4, "Skoda", 8.2, 7.2] }
		45	CustomModelElement { values: [5, "Volvo", 6.8, 5.8] }
43	}	46	}
44		47
45	LineSeries {	48	LineSeries {
46	name: "~~line~~"	49	name: "Volkswagen"
47		50	HXYModelMapper {
48	// TODO: the new mapper api	51	model: customModel
49	// VXYModelMapper {	52	xRow: 0
50	~~// model: customModel~~	53	yRow: 1
51	~~// xColumn: 0~~	54	first: 2
52	// yColumn: 1	55	}
53	// }
54	}	56	}
55		57
		58	LineSeries {
		59	name: "Toyota"
		60	HXYModelMapper {
		61	model: customModel
		62	xRow: 0
		63	yRow: 2
		64	first: 2
		65	}
		66	}
56		67
57	PieSeries {	68	PieSeries {
58	id: pieSeries	69	id: pieSeries
@@ -64,15 +75,22 Rectangle {
64	VPieModelMapper {	75	VPieModelMapper {
65	series: pieSeries	76	series: pieSeries
66	model: customModel	77	model: customModel
67	labelsColumn: 0	78	labelsColumn: 1
68	valuesColumn: 1	79	valuesColumn: 2
		80	first: 1
69	}	81	}
70		82
71	~~// AreaSeries {~~	83	AreaSeries {
72	~~// name: "area"~~	84	name: "Ford"
73	~~// upperSeries: LineSeries {}~~	85	upperSeries: LineSeries {
74	// lowerSeries: LineSeries {}	86	HXYModelMapper {
75	// }	87	model: customModel
		88	xRow: 0
		89	yRow: 3
		90	first: 2
		91	}
		92	}
		93	}
76		94
77	// BarSeries {	95	// BarSeries {
78	// model: customModel	96	// model: customModel

plugins/declarative/declarativechart.cpp +1 -1

                   m_legend(LegendTop)
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
-                m_chart->axisX()->setNiceNumbersEnabled(false);
+            //    m_chart->axisX()->setNiceNumbersEnabled(false);
             }
             DeclarativeChart::~DeclarativeChart()

plugins/declarative/declarativelineseries.h +7 -1

             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
+            #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries
+            class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
+                Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QColor color READ penColor WRITE setPenColor)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
                 explicit DeclarativeLineSeries(QObject *parent = 0);
                 QDeclarativeListProperty<QObject> declarativeChildren();
+            public: // from QDeclarativeParserStatus
+                void classBegin() { DeclarativeXySeries::classBegin(); }
+                void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public: // from QLineSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QLineSeries::append(x, y); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QLineSeries::remove(x, y); }

plugins/declarative/declarativescatterseries.h +7 -1

             #include "qscatterseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeListProperty>
+            #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries
+            class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
+                Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QColor color READ brushColor WRITE setBrushColor)
                 Q_PROPERTY(QColor borderColor READ penColor WRITE setPenColor)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 QColor brushColor();
                 void setBrushColor(QColor color);
+            public: // from QDeclarativeParserStatus
+                void classBegin() { DeclarativeXySeries::classBegin(); }
+                void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public: // from QScatterSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QScatterSeries::append(x, y); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QScatterSeries::remove(x, y); }

plugins/declarative/declarativesplineseries.h +7 -1

             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
+            #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries
+            class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
+                Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QColor color READ penColor WRITE setPenColor)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
                 explicit DeclarativeSplineSeries(QObject *parent = 0);
                 QDeclarativeListProperty<QObject> declarativeChildren();
+            public: // from QDeclarativeParserStatus
+                void classBegin() { DeclarativeXySeries::classBegin(); }
+                void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public: // from QSplineSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QSplineSeries::append(x, y); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QSplineSeries::remove(x, y); }

plugins/declarative/declarativexyseries.cpp +25 -1

@@ -22,7 +22,8
22	#include "declarativexyseries.h"	22	#include "declarativexyseries.h"
23	#include "declarativechart.h"	23	#include "declarativechart.h"
24	#include <QXYSeries>	24	#include <QXYSeries>
25	#include <QXYModelMapper>	25	#include <QVXYModelMapper>
		26	#include <QHXYModelMapper>
26	#include <QDeclarativeListProperty>	27	#include <QDeclarativeListProperty>
27		28
28	QTCOMMERCIALCHART_BEGIN_NAMESPACE	29	QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -35,6 +36,29 DeclarativeXySeries::~DeclarativeXySeries()
35	{	36	{
36	}	37	}
37		38
		39	void DeclarativeXySeries::classBegin()
		40	{
		41	}
		42
		43	void DeclarativeXySeries::componentComplete()
		44	{
		45	// All the inherited objects must be of type QXYSeries, so it is safe to cast
		46	QXYSeries series = reinterpret_cast<QXYSeries >(this);
		47	foreach(QObject *child, series->children()) {
		48	if (qobject_cast<DeclarativeXyPoint *>(child)) {
		49	// TODO:
		50	// series->append(qobject_cast<DeclarativeXyPoint *>(child));
		51	} else if(qobject_cast<QVXYModelMapper *>(child)) {
		52	QVXYModelMapper mapper = qobject_cast<QVXYModelMapper >(child);
		53	mapper->setSeries(series);
		54	} else if(qobject_cast<QHXYModelMapper *>(child)) {
		55	QHXYModelMapper mapper = qobject_cast<QHXYModelMapper >(child);
		56	mapper->setSeries(series);
		57	}
		58	}
		59	}
		60
		61
38	QColor DeclarativeXySeries::penColor()	62	QColor DeclarativeXySeries::penColor()
39	{	63	{
40	// All the inherited objects must be of type QXYSeries, so it is safe to cast	64	// All the inherited objects must be of type QXYSeries, so it is safe to cast

plugins/declarative/declarativexyseries.h +2 0

                 ~DeclarativeXySeries();
             public:
+                void classBegin();
+                void componentComplete();
                 QColor penColor();
                 void setPenColor(QColor color);
                 DeclarativeXyPoint *at(int index);

plugins/declarative/plugin.cpp +8 -4

             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
+            #include <QVXYModelMapper>
+            #include <QHXYModelMapper>
             #include <QHPieModelMapper>
             #include <QVPieModelMapper>
-            #include <QXYModelMapper>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<DeclarativePieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
+                    qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
+                    qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
+                    qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
+                    qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
                                                       QLatin1String("Trying to create uncreatable: QPieSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                       QLatin1String("Trying to create uncreatable: AbstractItemModel."));
+                    qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
+                                                      QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                       QLatin1String("Trying to create uncreatable: PieModelMapper."));
-                    qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
-                    qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                       QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAxis>(uri, 1, 0, "Axis",

src/xychart/qxymodelmapper.cpp +3 0

             void QXYModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
+                if (m_model == 0 || m_series == 0)
+                    return;
                 if (m_modelSignalsBlock)
                     return;

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