HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1211:c8b3f0fb84c6

Cleaning up declarative implementation

Tero Ahola -

r1211:c8b3f0fb84c6

parent child

Context file:

r1211:c8b3f0fb84c6

Collapse all files

demos/qmlchart/qml/qmlchart/View3.qml +1 -1

                     }
                     AreaSeries {
-                        name: "Swedish"
+                        name: "Finnish"
                         upperSeries: LineSeries {
                             XyPoint { x: 0; y: 0 }
                             XyPoint { x: 1; y: 0 }

demos/qmlchart/qml/qmlchart/View5.qml +2 -2

                     theme: ChartView.ChartThemeLight
                     legend: ChartView.LegendBottom
                     // TODO: labels defined by x-axis, not by bar series
-            //        axisXLabels: ["0", "2008", "1", "2009", "2", "2010", "3", "2012"]
+                    axisXLabels: ["0", "2008", "1", "2009", "2", "2010", "3", "2012"]
                     axisX.max: 10
-                    BarSeries {
+                    GroupedBarSeries {
                         barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
                         BarSet { name: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { name: "Susan"; values: [5, 1, 2, 4, 1, 7] }

plugins/declarative/declarativebarseries.cpp +44 -2

@@ -90,12 +90,54 DeclarativeTableModel *DeclarativeBarSeries::declarativeModel()
90	return qobject_cast<DeclarativeTableModel *>(model());	90	return qobject_cast<DeclarativeTableModel *>(model());
91	}	91	}
92		92
93	void DeclarativeBarSeries::setBarCategories(QStringList categories)	93	DeclarativeGroupedBarSeries::DeclarativeGroupedBarSeries(QDeclarativeItem *parent) :
		94	QGroupedBarSeries(parent)
		95	{
		96	}
		97
		98	void DeclarativeGroupedBarSeries::classBegin()
		99	{
		100	}
		101
		102	void DeclarativeGroupedBarSeries::componentComplete()
		103	{
		104	foreach(QObject *child, children()) {
		105	if (qobject_cast<QBarSet *>(child)) {
		106	QBarSeries::append(qobject_cast<QBarSet *>(child));
		107	}
		108	}
		109	}
		110
		111	QDeclarativeListProperty<DeclarativeBarSet> DeclarativeGroupedBarSeries::initialBarSets()
		112	{
		113	return QDeclarativeListProperty<DeclarativeBarSet>(this, 0, &DeclarativeGroupedBarSeries::appendInitialBarSets);
		114	}
		115
		116	bool DeclarativeGroupedBarSeries::setDeclarativeModel(DeclarativeTableModel *model)
		117	{
		118	QAbstractItemModel m = qobject_cast<QAbstractItemModel >(model);
		119	bool value(false);
		120	if (m) {
		121	setModel(m);
		122	//setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical);
		123	// setModelMapping(0, 1, 1, Qt::Vertical);
		124	} else {
		125	qWarning("DeclarativeGroupedBarSeries: Illegal model");
		126	}
		127	return value;
		128	}
		129
		130	DeclarativeTableModel *DeclarativeGroupedBarSeries::declarativeModel()
		131	{
		132	return qobject_cast<DeclarativeTableModel *>(model());
		133	}
		134
		135	void DeclarativeGroupedBarSeries::setBarCategories(QStringList categories)
94	{	136	{
95	setCategories(categories);	137	setCategories(categories);
96	}	138	}
97		139
98	QStringList DeclarativeBarSeries::barCategories()	140	QStringList DeclarativeGroupedBarSeries::barCategories()
99	{	141	{
100	return categories();	142	return categories();
101	}	143	}

plugins/declarative/declarativebarseries.h +25 -1

@@ -48,7 +48,6 class DeclarativeBarSeries : public QGroupedBarSeries, public QDeclarativeParser
48	Q_OBJECT	48	Q_OBJECT
49	Q_INTERFACES(QDeclarativeParserStatus)	49	Q_INTERFACES(QDeclarativeParserStatus)
50	Q_PROPERTY(DeclarativeTableModel *model READ declarativeModel WRITE setDeclarativeModel)	50	Q_PROPERTY(DeclarativeTableModel *model READ declarativeModel WRITE setDeclarativeModel)
51	Q_PROPERTY(QStringList barCategories READ barCategories WRITE setBarCategories)
52	Q_PROPERTY(QDeclarativeListProperty<DeclarativeBarSet> initialBarSets READ initialBarSets)	51	Q_PROPERTY(QDeclarativeListProperty<DeclarativeBarSet> initialBarSets READ initialBarSets)
53	Q_CLASSINFO("DefaultProperty", "initialBarSets")	52	Q_CLASSINFO("DefaultProperty", "initialBarSets")
54		53
@@ -63,8 +62,33 public: // from QDeclarativeParserStatus
63	public:	62	public:
64	bool setDeclarativeModel(DeclarativeTableModel *model);	63	bool setDeclarativeModel(DeclarativeTableModel *model);
65	DeclarativeTableModel *declarativeModel();	64	DeclarativeTableModel *declarativeModel();
		65
		66	public Q_SLOTS:
		67	static void appendInitialBarSets(QDeclarativeListProperty<DeclarativeBarSet> /list/, DeclarativeBarSet /element/) {}
		68	};
		69
		70	class DeclarativeGroupedBarSeries : public QGroupedBarSeries, public QDeclarativeParserStatus
		71	{
		72	Q_OBJECT
		73	Q_INTERFACES(QDeclarativeParserStatus)
		74	Q_PROPERTY(DeclarativeTableModel *model READ declarativeModel WRITE setDeclarativeModel)
		75	Q_PROPERTY(QStringList barCategories READ barCategories WRITE setBarCategories)
		76	Q_PROPERTY(QDeclarativeListProperty<DeclarativeBarSet> initialBarSets READ initialBarSets)
		77	Q_CLASSINFO("DefaultProperty", "initialBarSets")
		78
		79	public:
		80	explicit DeclarativeGroupedBarSeries(QDeclarativeItem *parent = 0);
		81	QDeclarativeListProperty<DeclarativeBarSet> initialBarSets();
		82
		83	public: // from QDeclarativeParserStatus
		84	void classBegin();
		85	void componentComplete();
		86
		87	public:
66	void setBarCategories(QStringList categories);	88	void setBarCategories(QStringList categories);
67	QStringList barCategories();	89	QStringList barCategories();
		90	bool setDeclarativeModel(DeclarativeTableModel *model);
		91	DeclarativeTableModel *declarativeModel();
68		92
69	public Q_SLOTS:	93	public Q_SLOTS:
70	static void appendInitialBarSets(QDeclarativeListProperty<DeclarativeBarSet> /list/, DeclarativeBarSet /element/) {}	94	static void appendInitialBarSets(QDeclarativeListProperty<DeclarativeBarSet> /list/, DeclarativeBarSet /element/) {}

plugins/declarative/declarativelineseries.cpp +1 -3

             {
                 QXYSeries *series = qobject_cast<QXYSeries*>(list->object);
                 DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(element);
-                if (series && point) {
+                if (series && point)
-                    qDebug() << "DeclarativeScatterSeries::appendDeclarativeChildren:" << *point;
                     series->append(*point);
             }
             #include "moc_declarativelineseries.cpp"

plugins/declarative/declarativesplineseries.cpp +2 -3

             {
                 QXYSeries *series = qobject_cast<QXYSeries*>(list->object);
                 DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(element);
-                if (series && point) {
+                if (series && point)
-                    qDebug() << "DeclarativeScatterSeries::appendDeclarativeChildren:" << *point;
                     series->append(*point);
             }
             #include "moc_declarativesplineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/plugin.cpp +2 -4

                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
                     qmlRegisterUncreatableType<QAxis>(uri, 1, 0, "Axis",
                                                       QLatin1String("Trying to create uncreatable: Axis."));
-                    //qmlRegisterType<DeclarativeAxisCategory>(uri, 1, 0, "AxisCategory");
                     qmlRegisterType<DeclarativeXyPoint>(uri, 1, 0, "XyPoint");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
+                    qmlRegisterType<DeclarativeGroupedBarSeries>(uri, 1, 0, "GroupedBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "ChartModel");
                     qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "ChartModelElement");
-                    //qmlRegisterType<DeclarativePieMapping>(uri, 1, 0, "PieMapping");
-                    //qmlRegisterType<QPieModelMapper>(uri, 1, 0, "PieModelMapper");
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
-                                                                QLatin1String("Trying to create uncreatable: PieModelMapper."));
+                                                                QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                 }
             };

src/charttheme.cpp 0 -3

             {
                 Q_ASSERT(pos >= 0 && pos <= 1.0);
-                // another possibility:
-                // http://stackoverflow.com/questions/3306786/get-intermediate-color-from-a-gradient
                 QGradientStops stops = gradient.stops();
                 int count = stops.count();

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