|
|
@@
-1,689
+1,677
|
|
|
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 "declarativechart.h"
|
|
21
|
#include "declarativechart.h"
|
|
|
22
|
#include <QPainter>
|
|
22
|
#include <QPainter>
|
|
|
23
|
#include <QDeclarativeEngine>
|
|
23
|
#include <QDeclarativeEngine>
|
|
|
24
|
#include "declarativelineseries.h"
|
|
24
|
#include "declarativelineseries.h"
|
|
|
25
|
#include "declarativeareaseries.h"
|
|
25
|
#include "declarativeareaseries.h"
|
|
|
26
|
#include "declarativebarseries.h"
|
|
26
|
#include "declarativebarseries.h"
|
|
|
27
|
#include "declarativepieseries.h"
|
|
27
|
#include "declarativepieseries.h"
|
|
|
28
|
#include "declarativesplineseries.h"
|
|
28
|
#include "declarativesplineseries.h"
|
|
|
29
|
#include "declarativescatterseries.h"
|
|
29
|
#include "declarativescatterseries.h"
|
|
|
30
|
#include "qbarcategoryaxis.h"
|
|
30
|
#include "qbarcategoryaxis.h"
|
|
|
31
|
#include "qvalueaxis.h"
|
|
31
|
#include "qvalueaxis.h"
|
|
|
32
|
#include "qcategoryaxis.h"
|
|
32
|
#include "qcategoryaxis.h"
|
|
|
33
|
#include "qabstractseries_p.h"
|
|
33
|
#include "qabstractseries_p.h"
|
|
|
34
|
#include "declarativemargins.h"
|
|
34
|
#include "declarativemargins.h"
|
|
|
35
|
|
|
35
|
|
|
|
36
|
#ifndef QT_ON_ARM
|
|
36
|
#ifndef QT_ON_ARM
|
|
|
37
|
#include "qdatetimeaxis.h"
|
|
37
|
#include "qdatetimeaxis.h"
|
|
|
38
|
#endif
|
|
38
|
#endif
|
|
|
39
|
|
|
39
|
|
|
|
40
|
QTCOMMERCIALCHART_BEGIN_NAMESPACE
|
|
40
|
QTCOMMERCIALCHART_BEGIN_NAMESPACE
|
|
|
41
|
|
|
41
|
|
|
|
42
|
/*!
|
|
42
|
/*!
|
|
|
43
|
\qmlclass ChartView DeclarativeChart
|
|
43
|
\qmlclass ChartView DeclarativeChart
|
|
|
44
|
|
|
44
|
|
|
|
45
|
ChartView element is the parent that is responsible for showing different chart series types.
|
|
45
|
ChartView element is the parent that is responsible for showing different chart series types.
|
|
|
46
|
|
|
46
|
|
|
|
47
|
The following QML shows how to create a simple chart with one pie series:
|
|
47
|
The following QML shows how to create a simple chart with one pie series:
|
|
|
48
|
\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
|
|
48
|
\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
|
|
|
49
|
\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
|
|
49
|
\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
|
|
|
50
|
\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
|
|
50
|
\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
|
|
|
51
|
|
|
51
|
|
|
|
52
|
\beginfloatleft
|
|
52
|
\beginfloatleft
|
|
|
53
|
\image examples_qmlpiechart.png
|
|
53
|
\image examples_qmlpiechart.png
|
|
|
54
|
\endfloat
|
|
54
|
\endfloat
|
|
|
55
|
\clearfloat
|
|
55
|
\clearfloat
|
|
|
56
|
*/
|
|
56
|
*/
|
|
|
57
|
|
|
57
|
|
|
|
58
|
/*!
|
|
58
|
/*!
|
|
|
59
|
\qmlproperty Theme ChartView::theme
|
|
59
|
\qmlproperty Theme ChartView::theme
|
|
|
60
|
Theme defines the visual appearance of the chart, including for example colors, fonts, line
|
|
60
|
Theme defines the visual appearance of the chart, including for example colors, fonts, line
|
|
|
61
|
widths and chart background.
|
|
61
|
widths and chart background.
|
|
|
62
|
*/
|
|
62
|
*/
|
|
|
63
|
|
|
63
|
|
|
|
64
|
/*!
|
|
64
|
/*!
|
|
|
65
|
\qmlproperty Animation ChartView::animation
|
|
65
|
\qmlproperty Animation ChartView::animation
|
|
|
66
|
Animation configuration of the chart. One of ChartView.NoAnimation, ChartView.GridAxisAnimations,
|
|
66
|
Animation configuration of the chart. One of ChartView.NoAnimation, ChartView.GridAxisAnimations,
|
|
|
67
|
ChartView.SeriesAnimations or ChartView.AllAnimations.
|
|
67
|
ChartView.SeriesAnimations or ChartView.AllAnimations.
|
|
|
68
|
*/
|
|
68
|
*/
|
|
|
69
|
|
|
69
|
|
|
|
70
|
/*!
|
|
70
|
/*!
|
|
|
71
|
\qmlproperty Font ChartView::titleFont
|
|
71
|
\qmlproperty Font ChartView::titleFont
|
|
|
72
|
The title font of the chart
|
|
72
|
The title font of the chart
|
|
|
73
|
|
|
73
|
|
|
|
74
|
See the \l {Font} {QML Font Element} for detailed documentation.
|
|
74
|
See the \l {Font} {QML Font Element} for detailed documentation.
|
|
|
75
|
*/
|
|
75
|
*/
|
|
|
76
|
|
|
76
|
|
|
|
77
|
/*!
|
|
77
|
/*!
|
|
|
78
|
\qmlproperty string ChartView::title
|
|
78
|
\qmlproperty string ChartView::title
|
|
|
79
|
The title of the chart, shown on top of the chart.
|
|
79
|
The title of the chart, shown on top of the chart.
|
|
|
80
|
\sa ChartView::titleColor
|
|
80
|
\sa ChartView::titleColor
|
|
|
81
|
*/
|
|
81
|
*/
|
|
|
82
|
|
|
82
|
|
|
|
83
|
/*!
|
|
83
|
/*!
|
|
|
84
|
\qmlproperty string ChartView::titleColor
|
|
84
|
\qmlproperty string ChartView::titleColor
|
|
|
85
|
The color of the title text.
|
|
85
|
The color of the title text.
|
|
|
86
|
*/
|
|
86
|
*/
|
|
|
87
|
|
|
87
|
|
|
|
88
|
/*!
|
|
88
|
/*!
|
|
|
89
|
\qmlproperty Axis ChartView::axisX
|
|
89
|
\qmlproperty Axis ChartView::axisX
|
|
|
90
|
The x-axis of the chart.
|
|
90
|
The x-axis of the chart.
|
|
|
91
|
*/
|
|
91
|
*/
|
|
|
92
|
|
|
92
|
|
|
|
93
|
/*!
|
|
93
|
/*!
|
|
|
94
|
\qmlproperty Axis ChartView::axisY
|
|
94
|
\qmlproperty Axis ChartView::axisY
|
|
|
95
|
The default y-axis of the chart.
|
|
95
|
The default y-axis of the chart.
|
|
|
96
|
*/
|
|
96
|
*/
|
|
|
97
|
|
|
97
|
|
|
|
98
|
/*!
|
|
98
|
/*!
|
|
|
99
|
\qmlproperty Legend ChartView::legend
|
|
99
|
\qmlproperty Legend ChartView::legend
|
|
|
100
|
The legend of the chart. Legend lists all the series, pie slices and bar sets added on the chart.
|
|
100
|
The legend of the chart. Legend lists all the series, pie slices and bar sets added on the chart.
|
|
|
101
|
*/
|
|
101
|
*/
|
|
|
102
|
|
|
102
|
|
|
|
103
|
/*!
|
|
103
|
/*!
|
|
|
104
|
\qmlproperty int ChartView::count
|
|
104
|
\qmlproperty int ChartView::count
|
|
|
105
|
The count of series added to the chart.
|
|
105
|
The count of series added to the chart.
|
|
|
106
|
*/
|
|
106
|
*/
|
|
|
107
|
|
|
107
|
|
|
|
108
|
/*!
|
|
108
|
/*!
|
|
|
109
|
\qmlproperty color ChartView::backgroundColor
|
|
109
|
\qmlproperty color ChartView::backgroundColor
|
|
|
110
|
The color of the chart's background. By default background color is defined by chart theme.
|
|
110
|
The color of the chart's background. By default background color is defined by chart theme.
|
|
|
111
|
\sa ChartView::theme
|
|
111
|
\sa ChartView::theme
|
|
|
112
|
*/
|
|
112
|
*/
|
|
|
113
|
|
|
113
|
|
|
|
114
|
/*!
|
|
114
|
/*!
|
|
|
115
|
\qmlproperty bool ChartView::dropShadowEnabled
|
|
115
|
\qmlproperty bool ChartView::dropShadowEnabled
|
|
|
116
|
The chart's border drop shadow. Set to true to enable drop shadow.
|
|
116
|
The chart's border drop shadow. Set to true to enable drop shadow.
|
|
|
117
|
*/
|
|
117
|
*/
|
|
|
118
|
|
|
118
|
|
|
|
119
|
/*!
|
|
119
|
/*!
|
|
|
120
|
\qmlproperty real ChartView::topMargin
|
|
120
|
\qmlproperty real ChartView::topMargin
|
|
|
121
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
121
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
|
122
|
*/
|
|
122
|
*/
|
|
|
123
|
|
|
123
|
|
|
|
124
|
/*!
|
|
124
|
/*!
|
|
|
125
|
\qmlproperty real ChartView::bottomMargin
|
|
125
|
\qmlproperty real ChartView::bottomMargin
|
|
|
126
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
126
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
|
127
|
*/
|
|
127
|
*/
|
|
|
128
|
|
|
128
|
|
|
|
129
|
/*!
|
|
129
|
/*!
|
|
|
130
|
\qmlproperty real ChartView::leftMargin
|
|
130
|
\qmlproperty real ChartView::leftMargin
|
|
|
131
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
131
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
|
132
|
*/
|
|
132
|
*/
|
|
|
133
|
|
|
133
|
|
|
|
134
|
/*!
|
|
134
|
/*!
|
|
|
135
|
\qmlproperty real ChartView::rightMargin
|
|
135
|
\qmlproperty real ChartView::rightMargin
|
|
|
136
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
136
|
Deprecated. Use minimumMargins and plotArea instead.
|
|
|
137
|
*/
|
|
137
|
*/
|
|
|
138
|
|
|
138
|
|
|
|
139
|
/*!
|
|
139
|
/*!
|
|
|
140
|
\qmlproperty Margins ChartView::minimumMargins
|
|
140
|
\qmlproperty Margins ChartView::minimumMargins
|
|
|
141
|
The minimum margins allowed between the outer bounds and the plotArea of the ChartView. Margins
|
|
141
|
The minimum margins allowed between the outer bounds and the plotArea of the ChartView. Margins
|
|
|
142
|
area of ChartView is used for drawing title, axes and legend. Please note that setting the
|
|
142
|
area of ChartView is used for drawing title, axes and legend. Please note that setting the
|
|
|
143
|
properties of minimumMargins may be bigger than the defined value, depending on other ChartView
|
|
143
|
properties of minimumMargins may be bigger than the defined value, depending on other ChartView
|
|
|
144
|
properties that affect it's layout. If you need to know the actual plotting area used at any
|
|
144
|
properties that affect it's layout. If you need to know the actual plotting area used at any
|
|
|
145
|
given time, you can check ChartView::plotArea instead.
|
|
145
|
given time, you can check ChartView::plotArea instead.
|
|
|
146
|
*/
|
|
146
|
*/
|
|
|
147
|
|
|
147
|
|
|
|
148
|
/*!
|
|
148
|
/*!
|
|
|
149
|
\qmlproperty rect ChartView::plotArea
|
|
149
|
\qmlproperty rect ChartView::plotArea
|
|
|
150
|
The area on the ChartView that is used for drawing series. This is the ChartView rect without the
|
|
150
|
The area on the ChartView that is used for drawing series. This is the ChartView rect without the
|
|
|
151
|
margins.
|
|
151
|
margins.
|
|
|
152
|
\sa ChartView::minimumMargins
|
|
152
|
\sa ChartView::minimumMargins
|
|
|
153
|
*/
|
|
153
|
*/
|
|
|
154
|
|
|
154
|
|
|
|
155
|
/*!
|
|
155
|
/*!
|
|
|
156
|
\qmlmethod AbstractSeries ChartView::series(int index)
|
|
156
|
\qmlmethod AbstractSeries ChartView::series(int index)
|
|
|
157
|
Returns the series with \a index on the chart. This allows you to loop through the series of a chart together with
|
|
157
|
Returns the series with \a index on the chart. This allows you to loop through the series of a chart together with
|
|
|
158
|
the count property of the chart.
|
|
158
|
the count property of the chart.
|
|
|
159
|
*/
|
|
159
|
*/
|
|
|
160
|
|
|
160
|
|
|
|
161
|
/*!
|
|
161
|
/*!
|
|
|
162
|
\qmlmethod AbstractSeries ChartView::series(string name)
|
|
162
|
\qmlmethod AbstractSeries ChartView::series(string name)
|
|
|
163
|
Returns the first series on the chart with \a name. If there is no series with that name, returns null.
|
|
163
|
Returns the first series on the chart with \a name. If there is no series with that name, returns null.
|
|
|
164
|
*/
|
|
164
|
*/
|
|
|
165
|
|
|
165
|
|
|
|
166
|
/*!
|
|
166
|
/*!
|
|
|
167
|
\qmlmethod AbstractSeries ChartView::createSeries(SeriesType type, string name)
|
|
167
|
\qmlmethod AbstractSeries ChartView::createSeries(SeriesType type, string name)
|
|
|
168
|
Creates a series object of \a type to the chart. For example:
|
|
168
|
Creates a series object of \a type to the chart. For example:
|
|
|
169
|
\code
|
|
169
|
\code
|
|
|
170
|
var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter series");
|
|
170
|
var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter series");
|
|
|
171
|
scatter.markerSize = 22;
|
|
171
|
scatter.markerSize = 22;
|
|
|
172
|
scatter.append(1.1, 2.0);
|
|
172
|
scatter.append(1.1, 2.0);
|
|
|
173
|
\endcode
|
|
173
|
\endcode
|
|
|
174
|
*/
|
|
174
|
*/
|
|
|
175
|
|
|
175
|
|
|
|
176
|
/*!
|
|
176
|
/*!
|
|
|
177
|
\qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
|
|
177
|
\qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
|
|
|
178
|
The y-axis of the series. This is the same as the default y-axis of the chart as multiple y-axes are not yet supported.
|
|
178
|
The y-axis of the series. This is the same as the default y-axis of the chart as multiple y-axes are not yet supported.
|
|
|
179
|
*/
|
|
179
|
*/
|
|
|
180
|
|
|
180
|
|
|
|
181
|
/*!
|
|
181
|
/*!
|
|
|
182
|
\qmlmethod ChartView::zoomY(real factor)
|
|
182
|
\qmlmethod ChartView::zoomY(real factor)
|
|
|
183
|
Zooms in by \a factor on the center of the chart.
|
|
183
|
Zooms in by \a factor on the center of the chart.
|
|
|
184
|
*/
|
|
184
|
*/
|
|
|
185
|
|
|
185
|
|
|
|
186
|
/*!
|
|
186
|
/*!
|
|
|
187
|
\qmlmethod ChartView::scrollLeft(real pixels)
|
|
187
|
\qmlmethod ChartView::scrollLeft(real pixels)
|
|
|
188
|
Scrolls to left by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
188
|
Scrolls to left by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
|
189
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
189
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
|
190
|
*/
|
|
190
|
*/
|
|
|
191
|
|
|
191
|
|
|
|
192
|
/*!
|
|
192
|
/*!
|
|
|
193
|
\qmlmethod ChartView::scrollRight(real pixels)
|
|
193
|
\qmlmethod ChartView::scrollRight(real pixels)
|
|
|
194
|
Scrolls to right by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
194
|
Scrolls to right by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
|
195
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
195
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
|
196
|
*/
|
|
196
|
*/
|
|
|
197
|
|
|
197
|
|
|
|
198
|
/*!
|
|
198
|
/*!
|
|
|
199
|
\qmlmethod ChartView::scrollUp(real pixels)
|
|
199
|
\qmlmethod ChartView::scrollUp(real pixels)
|
|
|
200
|
Scrolls up by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
200
|
Scrolls up by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
|
201
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
201
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
|
202
|
*/
|
|
202
|
*/
|
|
|
203
|
|
|
203
|
|
|
|
204
|
/*!
|
|
204
|
/*!
|
|
|
205
|
\qmlmethod ChartView::scrollDown(real pixels)
|
|
205
|
\qmlmethod ChartView::scrollDown(real pixels)
|
|
|
206
|
Scrolls down by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
206
|
Scrolls down by \a pixels. This is a convenience function that suits for example for key navigation.
|
|
|
207
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
207
|
\sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
|
|
|
208
|
*/
|
|
208
|
*/
|
|
|
209
|
|
|
209
|
|
|
|
210
|
/*!
|
|
210
|
/*!
|
|
|
211
|
\qmlsignal ChartView::onTopMarginChanged(real margin)
|
|
211
|
\qmlsignal ChartView::onPlotAreaChanged(rect plotArea)
|
|
|
212
|
The top margin of the chart view has changed to \a margin. This may happen for example if you modify font size
|
|
212
|
The plot area of the chart has changed. This may happen for example, if you modify minimumMargins
|
|
|
213
|
related properties of the legend or chart title.
|
|
213
|
or if you resize the chart, or if you modify font size related properties of the legend or chart
|
|
|
214
|
*/
|
|
214
|
title.
|
|
|
215
|
|
|
|
|
|
|
216
|
/*!
|
|
|
|
|
|
217
|
\qmlsignal ChartView::onBottomMarginChanged(real margin)
|
|
|
|
|
|
218
|
The bottom margin of the chart view has changed to \a margin. This may happen for example if you modify font size
|
|
|
|
|
|
219
|
related properties of the legend or chart title.
|
|
|
|
|
|
220
|
*/
|
|
|
|
|
|
221
|
|
|
|
|
|
|
222
|
/*!
|
|
|
|
|
|
223
|
\qmlsignal ChartView::onLeftMarginChanged(real margin)
|
|
|
|
|
|
224
|
The left margin of the chart view has changed to \a margin. This may happen for example if you modify font size
|
|
|
|
|
|
225
|
related properties of the legend or chart title.
|
|
|
|
|
|
226
|
*/
|
|
|
|
|
|
227
|
|
|
|
|
|
|
228
|
/*!
|
|
|
|
|
|
229
|
\qmlsignal ChartView::onRightMarginChanged(real margin)
|
|
|
|
|
|
230
|
The right margin of the chart view has changed to \a margin. This may happen for example if you modify font size
|
|
|
|
|
|
231
|
related properties of the legend or chart title.
|
|
|
|
|
|
232
|
*/
|
|
215
|
*/
|
|
|
233
|
|
|
216
|
|
|
|
234
|
DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
|
|
217
|
DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
|
|
|
235
|
: QDeclarativeItem(parent),
|
|
218
|
: QDeclarativeItem(parent),
|
|
|
236
|
m_chart(new QChart(this))
|
|
219
|
m_chart(new QChart(this))
|
|
|
237
|
{
|
|
220
|
{
|
|
|
238
|
setFlag(QGraphicsItem::ItemHasNoContents, false);
|
|
221
|
setFlag(QGraphicsItem::ItemHasNoContents, false);
|
|
|
239
|
m_minMargins = new DeclarativeMargins(this);
|
|
222
|
m_minMargins = new DeclarativeMargins(this);
|
|
|
240
|
connect(m_minMargins, SIGNAL(topChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
|
|
223
|
connect(m_minMargins, SIGNAL(topChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
|
|
|
241
|
connect(m_minMargins, SIGNAL(bottomChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
|
|
224
|
connect(m_minMargins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
|
|
|
242
|
connect(m_minMargins, SIGNAL(leftChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
|
|
225
|
connect(m_minMargins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
|
|
|
243
|
connect(m_minMargins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
|
|
226
|
connect(m_minMargins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
|
|
|
244
|
// TODO: connect to plotAreaChanged signal from m_chart
|
|
|
|
|
|
245
|
}
|
|
227
|
}
|
|
|
246
|
|
|
228
|
|
|
|
247
|
void DeclarativeChart::changeMinimumMargins(int top, int bottom, int left, int right)
|
|
229
|
void DeclarativeChart::changeMinimumMargins(int top, int bottom, int left, int right)
|
|
|
248
|
{
|
|
230
|
{
|
|
|
249
|
m_chart->setMinimumMargins(QMargins(left, top, right, bottom));
|
|
231
|
m_chart->setMinimumMargins(QMargins(left, top, right, bottom));
|
|
|
250
|
plotAreaChanged(m_chart->plotArea());
|
|
232
|
emit minimumMarginsChanged();
|
|
|
|
|
|
233
|
emit plotAreaChanged(m_chart->plotArea());
|
|
|
251
|
}
|
|
234
|
}
|
|
|
252
|
|
|
235
|
|
|
|
253
|
DeclarativeChart::~DeclarativeChart()
|
|
236
|
DeclarativeChart::~DeclarativeChart()
|
|
|
254
|
{
|
|
237
|
{
|
|
|
255
|
delete m_chart;
|
|
238
|
delete m_chart;
|
|
|
256
|
}
|
|
239
|
}
|
|
|
257
|
|
|
240
|
|
|
|
258
|
void DeclarativeChart::childEvent(QChildEvent *event)
|
|
241
|
void DeclarativeChart::childEvent(QChildEvent *event)
|
|
|
259
|
{
|
|
242
|
{
|
|
|
260
|
if (event->type() == QEvent::ChildAdded) {
|
|
243
|
if (event->type() == QEvent::ChildAdded) {
|
|
|
261
|
if (qobject_cast<QAbstractSeries *>(event->child())) {
|
|
244
|
if (qobject_cast<QAbstractSeries *>(event->child())) {
|
|
|
262
|
m_chart->addSeries(qobject_cast<QAbstractSeries *>(event->child()));
|
|
245
|
m_chart->addSeries(qobject_cast<QAbstractSeries *>(event->child()));
|
|
|
263
|
}
|
|
246
|
}
|
|
|
264
|
}
|
|
247
|
}
|
|
|
265
|
}
|
|
248
|
}
|
|
|
266
|
|
|
249
|
|
|
|
267
|
void DeclarativeChart::componentComplete()
|
|
250
|
void DeclarativeChart::componentComplete()
|
|
|
268
|
{
|
|
251
|
{
|
|
|
269
|
foreach(QObject *child, children()) {
|
|
252
|
foreach(QObject *child, children()) {
|
|
|
270
|
if (qobject_cast<QAbstractSeries *>(child)) {
|
|
253
|
if (qobject_cast<QAbstractSeries *>(child)) {
|
|
|
271
|
// Add series to the chart
|
|
254
|
// Add series to the chart
|
|
|
272
|
QAbstractSeries *series = qobject_cast<QAbstractSeries *>(child);
|
|
255
|
QAbstractSeries *series = qobject_cast<QAbstractSeries *>(child);
|
|
|
273
|
m_chart->addSeries(series);
|
|
256
|
m_chart->addSeries(series);
|
|
|
274
|
|
|
257
|
|
|
|
275
|
// Set optional user defined axes and connect axis related signals
|
|
258
|
// Set optional user defined axes and connect axis related signals
|
|
|
276
|
if (qobject_cast<DeclarativeLineSeries *>(child)) {
|
|
259
|
if (qobject_cast<DeclarativeLineSeries *>(child)) {
|
|
|
277
|
DeclarativeLineSeries *s = qobject_cast<DeclarativeLineSeries *>(child);
|
|
260
|
DeclarativeLineSeries *s = qobject_cast<DeclarativeLineSeries *>(child);
|
|
|
278
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
261
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
279
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
262
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
280
|
setAxisX(s->axisX(), s);
|
|
263
|
setAxisX(s->axisX(), s);
|
|
|
281
|
setAxisY(s->axisY(), s);
|
|
264
|
setAxisY(s->axisY(), s);
|
|
|
282
|
} else if (qobject_cast<DeclarativeSplineSeries *>(child)) {
|
|
265
|
} else if (qobject_cast<DeclarativeSplineSeries *>(child)) {
|
|
|
283
|
DeclarativeSplineSeries *s = qobject_cast<DeclarativeSplineSeries *>(child);
|
|
266
|
DeclarativeSplineSeries *s = qobject_cast<DeclarativeSplineSeries *>(child);
|
|
|
284
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
267
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
285
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
268
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
286
|
setAxisX(s->axisX(), s);
|
|
269
|
setAxisX(s->axisX(), s);
|
|
|
287
|
setAxisY(s->axisY(), s);
|
|
270
|
setAxisY(s->axisY(), s);
|
|
|
288
|
} else if (qobject_cast<DeclarativeScatterSeries *>(child)) {
|
|
271
|
} else if (qobject_cast<DeclarativeScatterSeries *>(child)) {
|
|
|
289
|
DeclarativeScatterSeries *s = qobject_cast<DeclarativeScatterSeries *>(child);
|
|
272
|
DeclarativeScatterSeries *s = qobject_cast<DeclarativeScatterSeries *>(child);
|
|
|
290
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
273
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
291
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
274
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
292
|
setAxisX(s->axisX(), s);
|
|
275
|
setAxisX(s->axisX(), s);
|
|
|
293
|
setAxisY(s->axisY(), s);
|
|
276
|
setAxisY(s->axisY(), s);
|
|
|
294
|
} else if (qobject_cast<DeclarativeAreaSeries *>(child)) {
|
|
277
|
} else if (qobject_cast<DeclarativeAreaSeries *>(child)) {
|
|
|
295
|
DeclarativeAreaSeries *s = qobject_cast<DeclarativeAreaSeries *>(child);
|
|
278
|
DeclarativeAreaSeries *s = qobject_cast<DeclarativeAreaSeries *>(child);
|
|
|
296
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
279
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
297
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
280
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
298
|
setAxisX(s->axisX(), s);
|
|
281
|
setAxisX(s->axisX(), s);
|
|
|
299
|
setAxisY(s->axisY(), s);
|
|
282
|
setAxisY(s->axisY(), s);
|
|
|
300
|
} else if (qobject_cast<DeclarativeBarSeries *>(child)) {
|
|
283
|
} else if (qobject_cast<DeclarativeBarSeries *>(child)) {
|
|
|
301
|
DeclarativeBarSeries *s = qobject_cast<DeclarativeBarSeries *>(child);
|
|
284
|
DeclarativeBarSeries *s = qobject_cast<DeclarativeBarSeries *>(child);
|
|
|
302
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
285
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
303
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
286
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
304
|
setAxisX(s->axisX(), s);
|
|
287
|
setAxisX(s->axisX(), s);
|
|
|
305
|
setAxisY(s->axisY(), s);
|
|
288
|
setAxisY(s->axisY(), s);
|
|
|
306
|
} else if (qobject_cast<DeclarativeStackedBarSeries *>(child)) {
|
|
289
|
} else if (qobject_cast<DeclarativeStackedBarSeries *>(child)) {
|
|
|
307
|
DeclarativeStackedBarSeries *s = qobject_cast<DeclarativeStackedBarSeries *>(child);
|
|
290
|
DeclarativeStackedBarSeries *s = qobject_cast<DeclarativeStackedBarSeries *>(child);
|
|
|
308
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
291
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
309
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
292
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
310
|
setAxisX(s->axisX(), s);
|
|
293
|
setAxisX(s->axisX(), s);
|
|
|
311
|
setAxisY(s->axisY(), s);
|
|
294
|
setAxisY(s->axisY(), s);
|
|
|
312
|
} else if (qobject_cast<DeclarativePercentBarSeries *>(child)) {
|
|
295
|
} else if (qobject_cast<DeclarativePercentBarSeries *>(child)) {
|
|
|
313
|
DeclarativePercentBarSeries *s = qobject_cast<DeclarativePercentBarSeries *>(child);
|
|
296
|
DeclarativePercentBarSeries *s = qobject_cast<DeclarativePercentBarSeries *>(child);
|
|
|
314
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
297
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
315
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
298
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
316
|
setAxisX(s->axisX(), s);
|
|
299
|
setAxisX(s->axisX(), s);
|
|
|
317
|
setAxisY(s->axisY(), s);
|
|
300
|
setAxisY(s->axisY(), s);
|
|
|
318
|
} else if (qobject_cast<DeclarativeHorizontalBarSeries *>(child)) {
|
|
301
|
} else if (qobject_cast<DeclarativeHorizontalBarSeries *>(child)) {
|
|
|
319
|
DeclarativeHorizontalBarSeries *s = qobject_cast<DeclarativeHorizontalBarSeries *>(child);
|
|
302
|
DeclarativeHorizontalBarSeries *s = qobject_cast<DeclarativeHorizontalBarSeries *>(child);
|
|
|
320
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
303
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
321
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
304
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
322
|
setAxisX(s->axisX(), s);
|
|
305
|
setAxisX(s->axisX(), s);
|
|
|
323
|
setAxisY(s->axisY(), s);
|
|
306
|
setAxisY(s->axisY(), s);
|
|
|
324
|
} else if (qobject_cast<DeclarativeHorizontalStackedBarSeries *>(child)) {
|
|
307
|
} else if (qobject_cast<DeclarativeHorizontalStackedBarSeries *>(child)) {
|
|
|
325
|
DeclarativeHorizontalStackedBarSeries *s = qobject_cast<DeclarativeHorizontalStackedBarSeries *>(child);
|
|
308
|
DeclarativeHorizontalStackedBarSeries *s = qobject_cast<DeclarativeHorizontalStackedBarSeries *>(child);
|
|
|
326
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
309
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
327
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
310
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
328
|
setAxisX(s->axisX(), s);
|
|
311
|
setAxisX(s->axisX(), s);
|
|
|
329
|
setAxisY(s->axisY(), s);
|
|
312
|
setAxisY(s->axisY(), s);
|
|
|
330
|
} else if (qobject_cast<DeclarativeHorizontalPercentBarSeries *>(child)) {
|
|
313
|
} else if (qobject_cast<DeclarativeHorizontalPercentBarSeries *>(child)) {
|
|
|
331
|
DeclarativeHorizontalPercentBarSeries *s = qobject_cast<DeclarativeHorizontalPercentBarSeries *>(child);
|
|
314
|
DeclarativeHorizontalPercentBarSeries *s = qobject_cast<DeclarativeHorizontalPercentBarSeries *>(child);
|
|
|
332
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
315
|
connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
|
|
|
333
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
316
|
connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
|
|
|
334
|
setAxisX(s->axisX(), s);
|
|
317
|
setAxisX(s->axisX(), s);
|
|
|
335
|
setAxisY(s->axisY(), s);
|
|
318
|
setAxisY(s->axisY(), s);
|
|
|
336
|
}
|
|
319
|
}
|
|
|
337
|
|
|
320
|
|
|
|
338
|
// Create the missing axes for the series that cannot be painted without axes
|
|
321
|
// Create the missing axes for the series that cannot be painted without axes
|
|
|
339
|
createDefaultAxes(series);
|
|
322
|
createDefaultAxes(series);
|
|
|
340
|
} else if(qobject_cast<QAbstractAxis *>(child)) {
|
|
323
|
} else if(qobject_cast<QAbstractAxis *>(child)) {
|
|
|
341
|
// Do nothing, axes are set for the chart in the context of series
|
|
324
|
// Do nothing, axes are set for the chart in the context of series
|
|
|
342
|
}
|
|
325
|
}
|
|
|
343
|
}
|
|
326
|
}
|
|
|
344
|
|
|
327
|
|
|
|
345
|
QDeclarativeItem::componentComplete();
|
|
328
|
QDeclarativeItem::componentComplete();
|
|
|
346
|
}
|
|
329
|
}
|
|
|
347
|
|
|
330
|
|
|
|
348
|
void DeclarativeChart::handleAxisXSet(QAbstractAxis* axis)
|
|
331
|
void DeclarativeChart::handleAxisXSet(QAbstractAxis* axis)
|
|
|
349
|
{
|
|
332
|
{
|
|
|
350
|
// qDebug() << "DeclarativeChart::handleAxisXSet" << sender() << axis;
|
|
333
|
// qDebug() << "DeclarativeChart::handleAxisXSet" << sender() << axis;
|
|
|
351
|
if (axis && qobject_cast<DeclarativeLineSeries *>(sender())) {
|
|
334
|
if (axis && qobject_cast<DeclarativeLineSeries *>(sender())) {
|
|
|
352
|
m_chart->setAxisX(axis, qobject_cast<DeclarativeLineSeries *>(sender()));
|
|
335
|
m_chart->setAxisX(axis, qobject_cast<DeclarativeLineSeries *>(sender()));
|
|
|
353
|
}
|
|
336
|
}
|
|
|
354
|
}
|
|
337
|
}
|
|
|
355
|
|
|
338
|
|
|
|
356
|
void DeclarativeChart::handleAxisYSet(QAbstractAxis* axis)
|
|
339
|
void DeclarativeChart::handleAxisYSet(QAbstractAxis* axis)
|
|
|
357
|
{
|
|
340
|
{
|
|
|
358
|
// qDebug() << "DeclarativeChart::handleAxisYSet" << sender() << axis;
|
|
341
|
// qDebug() << "DeclarativeChart::handleAxisYSet" << sender() << axis;
|
|
|
359
|
if (axis && qobject_cast<DeclarativeLineSeries *>(sender())) {
|
|
342
|
if (axis && qobject_cast<DeclarativeLineSeries *>(sender())) {
|
|
|
360
|
m_chart->setAxisY(axis, qobject_cast<DeclarativeLineSeries *>(sender()));
|
|
343
|
m_chart->setAxisY(axis, qobject_cast<DeclarativeLineSeries *>(sender()));
|
|
|
361
|
}
|
|
344
|
}
|
|
|
362
|
}
|
|
345
|
}
|
|
|
363
|
|
|
346
|
|
|
|
364
|
void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
|
|
347
|
void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
|
|
|
365
|
{
|
|
348
|
{
|
|
|
366
|
// qDebug() << "DeclarativeChart::geometryChanged" << newGeometry.width() << newGeometry.height();
|
|
349
|
// qDebug() << "DeclarativeChart::geometryChanged" << newGeometry.width() << newGeometry.height();
|
|
|
367
|
if (newGeometry.isValid()) {
|
|
350
|
if (newGeometry.isValid()) {
|
|
|
368
|
if (newGeometry.width() > 0 && newGeometry.height() > 0) {
|
|
351
|
if (newGeometry.width() > 0 && newGeometry.height() > 0) {
|
|
|
369
|
m_chart->resize(newGeometry.width(), newGeometry.height());
|
|
352
|
m_chart->resize(newGeometry.width(), newGeometry.height());
|
|
|
370
|
}
|
|
353
|
}
|
|
|
371
|
}
|
|
354
|
}
|
|
|
372
|
QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
|
|
355
|
QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
|
|
|
|
|
|
356
|
|
|
|
|
|
|
357
|
// It would be better to trigger the plotAreaChanged signal from QChart::plotAreaChanged or
|
|
|
|
|
|
358
|
// similar. Since that kind of a signal is not clearly needed in the C++ API the work-around is
|
|
|
|
|
|
359
|
// to implement it here for the QML API purposes.
|
|
|
|
|
|
360
|
emit plotAreaChanged(m_chart->plotArea());
|
|
|
373
|
}
|
|
361
|
}
|
|
|
374
|
|
|
362
|
|
|
|
375
|
void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
|
|
363
|
void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
|
|
|
376
|
{
|
|
364
|
{
|
|
|
377
|
QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;
|
|
365
|
QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;
|
|
|
378
|
if (chartTheme != m_chart->theme())
|
|
366
|
if (chartTheme != m_chart->theme())
|
|
|
379
|
m_chart->setTheme(chartTheme);
|
|
367
|
m_chart->setTheme(chartTheme);
|
|
|
380
|
}
|
|
368
|
}
|
|
|
381
|
|
|
369
|
|
|
|
382
|
DeclarativeChart::Theme DeclarativeChart::theme()
|
|
370
|
DeclarativeChart::Theme DeclarativeChart::theme()
|
|
|
383
|
{
|
|
371
|
{
|
|
|
384
|
return (DeclarativeChart::Theme) m_chart->theme();
|
|
372
|
return (DeclarativeChart::Theme) m_chart->theme();
|
|
|
385
|
}
|
|
373
|
}
|
|
|
386
|
|
|
374
|
|
|
|
387
|
void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)
|
|
375
|
void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)
|
|
|
388
|
{
|
|
376
|
{
|
|
|
389
|
QChart::AnimationOption animationOptions = (QChart::AnimationOption) animations;
|
|
377
|
QChart::AnimationOption animationOptions = (QChart::AnimationOption) animations;
|
|
|
390
|
if (animationOptions != m_chart->animationOptions())
|
|
378
|
if (animationOptions != m_chart->animationOptions())
|
|
|
391
|
m_chart->setAnimationOptions(animationOptions);
|
|
379
|
m_chart->setAnimationOptions(animationOptions);
|
|
|
392
|
}
|
|
380
|
}
|
|
|
393
|
|
|
381
|
|
|
|
394
|
DeclarativeChart::Animation DeclarativeChart::animationOptions()
|
|
382
|
DeclarativeChart::Animation DeclarativeChart::animationOptions()
|
|
|
395
|
{
|
|
383
|
{
|
|
|
396
|
if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
|
|
384
|
if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
|
|
|
397
|
return DeclarativeChart::AllAnimations;
|
|
385
|
return DeclarativeChart::AllAnimations;
|
|
|
398
|
else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
|
|
386
|
else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
|
|
|
399
|
return DeclarativeChart::GridAxisAnimations;
|
|
387
|
return DeclarativeChart::GridAxisAnimations;
|
|
|
400
|
else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
|
|
388
|
else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
|
|
|
401
|
return DeclarativeChart::SeriesAnimations;
|
|
389
|
return DeclarativeChart::SeriesAnimations;
|
|
|
402
|
else
|
|
390
|
else
|
|
|
403
|
return DeclarativeChart::NoAnimation;
|
|
391
|
return DeclarativeChart::NoAnimation;
|
|
|
404
|
}
|
|
392
|
}
|
|
|
405
|
|
|
393
|
|
|
|
406
|
void DeclarativeChart::setTitle(QString title)
|
|
394
|
void DeclarativeChart::setTitle(QString title)
|
|
|
407
|
{
|
|
395
|
{
|
|
|
408
|
if (title != m_chart->title())
|
|
396
|
if (title != m_chart->title())
|
|
|
409
|
m_chart->setTitle(title);
|
|
397
|
m_chart->setTitle(title);
|
|
|
410
|
}
|
|
398
|
}
|
|
|
411
|
QString DeclarativeChart::title()
|
|
399
|
QString DeclarativeChart::title()
|
|
|
412
|
{
|
|
400
|
{
|
|
|
413
|
return m_chart->title();
|
|
401
|
return m_chart->title();
|
|
|
414
|
}
|
|
402
|
}
|
|
|
415
|
|
|
403
|
|
|
|
416
|
QAbstractAxis *DeclarativeChart::axisX(QAbstractSeries *series)
|
|
404
|
QAbstractAxis *DeclarativeChart::axisX(QAbstractSeries *series)
|
|
|
417
|
{
|
|
405
|
{
|
|
|
418
|
return m_chart->axisX(series);
|
|
406
|
return m_chart->axisX(series);
|
|
|
419
|
}
|
|
407
|
}
|
|
|
420
|
|
|
408
|
|
|
|
421
|
QAbstractAxis *DeclarativeChart::axisY(QAbstractSeries *series)
|
|
409
|
QAbstractAxis *DeclarativeChart::axisY(QAbstractSeries *series)
|
|
|
422
|
{
|
|
410
|
{
|
|
|
423
|
return m_chart->axisY(series);
|
|
411
|
return m_chart->axisY(series);
|
|
|
424
|
}
|
|
412
|
}
|
|
|
425
|
|
|
413
|
|
|
|
426
|
QLegend *DeclarativeChart::legend()
|
|
414
|
QLegend *DeclarativeChart::legend()
|
|
|
427
|
{
|
|
415
|
{
|
|
|
428
|
return m_chart->legend();
|
|
416
|
return m_chart->legend();
|
|
|
429
|
}
|
|
417
|
}
|
|
|
430
|
|
|
418
|
|
|
|
431
|
void DeclarativeChart::setTitleColor(QColor color)
|
|
419
|
void DeclarativeChart::setTitleColor(QColor color)
|
|
|
432
|
{
|
|
420
|
{
|
|
|
433
|
QBrush b = m_chart->titleBrush();
|
|
421
|
QBrush b = m_chart->titleBrush();
|
|
|
434
|
if (color != b.color()) {
|
|
422
|
if (color != b.color()) {
|
|
|
435
|
b.setColor(color);
|
|
423
|
b.setColor(color);
|
|
|
436
|
m_chart->setTitleBrush(b);
|
|
424
|
m_chart->setTitleBrush(b);
|
|
|
437
|
emit titleColorChanged(color);
|
|
425
|
emit titleColorChanged(color);
|
|
|
438
|
}
|
|
426
|
}
|
|
|
439
|
}
|
|
427
|
}
|
|
|
440
|
|
|
428
|
|
|
|
441
|
QFont DeclarativeChart::titleFont() const
|
|
429
|
QFont DeclarativeChart::titleFont() const
|
|
|
442
|
{
|
|
430
|
{
|
|
|
443
|
return m_chart->titleFont();
|
|
431
|
return m_chart->titleFont();
|
|
|
444
|
}
|
|
432
|
}
|
|
|
445
|
|
|
433
|
|
|
|
446
|
void DeclarativeChart::setTitleFont(const QFont& font)
|
|
434
|
void DeclarativeChart::setTitleFont(const QFont& font)
|
|
|
447
|
{
|
|
435
|
{
|
|
|
448
|
m_chart->setTitleFont(font);
|
|
436
|
m_chart->setTitleFont(font);
|
|
|
449
|
}
|
|
437
|
}
|
|
|
450
|
|
|
438
|
|
|
|
451
|
QColor DeclarativeChart::titleColor()
|
|
439
|
QColor DeclarativeChart::titleColor()
|
|
|
452
|
{
|
|
440
|
{
|
|
|
453
|
return m_chart->titleBrush().color();
|
|
441
|
return m_chart->titleBrush().color();
|
|
|
454
|
}
|
|
442
|
}
|
|
|
455
|
|
|
443
|
|
|
|
456
|
void DeclarativeChart::setBackgroundColor(QColor color)
|
|
444
|
void DeclarativeChart::setBackgroundColor(QColor color)
|
|
|
457
|
{
|
|
445
|
{
|
|
|
458
|
QBrush b = m_chart->backgroundBrush();
|
|
446
|
QBrush b = m_chart->backgroundBrush();
|
|
|
459
|
if (b.style() != Qt::SolidPattern || color != b.color()) {
|
|
447
|
if (b.style() != Qt::SolidPattern || color != b.color()) {
|
|
|
460
|
b.setStyle(Qt::SolidPattern);
|
|
448
|
b.setStyle(Qt::SolidPattern);
|
|
|
461
|
b.setColor(color);
|
|
449
|
b.setColor(color);
|
|
|
462
|
m_chart->setBackgroundBrush(b);
|
|
450
|
m_chart->setBackgroundBrush(b);
|
|
|
463
|
emit backgroundColorChanged();
|
|
451
|
emit backgroundColorChanged();
|
|
|
464
|
}
|
|
452
|
}
|
|
|
465
|
}
|
|
453
|
}
|
|
|
466
|
|
|
454
|
|
|
|
467
|
QColor DeclarativeChart::backgroundColor()
|
|
455
|
QColor DeclarativeChart::backgroundColor()
|
|
|
468
|
{
|
|
456
|
{
|
|
|
469
|
return m_chart->backgroundBrush().color();
|
|
457
|
return m_chart->backgroundBrush().color();
|
|
|
470
|
}
|
|
458
|
}
|
|
|
471
|
|
|
459
|
|
|
|
472
|
int DeclarativeChart::count()
|
|
460
|
int DeclarativeChart::count()
|
|
|
473
|
{
|
|
461
|
{
|
|
|
474
|
return m_chart->series().count();
|
|
462
|
return m_chart->series().count();
|
|
|
475
|
}
|
|
463
|
}
|
|
|
476
|
|
|
464
|
|
|
|
477
|
void DeclarativeChart::setDropShadowEnabled(bool enabled)
|
|
465
|
void DeclarativeChart::setDropShadowEnabled(bool enabled)
|
|
|
478
|
{
|
|
466
|
{
|
|
|
479
|
if (enabled != m_chart->isDropShadowEnabled()) {
|
|
467
|
if (enabled != m_chart->isDropShadowEnabled()) {
|
|
|
480
|
m_chart->setDropShadowEnabled(enabled);
|
|
468
|
m_chart->setDropShadowEnabled(enabled);
|
|
|
481
|
dropShadowEnabledChanged(enabled);
|
|
469
|
dropShadowEnabledChanged(enabled);
|
|
|
482
|
}
|
|
470
|
}
|
|
|
483
|
}
|
|
471
|
}
|
|
|
484
|
|
|
472
|
|
|
|
485
|
bool DeclarativeChart::dropShadowEnabled()
|
|
473
|
bool DeclarativeChart::dropShadowEnabled()
|
|
|
486
|
{
|
|
474
|
{
|
|
|
487
|
return m_chart->isDropShadowEnabled();
|
|
475
|
return m_chart->isDropShadowEnabled();
|
|
|
488
|
}
|
|
476
|
}
|
|
|
489
|
|
|
477
|
|
|
|
490
|
qreal DeclarativeChart::topMargin()
|
|
478
|
qreal DeclarativeChart::topMargin()
|
|
|
491
|
{
|
|
479
|
{
|
|
|
492
|
qWarning() << "ChartView.topMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
480
|
qWarning() << "ChartView.topMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
|
493
|
return m_chart->plotArea().top();
|
|
481
|
return m_chart->plotArea().top();
|
|
|
494
|
}
|
|
482
|
}
|
|
|
495
|
|
|
483
|
|
|
|
496
|
qreal DeclarativeChart::bottomMargin()
|
|
484
|
qreal DeclarativeChart::bottomMargin()
|
|
|
497
|
{
|
|
485
|
{
|
|
|
498
|
qWarning() << "ChartView.bottomMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
486
|
qWarning() << "ChartView.bottomMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
|
499
|
return m_chart->plotArea().bottom();
|
|
487
|
return m_chart->plotArea().bottom();
|
|
|
500
|
}
|
|
488
|
}
|
|
|
501
|
|
|
489
|
|
|
|
502
|
qreal DeclarativeChart::leftMargin()
|
|
490
|
qreal DeclarativeChart::leftMargin()
|
|
|
503
|
{
|
|
491
|
{
|
|
|
504
|
qWarning() << "ChartView.leftMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
492
|
qWarning() << "ChartView.leftMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
|
505
|
return m_chart->plotArea().left();
|
|
493
|
return m_chart->plotArea().left();
|
|
|
506
|
}
|
|
494
|
}
|
|
|
507
|
|
|
495
|
|
|
|
508
|
qreal DeclarativeChart::rightMargin()
|
|
496
|
qreal DeclarativeChart::rightMargin()
|
|
|
509
|
{
|
|
497
|
{
|
|
|
510
|
qWarning() << "ChartView.rightMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
498
|
qWarning() << "ChartView.rightMargin is deprecated. Use minimumMargins and plotArea instead.";
|
|
|
511
|
return m_chart->plotArea().right();
|
|
499
|
return m_chart->plotArea().right();
|
|
|
512
|
}
|
|
500
|
}
|
|
|
513
|
|
|
501
|
|
|
|
514
|
void DeclarativeChart::zoom(qreal factor)
|
|
502
|
void DeclarativeChart::zoom(qreal factor)
|
|
|
515
|
{
|
|
503
|
{
|
|
|
516
|
m_chart->zoom(factor);
|
|
504
|
m_chart->zoom(factor);
|
|
|
517
|
}
|
|
505
|
}
|
|
|
518
|
|
|
506
|
|
|
|
519
|
void DeclarativeChart::scrollLeft(qreal pixels)
|
|
507
|
void DeclarativeChart::scrollLeft(qreal pixels)
|
|
|
520
|
{
|
|
508
|
{
|
|
|
521
|
m_chart->scroll(pixels, 0);
|
|
509
|
m_chart->scroll(pixels, 0);
|
|
|
522
|
}
|
|
510
|
}
|
|
|
523
|
|
|
511
|
|
|
|
524
|
void DeclarativeChart::scrollRight(qreal pixels)
|
|
512
|
void DeclarativeChart::scrollRight(qreal pixels)
|
|
|
525
|
{
|
|
513
|
{
|
|
|
526
|
m_chart->scroll(-pixels, 0);
|
|
514
|
m_chart->scroll(-pixels, 0);
|
|
|
527
|
}
|
|
515
|
}
|
|
|
528
|
|
|
516
|
|
|
|
529
|
void DeclarativeChart::scrollUp(qreal pixels)
|
|
517
|
void DeclarativeChart::scrollUp(qreal pixels)
|
|
|
530
|
{
|
|
518
|
{
|
|
|
531
|
m_chart->scroll(0, pixels);
|
|
519
|
m_chart->scroll(0, pixels);
|
|
|
532
|
}
|
|
520
|
}
|
|
|
533
|
|
|
521
|
|
|
|
534
|
void DeclarativeChart::scrollDown(qreal pixels)
|
|
522
|
void DeclarativeChart::scrollDown(qreal pixels)
|
|
|
535
|
{
|
|
523
|
{
|
|
|
536
|
m_chart->scroll(0, -pixels);
|
|
524
|
m_chart->scroll(0, -pixels);
|
|
|
537
|
}
|
|
525
|
}
|
|
|
538
|
|
|
526
|
|
|
|
539
|
QAbstractSeries *DeclarativeChart::series(int index)
|
|
527
|
QAbstractSeries *DeclarativeChart::series(int index)
|
|
|
540
|
{
|
|
528
|
{
|
|
|
541
|
if (index < m_chart->series().count()) {
|
|
529
|
if (index < m_chart->series().count()) {
|
|
|
542
|
return m_chart->series().at(index);
|
|
530
|
return m_chart->series().at(index);
|
|
|
543
|
}
|
|
531
|
}
|
|
|
544
|
return 0;
|
|
532
|
return 0;
|
|
|
545
|
}
|
|
533
|
}
|
|
|
546
|
|
|
534
|
|
|
|
547
|
QAbstractSeries *DeclarativeChart::series(QString seriesName)
|
|
535
|
QAbstractSeries *DeclarativeChart::series(QString seriesName)
|
|
|
548
|
{
|
|
536
|
{
|
|
|
549
|
foreach(QAbstractSeries *series, m_chart->series()) {
|
|
537
|
foreach(QAbstractSeries *series, m_chart->series()) {
|
|
|
550
|
if (series->name() == seriesName)
|
|
538
|
if (series->name() == seriesName)
|
|
|
551
|
return series;
|
|
539
|
return series;
|
|
|
552
|
}
|
|
540
|
}
|
|
|
553
|
return 0;
|
|
541
|
return 0;
|
|
|
554
|
}
|
|
542
|
}
|
|
|
555
|
|
|
543
|
|
|
|
556
|
QAbstractSeries *DeclarativeChart::createSeries(DeclarativeChart::SeriesType type, QString name)
|
|
544
|
QAbstractSeries *DeclarativeChart::createSeries(DeclarativeChart::SeriesType type, QString name)
|
|
|
557
|
{
|
|
545
|
{
|
|
|
558
|
QAbstractSeries *series = 0;
|
|
546
|
QAbstractSeries *series = 0;
|
|
|
559
|
|
|
547
|
|
|
|
560
|
switch (type) {
|
|
548
|
switch (type) {
|
|
|
561
|
case DeclarativeChart::SeriesTypeLine:
|
|
549
|
case DeclarativeChart::SeriesTypeLine:
|
|
|
562
|
series = new DeclarativeLineSeries();
|
|
550
|
series = new DeclarativeLineSeries();
|
|
|
563
|
break;
|
|
551
|
break;
|
|
|
564
|
case DeclarativeChart::SeriesTypeArea:
|
|
552
|
case DeclarativeChart::SeriesTypeArea:
|
|
|
565
|
series = new DeclarativeAreaSeries();
|
|
553
|
series = new DeclarativeAreaSeries();
|
|
|
566
|
break;
|
|
554
|
break;
|
|
|
567
|
case DeclarativeChart::SeriesTypeStackedBar:
|
|
555
|
case DeclarativeChart::SeriesTypeStackedBar:
|
|
|
568
|
series = new DeclarativeStackedBarSeries();
|
|
556
|
series = new DeclarativeStackedBarSeries();
|
|
|
569
|
break;
|
|
557
|
break;
|
|
|
570
|
case DeclarativeChart::SeriesTypePercentBar:
|
|
558
|
case DeclarativeChart::SeriesTypePercentBar:
|
|
|
571
|
series = new DeclarativePercentBarSeries();
|
|
559
|
series = new DeclarativePercentBarSeries();
|
|
|
572
|
break;
|
|
560
|
break;
|
|
|
573
|
case DeclarativeChart::SeriesTypeBar:
|
|
561
|
case DeclarativeChart::SeriesTypeBar:
|
|
|
574
|
series = new DeclarativeBarSeries();
|
|
562
|
series = new DeclarativeBarSeries();
|
|
|
575
|
break;
|
|
563
|
break;
|
|
|
576
|
case DeclarativeChart::SeriesTypeHorizontalBar:
|
|
564
|
case DeclarativeChart::SeriesTypeHorizontalBar:
|
|
|
577
|
series = new DeclarativeHorizontalBarSeries();
|
|
565
|
series = new DeclarativeHorizontalBarSeries();
|
|
|
578
|
break;
|
|
566
|
break;
|
|
|
579
|
case DeclarativeChart::SeriesTypeHorizontalPercentBar:
|
|
567
|
case DeclarativeChart::SeriesTypeHorizontalPercentBar:
|
|
|
580
|
series = new DeclarativeHorizontalPercentBarSeries();
|
|
568
|
series = new DeclarativeHorizontalPercentBarSeries();
|
|
|
581
|
break;
|
|
569
|
break;
|
|
|
582
|
case DeclarativeChart::SeriesTypeHorizontalStackedBar:
|
|
570
|
case DeclarativeChart::SeriesTypeHorizontalStackedBar:
|
|
|
583
|
series = new DeclarativeHorizontalStackedBarSeries();
|
|
571
|
series = new DeclarativeHorizontalStackedBarSeries();
|
|
|
584
|
break;
|
|
572
|
break;
|
|
|
585
|
case DeclarativeChart::SeriesTypePie:
|
|
573
|
case DeclarativeChart::SeriesTypePie:
|
|
|
586
|
series = new DeclarativePieSeries();
|
|
574
|
series = new DeclarativePieSeries();
|
|
|
587
|
break;
|
|
575
|
break;
|
|
|
588
|
case DeclarativeChart::SeriesTypeScatter:
|
|
576
|
case DeclarativeChart::SeriesTypeScatter:
|
|
|
589
|
series = new DeclarativeScatterSeries();
|
|
577
|
series = new DeclarativeScatterSeries();
|
|
|
590
|
break;
|
|
578
|
break;
|
|
|
591
|
case DeclarativeChart::SeriesTypeSpline:
|
|
579
|
case DeclarativeChart::SeriesTypeSpline:
|
|
|
592
|
series = new DeclarativeSplineSeries();
|
|
580
|
series = new DeclarativeSplineSeries();
|
|
|
593
|
break;
|
|
581
|
break;
|
|
|
594
|
default:
|
|
582
|
default:
|
|
|
595
|
qWarning() << "Illegal series type";
|
|
583
|
qWarning() << "Illegal series type";
|
|
|
596
|
}
|
|
584
|
}
|
|
|
597
|
|
|
585
|
|
|
|
598
|
if (series) {
|
|
586
|
if (series) {
|
|
|
599
|
series->setName(name);
|
|
587
|
series->setName(name);
|
|
|
600
|
m_chart->addSeries(series);
|
|
588
|
m_chart->addSeries(series);
|
|
|
601
|
createDefaultAxes(series);
|
|
589
|
createDefaultAxes(series);
|
|
|
602
|
}
|
|
590
|
}
|
|
|
603
|
|
|
591
|
|
|
|
604
|
return series;
|
|
592
|
return series;
|
|
|
605
|
}
|
|
593
|
}
|
|
|
606
|
|
|
594
|
|
|
|
607
|
void DeclarativeChart::setAxisX(QAbstractAxis *axis, QAbstractSeries *series)
|
|
595
|
void DeclarativeChart::setAxisX(QAbstractAxis *axis, QAbstractSeries *series)
|
|
|
608
|
{
|
|
596
|
{
|
|
|
609
|
if (axis)
|
|
597
|
if (axis)
|
|
|
610
|
m_chart->setAxisX(axis, series);
|
|
598
|
m_chart->setAxisX(axis, series);
|
|
|
611
|
}
|
|
599
|
}
|
|
|
612
|
|
|
600
|
|
|
|
613
|
void DeclarativeChart::setAxisY(QAbstractAxis *axis, QAbstractSeries *series)
|
|
601
|
void DeclarativeChart::setAxisY(QAbstractAxis *axis, QAbstractSeries *series)
|
|
|
614
|
{
|
|
602
|
{
|
|
|
615
|
if (axis)
|
|
603
|
if (axis)
|
|
|
616
|
m_chart->setAxisY(axis, series);
|
|
604
|
m_chart->setAxisY(axis, series);
|
|
|
617
|
}
|
|
605
|
}
|
|
|
618
|
|
|
606
|
|
|
|
619
|
void DeclarativeChart::createDefaultAxes()
|
|
607
|
void DeclarativeChart::createDefaultAxes()
|
|
|
620
|
{
|
|
608
|
{
|
|
|
621
|
qWarning() << "ChartView.createDefaultAxes() is deprecated. Axes are created automatically.";
|
|
609
|
qWarning() << "ChartView.createDefaultAxes() is deprecated. Axes are created automatically.";
|
|
|
622
|
}
|
|
610
|
}
|
|
|
623
|
|
|
611
|
|
|
|
624
|
void DeclarativeChart::createDefaultAxes(QAbstractSeries* series)
|
|
612
|
void DeclarativeChart::createDefaultAxes(QAbstractSeries* series)
|
|
|
625
|
{
|
|
613
|
{
|
|
|
626
|
foreach (QAbstractSeries *s, m_chart->series()) {
|
|
614
|
foreach (QAbstractSeries *s, m_chart->series()) {
|
|
|
627
|
// If there is already an x axis of the correct type, re-use it
|
|
615
|
// If there is already an x axis of the correct type, re-use it
|
|
|
628
|
if (!m_chart->axisX(series) && s != series && m_chart->axisX(s)
|
|
616
|
if (!m_chart->axisX(series) && s != series && m_chart->axisX(s)
|
|
|
629
|
&& m_chart->axisX(s)->type() == series->d_ptr->defaultAxisType(Qt::Horizontal))
|
|
617
|
&& m_chart->axisX(s)->type() == series->d_ptr->defaultAxisType(Qt::Horizontal))
|
|
|
630
|
m_chart->setAxisX(m_chart->axisX(s), series);
|
|
618
|
m_chart->setAxisX(m_chart->axisX(s), series);
|
|
|
631
|
|
|
619
|
|
|
|
632
|
// If there is already a y axis of the correct type, re-use it
|
|
620
|
// If there is already a y axis of the correct type, re-use it
|
|
|
633
|
if (!m_chart->axisY(series) && s != series && m_chart->axisY(s)
|
|
621
|
if (!m_chart->axisY(series) && s != series && m_chart->axisY(s)
|
|
|
634
|
&& m_chart->axisY(s)->type() == series->d_ptr->defaultAxisType(Qt::Vertical))
|
|
622
|
&& m_chart->axisY(s)->type() == series->d_ptr->defaultAxisType(Qt::Vertical))
|
|
|
635
|
m_chart->setAxisY(m_chart->axisY(s), series);
|
|
623
|
m_chart->setAxisY(m_chart->axisY(s), series);
|
|
|
636
|
}
|
|
624
|
}
|
|
|
637
|
|
|
625
|
|
|
|
638
|
// If no x axis of correct type was found, create a new x axis based of default axis type
|
|
626
|
// If no x axis of correct type was found, create a new x axis based of default axis type
|
|
|
639
|
if (!m_chart->axisX(series)) {
|
|
627
|
if (!m_chart->axisX(series)) {
|
|
|
640
|
switch (series->d_ptr->defaultAxisType(Qt::Horizontal)) {
|
|
628
|
switch (series->d_ptr->defaultAxisType(Qt::Horizontal)) {
|
|
|
641
|
case QAbstractAxis::AxisTypeValue:
|
|
629
|
case QAbstractAxis::AxisTypeValue:
|
|
|
642
|
m_chart->setAxisX(new QValueAxis(this), series);
|
|
630
|
m_chart->setAxisX(new QValueAxis(this), series);
|
|
|
643
|
break;
|
|
631
|
break;
|
|
|
644
|
case QAbstractAxis::AxisTypeBarCategory:
|
|
632
|
case QAbstractAxis::AxisTypeBarCategory:
|
|
|
645
|
m_chart->setAxisX(new QBarCategoryAxis(this), series);
|
|
633
|
m_chart->setAxisX(new QBarCategoryAxis(this), series);
|
|
|
646
|
break;
|
|
634
|
break;
|
|
|
647
|
case QAbstractAxis::AxisTypeCategory:
|
|
635
|
case QAbstractAxis::AxisTypeCategory:
|
|
|
648
|
m_chart->setAxisX(new QCategoryAxis(this), series);
|
|
636
|
m_chart->setAxisX(new QCategoryAxis(this), series);
|
|
|
649
|
break;
|
|
637
|
break;
|
|
|
650
|
#ifndef QT_ON_ARM
|
|
638
|
#ifndef QT_ON_ARM
|
|
|
651
|
case QAbstractAxis::AxisTypeDateTime:
|
|
639
|
case QAbstractAxis::AxisTypeDateTime:
|
|
|
652
|
m_chart->setAxisX(new QDateTimeAxis(this), series);
|
|
640
|
m_chart->setAxisX(new QDateTimeAxis(this), series);
|
|
|
653
|
break;
|
|
641
|
break;
|
|
|
654
|
#endif
|
|
642
|
#endif
|
|
|
655
|
default:
|
|
643
|
default:
|
|
|
656
|
// Do nothing, assume AxisTypeNoAxis
|
|
644
|
// Do nothing, assume AxisTypeNoAxis
|
|
|
657
|
break;
|
|
645
|
break;
|
|
|
658
|
}
|
|
646
|
}
|
|
|
659
|
}
|
|
647
|
}
|
|
|
660
|
|
|
648
|
|
|
|
661
|
// If no y axis of correct type was found, create a new y axis based of default axis type
|
|
649
|
// If no y axis of correct type was found, create a new y axis based of default axis type
|
|
|
662
|
if (!m_chart->axisY(series)) {
|
|
650
|
if (!m_chart->axisY(series)) {
|
|
|
663
|
switch (series->d_ptr->defaultAxisType(Qt::Vertical)) {
|
|
651
|
switch (series->d_ptr->defaultAxisType(Qt::Vertical)) {
|
|
|
664
|
case QAbstractAxis::AxisTypeValue:
|
|
652
|
case QAbstractAxis::AxisTypeValue:
|
|
|
665
|
m_chart->setAxisY(new QValueAxis(this), series);
|
|
653
|
m_chart->setAxisY(new QValueAxis(this), series);
|
|
|
666
|
break;
|
|
654
|
break;
|
|
|
667
|
case QAbstractAxis::AxisTypeBarCategory:
|
|
655
|
case QAbstractAxis::AxisTypeBarCategory:
|
|
|
668
|
m_chart->setAxisY(new QBarCategoryAxis(this), series);
|
|
656
|
m_chart->setAxisY(new QBarCategoryAxis(this), series);
|
|
|
669
|
break;
|
|
657
|
break;
|
|
|
670
|
case QAbstractAxis::AxisTypeCategory:
|
|
658
|
case QAbstractAxis::AxisTypeCategory:
|
|
|
671
|
m_chart->setAxisY(new QCategoryAxis(this), series);
|
|
659
|
m_chart->setAxisY(new QCategoryAxis(this), series);
|
|
|
672
|
break;
|
|
660
|
break;
|
|
|
673
|
#ifndef QT_ON_ARM
|
|
661
|
#ifndef QT_ON_ARM
|
|
|
674
|
case QAbstractAxis::AxisTypeDateTime:
|
|
662
|
case QAbstractAxis::AxisTypeDateTime:
|
|
|
675
|
m_chart->setAxisY(new QDateTimeAxis(this), series);
|
|
663
|
m_chart->setAxisY(new QDateTimeAxis(this), series);
|
|
|
676
|
break;
|
|
664
|
break;
|
|
|
677
|
#endif
|
|
665
|
#endif
|
|
|
678
|
default:
|
|
666
|
default:
|
|
|
679
|
// Do nothing, assume AxisTypeNoAxis
|
|
667
|
// Do nothing, assume AxisTypeNoAxis
|
|
|
680
|
break;
|
|
668
|
break;
|
|
|
681
|
}
|
|
669
|
}
|
|
|
682
|
}
|
|
670
|
}
|
|
|
683
|
|
|
671
|
|
|
|
684
|
//qDebug() << "axis for series" << series << "x:" << m_chart->axisX(series) << "y:" << m_chart->axisY(series);
|
|
672
|
//qDebug() << "axis for series" << series << "x:" << m_chart->axisX(series) << "y:" << m_chart->axisY(series);
|
|
|
685
|
}
|
|
673
|
}
|
|
|
686
|
|
|
674
|
|
|
|
687
|
#include "moc_declarativechart.cpp"
|
|
675
|
#include "moc_declarativechart.cpp"
|
|
|
688
|
|
|
676
|
|
|
|
689
|
QTCOMMERCIALCHART_END_NAMESPACE
|
|
677
|
QTCOMMERCIALCHART_END_NAMESPACE
|
