##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixed buggy conflict resolve in previous commit
Tero Ahola -
r1551:59fac8618a68
parent child
Show More
Side by Side Unified
Context file:
r1551:59fac8618a68 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,110 +1,109
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2012 Digia Plc
3 ** Copyright (C) 2012 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Commercial Charts Add-on.
7 ** This file is part of the Qt Commercial Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Commercial licenses may use this file in
10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 ** accordance with the Qt Commercial License Agreement provided with the
11 ** accordance with the Qt Commercial License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include <QtDeclarative/qdeclarativeextensionplugin.h>
21 #include <QtDeclarative/qdeclarativeextensionplugin.h>
22 #include <QtDeclarative/qdeclarative.h>
22 #include <QtDeclarative/qdeclarative.h>
23 #include "qchart.h"
23 #include "qchart.h"
24 #include "qabstractaxis.h"
24 #include "qabstractaxis.h"
25 #include "qvaluesaxis.h"
25 #include "qvaluesaxis.h"
26 #include "qcategoriesaxis.h"
26 #include "qcategoriesaxis.h"
27 #include "qaxiscategories.h"
28 #include "declarativechart.h"
27 #include "declarativechart.h"
29 #include "declarativexypoint.h"
28 #include "declarativexypoint.h"
30 #include "declarativelineseries.h"
29 #include "declarativelineseries.h"
31 #include "declarativesplineseries.h"
30 #include "declarativesplineseries.h"
32 #include "declarativeareaseries.h"
31 #include "declarativeareaseries.h"
33 #include "declarativescatterseries.h"
32 #include "declarativescatterseries.h"
34 #include "declarativebarseries.h"
33 #include "declarativebarseries.h"
35 #include "declarativepieseries.h"
34 #include "declarativepieseries.h"
36 #include <QVXYModelMapper>
35 #include <QVXYModelMapper>
37 #include <QHXYModelMapper>
36 #include <QHXYModelMapper>
38 #include <QHPieModelMapper>
37 #include <QHPieModelMapper>
39 #include <QVPieModelMapper>
38 #include <QVPieModelMapper>
40 #include <QHBarModelMapper>
39 #include <QHBarModelMapper>
41 #include <QVBarModelMapper>
40 #include <QVBarModelMapper>
42
41
43 QTCOMMERCIALCHART_BEGIN_NAMESPACE
42 QTCOMMERCIALCHART_BEGIN_NAMESPACE
44
43
45 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
44 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
46 {
45 {
47 Q_OBJECT
46 Q_OBJECT
48 public:
47 public:
49 virtual void registerTypes(const char *uri)
48 virtual void registerTypes(const char *uri)
50 {
49 {
51 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
50 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
52
51
53 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
52 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
54 qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
53 qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
55 qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
54 qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
56 qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
55 qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
57 qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
56 qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
58 qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
57 qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
59 qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
58 qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
60 qmlRegisterType<DeclarativeGroupedBarSeries>(uri, 1, 0, "GroupedBarSeries");
59 qmlRegisterType<DeclarativeGroupedBarSeries>(uri, 1, 0, "GroupedBarSeries");
61 qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
60 qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
62 qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
61 qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
63 qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
62 qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
64 qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
63 qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
65 qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
64 qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
66 qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
65 qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
67 qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
66 qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
68 qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
67 qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
69 qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
68 qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
70 qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
69 qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
71 qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
70 qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
72 qmlRegisterType<QValuesAxis>(uri, 1, 0, "ValuesAxis");
71 qmlRegisterType<QValuesAxis>(uri, 1, 0, "ValuesAxis");
73 qmlRegisterType<QCategoriesAxis>(uri, 1, 0, "CategoriesAxis");
72 qmlRegisterType<QCategoriesAxis>(uri, 1, 0, "CategoriesAxis");
74
73
75 qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
74 qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
76 QLatin1String("Trying to create uncreatable: Legend."));
75 QLatin1String("Trying to create uncreatable: Legend."));
77 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
76 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
78 QLatin1String("Trying to create uncreatable: XYSeries."));
77 QLatin1String("Trying to create uncreatable: XYSeries."));
79 qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
78 qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
80 QLatin1String("Trying to create uncreatable: QScatterSeries."));
79 QLatin1String("Trying to create uncreatable: QScatterSeries."));
81 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
80 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
82 QLatin1String("Trying to create uncreatable: QPieSeries."));
81 QLatin1String("Trying to create uncreatable: QPieSeries."));
83 qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "QBarSet",
82 qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "QBarSet",
84 QLatin1String("Trying to create uncreatable: QBarSet."));
83 QLatin1String("Trying to create uncreatable: QBarSet."));
85 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
84 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
86 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
85 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
87 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
86 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
88 QLatin1String("Trying to create uncreatable: XYModelMapper."));
87 QLatin1String("Trying to create uncreatable: XYModelMapper."));
89 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
88 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
90 QLatin1String("Trying to create uncreatable: PieModelMapper."));
89 QLatin1String("Trying to create uncreatable: PieModelMapper."));
91 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
90 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
92 QLatin1String("Trying to create uncreatable: BarModelMapper."));
91 QLatin1String("Trying to create uncreatable: BarModelMapper."));
93 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
92 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
94 QLatin1String("Trying to create uncreatable: AbstractSeries."));
93 QLatin1String("Trying to create uncreatable: AbstractSeries."));
95 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
94 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
96 QLatin1String("Trying to create uncreatable: AbstractAxis."));
95 QLatin1String("Trying to create uncreatable: AbstractAxis."));
97 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
96 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
98 QLatin1String("Trying to create uncreatable: PieModelMapper."));
97 QLatin1String("Trying to create uncreatable: PieModelMapper."));
99 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
98 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
100 QLatin1String("Trying to create uncreatable: XYModelMapper."));
99 QLatin1String("Trying to create uncreatable: XYModelMapper."));
101 }
100 }
102 };
101 };
103
102
104 #include "plugin.moc"
103 #include "plugin.moc"
105
104
106 QTCOMMERCIALCHART_END_NAMESPACE
105 QTCOMMERCIALCHART_END_NAMESPACE
107
106
108 QTCOMMERCIALCHART_USE_NAMESPACE
107 QTCOMMERCIALCHART_USE_NAMESPACE
109
108
110 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
109 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
General Comments 0
You need to be logged in to leave comments. Login now