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

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

Fix issue with qmloscilloscope in Qt5
Jani Honkonen -
r2250:e351331dbdf9
parent child
Show More
Side by Side Unified
Context file:
r2250:e351331dbdf9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,152 +1,153
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 "qchart.h"
21 #include "qchart.h"
22 #include "qabstractaxis.h"
22 #include "qabstractaxis.h"
23 #include "qvalueaxis.h"
23 #include "qvalueaxis.h"
24 #include "declarativecategoryaxis.h"
24 #include "declarativecategoryaxis.h"
25 #include "qbarcategoryaxis.h"
25 #include "qbarcategoryaxis.h"
26 #include "declarativechart.h"
26 #include "declarativechart.h"
27 #include "declarativexypoint.h"
27 #include "declarativexypoint.h"
28 #include "declarativelineseries.h"
28 #include "declarativelineseries.h"
29 #include "declarativesplineseries.h"
29 #include "declarativesplineseries.h"
30 #include "declarativeareaseries.h"
30 #include "declarativeareaseries.h"
31 #include "declarativescatterseries.h"
31 #include "declarativescatterseries.h"
32 #include "declarativebarseries.h"
32 #include "declarativebarseries.h"
33 #include "declarativepieseries.h"
33 #include "declarativepieseries.h"
34 #include "qvxymodelmapper.h"
34 #include "qvxymodelmapper.h"
35 #include "qhxymodelmapper.h"
35 #include "qhxymodelmapper.h"
36 #include "qhpiemodelmapper.h"
36 #include "qhpiemodelmapper.h"
37 #include "qvpiemodelmapper.h"
37 #include "qvpiemodelmapper.h"
38 #include "qhbarmodelmapper.h"
38 #include "qhbarmodelmapper.h"
39 #include "qvbarmodelmapper.h"
39 #include "qvbarmodelmapper.h"
40 #include "declarativemargins.h"
40 #include "declarativemargins.h"
41 #ifndef QT_ON_ARM
41 #ifndef QT_ON_ARM
42 #include "qdatetimeaxis.h"
42 #include "qdatetimeaxis.h"
43 #endif
43 #endif
44 #include <QAbstractItemModel>
44 #include <QAbstractItemModel>
45 #include <QtDeclarative/qdeclarativeextensionplugin.h>
45 #include <QtDeclarative/qdeclarativeextensionplugin.h>
46 #include <QtDeclarative/qdeclarative.h>
46 #include <QtDeclarative/qdeclarative.h>
47
47
48 QTCOMMERCIALCHART_USE_NAMESPACE
48 QTCOMMERCIALCHART_USE_NAMESPACE
49
49
50 Q_DECLARE_METATYPE(QList<QPieSlice *>)
50 Q_DECLARE_METATYPE(QList<QPieSlice *>)
51 Q_DECLARE_METATYPE(QList<QBarSet *>)
51 Q_DECLARE_METATYPE(QList<QBarSet *>)
52 Q_DECLARE_METATYPE(QAbstractSeries *)
52
53
53 QTCOMMERCIALCHART_BEGIN_NAMESPACE
54 QTCOMMERCIALCHART_BEGIN_NAMESPACE
54
55
55 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
56 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
56 {
57 {
57 Q_OBJECT
58 Q_OBJECT
58
59
59 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
60 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
60 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface")
61 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface")
61 #endif
62 #endif
62
63
63 public:
64 public:
64 virtual void registerTypes(const char *uri)
65 virtual void registerTypes(const char *uri)
65 {
66 {
66 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
67 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
67
68
68 qRegisterMetaType<QList<QPieSlice *> >();
69 qRegisterMetaType<QList<QPieSlice *> >();
69 qRegisterMetaType<QList<QBarSet *> >();
70 qRegisterMetaType<QList<QBarSet *> >();
70
71
71 // QtCommercial.Chart 1.0
72 // QtCommercial.Chart 1.0
72 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
73 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
73 qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
74 qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
74 qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
75 qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
75 qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
76 qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
76 qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
77 qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
77 qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
78 qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
78 qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
79 qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
79 qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
80 qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
80 qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
81 qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
81 qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
82 qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
82 qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
83 qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
83 qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
84 qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
84 qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
85 qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
85 qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
86 qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
86 qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
87 qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
87 qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
88 qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
88 qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
89 qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
89 qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
90 qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
90 qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
91 qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
91 qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
92 qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
92 qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
93 qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
93 QLatin1String("Trying to create uncreatable: Legend."));
94 QLatin1String("Trying to create uncreatable: Legend."));
94 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
95 qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
95 QLatin1String("Trying to create uncreatable: XYSeries."));
96 QLatin1String("Trying to create uncreatable: XYSeries."));
96 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
97 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
97 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
98 QLatin1String("Trying to create uncreatable: AbstractItemModel."));
98 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
99 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
99 QLatin1String("Trying to create uncreatable: XYModelMapper."));
100 QLatin1String("Trying to create uncreatable: XYModelMapper."));
100 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
101 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
101 QLatin1String("Trying to create uncreatable: PieModelMapper."));
102 QLatin1String("Trying to create uncreatable: PieModelMapper."));
102 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
103 qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
103 QLatin1String("Trying to create uncreatable: BarModelMapper."));
104 QLatin1String("Trying to create uncreatable: BarModelMapper."));
104 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
105 qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
105 QLatin1String("Trying to create uncreatable: AbstractSeries."));
106 QLatin1String("Trying to create uncreatable: AbstractSeries."));
106 qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
107 qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
107 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
108 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
108 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
109 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
109 QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
110 QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
110 qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
111 qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
111 QLatin1String("Trying to create uncreatable: BarsetBase."));
112 QLatin1String("Trying to create uncreatable: BarsetBase."));
112 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
113 qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
113 QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
114 QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
114
115
115 // QtCommercial.Chart 1.1
116 // QtCommercial.Chart 1.1
116 qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
117 qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
117 qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
118 qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
118 qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
119 qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
119 qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
120 qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
120 qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
121 qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
121 qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
122 qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
122 qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
123 qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
123 qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
124 qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
124 qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
125 qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
125 qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
126 qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
126 qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
127 qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
127 qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
128 qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
128 qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
129 qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
129 qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
130 qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
130 #ifndef QT_ON_ARM
131 #ifndef QT_ON_ARM
131 qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
132 qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
132 #endif
133 #endif
133 qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
134 qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
134 qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
135 qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
135 qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
136 qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
136 qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
137 qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
137 QLatin1String("Trying to create uncreatable: Margins."));
138 QLatin1String("Trying to create uncreatable: Margins."));
138
139
139 // QtCommercial.Chart 1.2
140 // QtCommercial.Chart 1.2
140 qmlRegisterType<DeclarativeChart, 2>(uri, 1, 2, "ChartView");
141 qmlRegisterType<DeclarativeChart, 2>(uri, 1, 2, "ChartView");
141 }
142 }
142 };
143 };
143
144
144 #include "plugin.moc"
145 #include "plugin.moc"
145
146
146 QTCOMMERCIALCHART_END_NAMESPACE
147 QTCOMMERCIALCHART_END_NAMESPACE
147
148
148 QTCOMMERCIALCHART_USE_NAMESPACE
149 QTCOMMERCIALCHART_USE_NAMESPACE
149
150
150 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
151 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
151 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
152 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
152 #endif
153 #endif
General Comments 0
You need to be logged in to leave comments. Login now