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

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

Removed unnecessary model related function from xyseries and pieseries
Marek Rosa -
r1166:740d4c3988ce
parent child
Show More
Side by Side Unified
Context file:
r1166:740d4c3988ce Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,798 +1,807
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 "qpieseries.h"
21 #include "qpieseries.h"
22 #include "qpieseries_p.h"
22 #include "qpieseries_p.h"
23 #include "qpieslice.h"
23 #include "qpieslice.h"
24 #include "pieslicedata_p.h"
24 #include "pieslicedata_p.h"
25 #include "chartdataset_p.h"
25 #include "chartdataset_p.h"
26 #include "charttheme_p.h"
26 #include "charttheme_p.h"
27 #include "chartanimator_p.h"
27 #include "chartanimator_p.h"
28 #include "legendmarker_p.h"
28 #include "legendmarker_p.h"
29 #include <QAbstractItemModel>
29 #include <QAbstractItemModel>
30 #include "qpiemodelmapper.h"
30 #include "qpiemodelmapper.h"
31
31
32 QTCOMMERCIALCHART_BEGIN_NAMESPACE
32 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33
33
34 /*!
34 /*!
35 \class QPieSeries
35 \class QPieSeries
36 \brief Pie series API for QtCommercial Charts
36 \brief Pie series API for QtCommercial Charts
37
37
38 The pie series defines a pie chart which consists of pie slices which are defined as QPieSlice objects.
38 The pie series defines a pie chart which consists of pie slices which are defined as QPieSlice objects.
39 The slices can have any values as the QPieSeries will calculate its relative value to the sum of all slices.
39 The slices can have any values as the QPieSeries will calculate its relative value to the sum of all slices.
40 The actual slice size is determined by that relative value.
40 The actual slice size is determined by that relative value.
41
41
42 Pie size and position on the chart is controlled by using relative values which range from 0.0 to 1.0
42 Pie size and position on the chart is controlled by using relative values which range from 0.0 to 1.0
43 These relate to the actual chart rectangle.
43 These relate to the actual chart rectangle.
44
44
45 By default the pie is defined as a full pie but it can also be a partial pie.
45 By default the pie is defined as a full pie but it can also be a partial pie.
46 This can be done by setting a starting angle and angle span to the series.
46 This can be done by setting a starting angle and angle span to the series.
47 Full pie is 360 degrees where 0 is at 12 a'clock.
47 Full pie is 360 degrees where 0 is at 12 a'clock.
48
48
49 See the \l {PieChart Example} {pie chart example} to learn how to create a simple pie chart.
49 See the \l {PieChart Example} {pie chart example} to learn how to create a simple pie chart.
50 \image examples_piechart.png
50 \image examples_piechart.png
51 */
51 */
52
52
53 /*!
53 /*!
54 \property QPieSeries::horizontalPosition
54 \property QPieSeries::horizontalPosition
55 \brief Defines the horizontal position of the pie.
55 \brief Defines the horizontal position of the pie.
56
56
57 The value is a relative value to the chart rectangle where:
57 The value is a relative value to the chart rectangle where:
58
58
59 \list
59 \list
60 \o 0.0 is the absolute left.
60 \o 0.0 is the absolute left.
61 \o 1.0 is the absolute right.
61 \o 1.0 is the absolute right.
62 \endlist
62 \endlist
63
63
64 Default value is 0.5 (center).
64 Default value is 0.5 (center).
65 */
65 */
66
66
67 /*!
67 /*!
68 \property QPieSeries::verticalPosition
68 \property QPieSeries::verticalPosition
69 \brief Defines the vertical position of the pie.
69 \brief Defines the vertical position of the pie.
70
70
71 The value is a relative value to the chart rectangle where:
71 The value is a relative value to the chart rectangle where:
72
72
73 \list
73 \list
74 \o 0.0 is the absolute top.
74 \o 0.0 is the absolute top.
75 \o 1.0 is the absolute bottom.
75 \o 1.0 is the absolute bottom.
76 \endlist
76 \endlist
77
77
78 Default value is 0.5 (center).
78 Default value is 0.5 (center).
79 */
79 */
80
80
81 /*!
81 /*!
82 \property QPieSeries::size
82 \property QPieSeries::size
83 \brief Defines the pie size.
83 \brief Defines the pie size.
84
84
85 The value is a relative value to the chart rectangle where:
85 The value is a relative value to the chart rectangle where:
86
86
87 \list
87 \list
88 \o 0.0 is the minimum size (pie not drawn).
88 \o 0.0 is the minimum size (pie not drawn).
89 \o 1.0 is the maximum size that can fit the chart.
89 \o 1.0 is the maximum size that can fit the chart.
90 \endlist
90 \endlist
91
91
92 Default value is 0.7.
92 Default value is 0.7.
93 */
93 */
94
94
95 /*!
95 /*!
96 \property QPieSeries::startAngle
96 \property QPieSeries::startAngle
97 \brief Defines the starting angle of the pie.
97 \brief Defines the starting angle of the pie.
98
98
99 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
99 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
100
100
101 Default is value is 0.
101 Default is value is 0.
102 */
102 */
103
103
104 /*!
104 /*!
105 \property QPieSeries::endAngle
105 \property QPieSeries::endAngle
106 \brief Defines the ending angle of the pie.
106 \brief Defines the ending angle of the pie.
107
107
108 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
108 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
109
109
110 Default is value is 360.
110 Default is value is 360.
111 */
111 */
112
112
113
113
114 /*!
114 /*!
115 Constructs a series object which is a child of \a parent.
115 Constructs a series object which is a child of \a parent.
116 */
116 */
117 QPieSeries::QPieSeries(QObject *parent) :
117 QPieSeries::QPieSeries(QObject *parent) :
118 QAbstractSeries(*new QPieSeriesPrivate(this),parent)
118 QAbstractSeries(*new QPieSeriesPrivate(this),parent)
119 {
119 {
120
120
121 }
121 }
122
122
123 /*!
123 /*!
124 Destroys the series and its slices.
124 Destroys the series and its slices.
125 */
125 */
126 QPieSeries::~QPieSeries()
126 QPieSeries::~QPieSeries()
127 {
127 {
128 // NOTE: d_prt destroyed by QObject
128 // NOTE: d_prt destroyed by QObject
129 }
129 }
130
130
131 /*!
131 /*!
132 Returns QChartSeries::SeriesTypePie.
132 Returns QChartSeries::SeriesTypePie.
133 */
133 */
134 QAbstractSeries::SeriesType QPieSeries::type() const
134 QAbstractSeries::SeriesType QPieSeries::type() const
135 {
135 {
136 return QAbstractSeries::SeriesTypePie;
136 return QAbstractSeries::SeriesTypePie;
137 }
137 }
138
138
139 /*!
139 /*!
140 Appends an array of \a slices to the series.
140 Appends an array of \a slices to the series.
141 Slice ownership is passed to the series.
141 Slice ownership is passed to the series.
142 */
142 */
143 bool QPieSeries::append(QList<QPieSlice*> slices)
143 bool QPieSeries::append(QList<QPieSlice*> slices)
144 {
144 {
145 Q_D(QPieSeries);
145 Q_D(QPieSeries);
146
146
147 if (slices.count() == 0)
147 if (slices.count() == 0)
148 return false;
148 return false;
149
149
150 foreach (QPieSlice* s, slices) {
150 foreach (QPieSlice* s, slices) {
151 if (!s || d->m_slices.contains(s))
151 if (!s || d->m_slices.contains(s))
152 return false;
152 return false;
153 }
153 }
154
154
155 foreach (QPieSlice* s, slices) {
155 foreach (QPieSlice* s, slices) {
156 s->setParent(this);
156 s->setParent(this);
157 d->m_slices << s;
157 d->m_slices << s;
158 }
158 }
159
159
160 d->updateDerivativeData();
160 d->updateDerivativeData();
161
161
162 foreach (QPieSlice* s, slices) {
162 foreach (QPieSlice* s, slices) {
163 connect(s, SIGNAL(changed()), d, SLOT(sliceChanged()));
163 connect(s, SIGNAL(changed()), d, SLOT(sliceChanged()));
164 connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
164 connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
165 connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
165 connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
166 }
166 }
167
167
168 emit d->added(slices);
168 emit d->added(slices);
169
169
170 return true;
170 return true;
171 }
171 }
172
172
173 /*!
173 /*!
174 Appends a single \a slice to the series.
174 Appends a single \a slice to the series.
175 Slice ownership is passed to the series.
175 Slice ownership is passed to the series.
176 */
176 */
177 bool QPieSeries::append(QPieSlice* slice)
177 bool QPieSeries::append(QPieSlice* slice)
178 {
178 {
179 return append(QList<QPieSlice*>() << slice);
179 return append(QList<QPieSlice*>() << slice);
180 }
180 }
181
181
182 /*!
182 /*!
183 Appends a single \a slice to the series and returns a reference to the series.
183 Appends a single \a slice to the series and returns a reference to the series.
184 Slice ownership is passed to the series.
184 Slice ownership is passed to the series.
185 */
185 */
186 QPieSeries& QPieSeries::operator << (QPieSlice* slice)
186 QPieSeries& QPieSeries::operator << (QPieSlice* slice)
187 {
187 {
188 append(slice);
188 append(slice);
189 return *this;
189 return *this;
190 }
190 }
191
191
192
192
193 /*!
193 /*!
194 Appends a single slice to the series with give \a value and \a name.
194 Appends a single slice to the series with give \a value and \a name.
195 Slice ownership is passed to the series.
195 Slice ownership is passed to the series.
196 */
196 */
197 QPieSlice* QPieSeries::append(qreal value, QString name)
197 QPieSlice* QPieSeries::append(qreal value, QString name)
198 {
198 {
199 QPieSlice* slice = new QPieSlice(value, name);
199 QPieSlice* slice = new QPieSlice(value, name);
200 append(slice);
200 append(slice);
201 return slice;
201 return slice;
202 }
202 }
203
203
204 /*!
204 /*!
205 Inserts a single \a slice to the series before the slice at \a index position.
205 Inserts a single \a slice to the series before the slice at \a index position.
206 Slice ownership is passed to the series.
206 Slice ownership is passed to the series.
207 */
207 */
208 bool QPieSeries::insert(int index, QPieSlice* slice)
208 bool QPieSeries::insert(int index, QPieSlice* slice)
209 {
209 {
210 Q_D(QPieSeries);
210 Q_D(QPieSeries);
211
211
212 if (index < 0 || index > d->m_slices.count())
212 if (index < 0 || index > d->m_slices.count())
213 return false;
213 return false;
214
214
215 if (!slice || d->m_slices.contains(slice))
215 if (!slice || d->m_slices.contains(slice))
216 return false;
216 return false;
217
217
218 slice->setParent(this);
218 slice->setParent(this);
219 d->m_slices.insert(index, slice);
219 d->m_slices.insert(index, slice);
220
220
221 d->updateDerivativeData();
221 d->updateDerivativeData();
222
222
223 connect(slice, SIGNAL(changed()), d, SLOT(sliceChanged()));
223 connect(slice, SIGNAL(changed()), d, SLOT(sliceChanged()));
224 connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
224 connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
225 connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
225 connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
226
226
227 emit d->added(QList<QPieSlice*>() << slice);
227 emit d->added(QList<QPieSlice*>() << slice);
228
228
229 return true;
229 return true;
230 }
230 }
231
231
232 /*!
232 /*!
233 Removes a single \a slice from the series and deletes the slice.
233 Removes a single \a slice from the series and deletes the slice.
234
234
235 Do not reference the pointer after this call.
235 Do not reference the pointer after this call.
236 */
236 */
237 bool QPieSeries::remove(QPieSlice* slice)
237 bool QPieSeries::remove(QPieSlice* slice)
238 {
238 {
239 Q_D(QPieSeries);
239 Q_D(QPieSeries);
240
240
241 if (!d->m_slices.removeOne(slice))
241 if (!d->m_slices.removeOne(slice))
242 return false;
242 return false;
243
243
244 d->updateDerivativeData();
244 d->updateDerivativeData();
245
245
246 emit d->removed(QList<QPieSlice*>() << slice);
246 emit d->removed(QList<QPieSlice*>() << slice);
247
247
248 delete slice;
248 delete slice;
249 slice = 0;
249 slice = 0;
250
250
251 return true;
251 return true;
252 }
252 }
253
253
254 /*!
254 /*!
255 Clears all slices from the series.
255 Clears all slices from the series.
256 */
256 */
257 void QPieSeries::clear()
257 void QPieSeries::clear()
258 {
258 {
259 Q_D(QPieSeries);
259 Q_D(QPieSeries);
260 if (d->m_slices.count() == 0)
260 if (d->m_slices.count() == 0)
261 return;
261 return;
262
262
263 QList<QPieSlice*> slices = d->m_slices;
263 QList<QPieSlice*> slices = d->m_slices;
264 foreach (QPieSlice* s, d->m_slices) {
264 foreach (QPieSlice* s, d->m_slices) {
265 d->m_slices.removeOne(s);
265 d->m_slices.removeOne(s);
266 delete s;
266 delete s;
267 }
267 }
268
268
269 d->updateDerivativeData();
269 d->updateDerivativeData();
270
270
271 emit d->removed(slices);
271 emit d->removed(slices);
272 }
272 }
273
273
274 /*!
274 /*!
275 returns the number of the slices in this series.
275 returns the number of the slices in this series.
276 */
276 */
277 int QPieSeries::count() const
277 int QPieSeries::count() const
278 {
278 {
279 Q_D(const QPieSeries);
279 Q_D(const QPieSeries);
280 return d->m_slices.count();
280 return d->m_slices.count();
281 }
281 }
282
282
283 /*!
283 /*!
284 Returns true is the series is empty.
284 Returns true is the series is empty.
285 */
285 */
286 bool QPieSeries::isEmpty() const
286 bool QPieSeries::isEmpty() const
287 {
287 {
288 Q_D(const QPieSeries);
288 Q_D(const QPieSeries);
289 return d->m_slices.isEmpty();
289 return d->m_slices.isEmpty();
290 }
290 }
291
291
292 /*!
292 /*!
293 Returns a list of slices that belong to this series.
293 Returns a list of slices that belong to this series.
294 */
294 */
295 QList<QPieSlice*> QPieSeries::slices() const
295 QList<QPieSlice*> QPieSeries::slices() const
296 {
296 {
297 Q_D(const QPieSeries);
297 Q_D(const QPieSeries);
298 return d->m_slices;
298 return d->m_slices;
299 }
299 }
300
300
301 void QPieSeries::setHorizontalPosition(qreal relativePosition)
301 void QPieSeries::setHorizontalPosition(qreal relativePosition)
302 {
302 {
303 Q_D(QPieSeries);
303 Q_D(QPieSeries);
304 if (d->setRealValue(d->m_pieRelativeHorPos, relativePosition, 1.0))
304 if (d->setRealValue(d->m_pieRelativeHorPos, relativePosition, 1.0))
305 emit d->piePositionChanged();
305 emit d->piePositionChanged();
306 }
306 }
307
307
308 void QPieSeries::setVerticalPosition(qreal relativePosition)
308 void QPieSeries::setVerticalPosition(qreal relativePosition)
309 {
309 {
310 Q_D(QPieSeries);
310 Q_D(QPieSeries);
311 if (d->setRealValue(d->m_pieRelativeVerPos, relativePosition, 1.0))
311 if (d->setRealValue(d->m_pieRelativeVerPos, relativePosition, 1.0))
312 emit d->piePositionChanged();
312 emit d->piePositionChanged();
313 }
313 }
314
314
315 qreal QPieSeries::horizontalPosition() const
315 qreal QPieSeries::horizontalPosition() const
316 {
316 {
317 Q_D(const QPieSeries);
317 Q_D(const QPieSeries);
318 return d->m_pieRelativeHorPos;
318 return d->m_pieRelativeHorPos;
319 }
319 }
320
320
321 qreal QPieSeries::verticalPosition() const
321 qreal QPieSeries::verticalPosition() const
322 {
322 {
323 Q_D(const QPieSeries);
323 Q_D(const QPieSeries);
324 return d->m_pieRelativeVerPos;
324 return d->m_pieRelativeVerPos;
325 }
325 }
326
326
327 void QPieSeries::setPieSize(qreal relativeSize)
327 void QPieSeries::setPieSize(qreal relativeSize)
328 {
328 {
329 Q_D(QPieSeries);
329 Q_D(QPieSeries);
330 if (d->setRealValue(d->m_pieRelativeSize, relativeSize, 1.0))
330 if (d->setRealValue(d->m_pieRelativeSize, relativeSize, 1.0))
331 emit d->pieSizeChanged();
331 emit d->pieSizeChanged();
332 }
332 }
333
333
334 qreal QPieSeries::pieSize() const
334 qreal QPieSeries::pieSize() const
335 {
335 {
336 Q_D(const QPieSeries);
336 Q_D(const QPieSeries);
337 return d->m_pieRelativeSize;
337 return d->m_pieRelativeSize;
338 }
338 }
339
339
340
340
341 void QPieSeries::setPieStartAngle(qreal angle)
341 void QPieSeries::setPieStartAngle(qreal angle)
342 {
342 {
343 Q_D(QPieSeries);
343 Q_D(QPieSeries);
344 if (d->setRealValue(d->m_pieStartAngle, angle, d->m_pieEndAngle))
344 if (d->setRealValue(d->m_pieStartAngle, angle, d->m_pieEndAngle))
345 d->updateDerivativeData();
345 d->updateDerivativeData();
346 }
346 }
347
347
348 qreal QPieSeries::pieStartAngle() const
348 qreal QPieSeries::pieStartAngle() const
349 {
349 {
350 Q_D(const QPieSeries);
350 Q_D(const QPieSeries);
351 return d->m_pieStartAngle;
351 return d->m_pieStartAngle;
352 }
352 }
353
353
354 /*!
354 /*!
355 Sets the end angle of the pie.
355 Sets the end angle of the pie.
356
356
357 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
357 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
358
358
359 \a angle must be greater than start angle.
359 \a angle must be greater than start angle.
360
360
361 \sa pieEndAngle(), pieStartAngle(), setPieStartAngle()
361 \sa pieEndAngle(), pieStartAngle(), setPieStartAngle()
362 */
362 */
363 void QPieSeries::setPieEndAngle(qreal angle)
363 void QPieSeries::setPieEndAngle(qreal angle)
364 {
364 {
365 Q_D(QPieSeries);
365 Q_D(QPieSeries);
366
366
367 if (d->setRealValue(d->m_pieEndAngle, angle, 360.0, d->m_pieStartAngle))
367 if (d->setRealValue(d->m_pieEndAngle, angle, 360.0, d->m_pieStartAngle))
368 d->updateDerivativeData();
368 d->updateDerivativeData();
369 }
369 }
370
370
371 /*!
371 /*!
372 Returns the end angle of the pie.
372 Returns the end angle of the pie.
373
373
374 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
374 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
375
375
376 \sa setPieEndAngle(), pieStartAngle(), setPieStartAngle()
376 \sa setPieEndAngle(), pieStartAngle(), setPieStartAngle()
377 */
377 */
378 qreal QPieSeries::pieEndAngle() const
378 qreal QPieSeries::pieEndAngle() const
379 {
379 {
380 Q_D(const QPieSeries);
380 Q_D(const QPieSeries);
381 return d->m_pieEndAngle;
381 return d->m_pieEndAngle;
382 }
382 }
383
383
384 /*!
384 /*!
385 Sets the all the slice labels \a visible or invisible.
385 Sets the all the slice labels \a visible or invisible.
386
386
387 \sa QPieSlice::isLabelVisible(), QPieSlice::setLabelVisible()
387 \sa QPieSlice::isLabelVisible(), QPieSlice::setLabelVisible()
388 */
388 */
389 void QPieSeries::setLabelsVisible(bool visible)
389 void QPieSeries::setLabelsVisible(bool visible)
390 {
390 {
391 Q_D(QPieSeries);
391 Q_D(QPieSeries);
392 foreach (QPieSlice* s, d->m_slices)
392 foreach (QPieSlice* s, d->m_slices)
393 s->setLabelVisible(visible);
393 s->setLabelVisible(visible);
394 }
394 }
395
395
396 /*!
396 /*!
397 Returns the sum of all slice values in this series.
397 Returns the sum of all slice values in this series.
398
398
399 \sa QPieSlice::value(), QPieSlice::setValue(), QPieSlice::percentage()
399 \sa QPieSlice::value(), QPieSlice::setValue(), QPieSlice::percentage()
400 */
400 */
401 qreal QPieSeries::sum() const
401 qreal QPieSeries::sum() const
402 {
402 {
403 Q_D(const QPieSeries);
403 Q_D(const QPieSeries);
404 return d->m_sum;
404 return d->m_sum;
405 }
405 }
406
406
407 /*!
407 /*!
408 \fn void QPieSeries::clicked(QPieSlice* slice)
408 \fn void QPieSeries::clicked(QPieSlice* slice)
409
409
410 This signal is emitted when a \a slice has been clicked.
410 This signal is emitted when a \a slice has been clicked.
411
411
412 \sa QPieSlice::clicked()
412 \sa QPieSlice::clicked()
413 */
413 */
414
414
415 /*!
415 /*!
416 \fn void QPieSeries::hovered(QPieSlice* slice, bool state)
416 \fn void QPieSeries::hovered(QPieSlice* slice, bool state)
417
417
418 This signal is emitted when user has hovered over or away from the \a slice.
418 This signal is emitted when user has hovered over or away from the \a slice.
419
419
420 \a state is true when user has hovered over the slice and false when hover has moved away from the slice.
420 \a state is true when user has hovered over the slice and false when hover has moved away from the slice.
421
421
422 \sa QPieSlice::hovered()
422 \sa QPieSlice::hovered()
423 */
423 */
424
424
425 /*!
425 /*!
426 \fn bool QPieSeries::setModel(QAbstractItemModel *model)
426 \fn bool QPieSeries::setModel(QAbstractItemModel *model)
427 Sets the \a model to be used as a data source
427 Sets the \a model to be used as a data source
428 */
428 */
429 void QPieSeries::setModel(QAbstractItemModel* model)
429 void QPieSeries::setModel(QAbstractItemModel* model)
430 {
430 {
431 Q_D(QPieSeries);
431 Q_D(QPieSeries);
432 // disconnect signals from old model
432 // disconnect signals from old model
433 if(d->m_model)
433 if(d->m_model)
434 {
434 {
435 disconnect(d->m_model, 0, this, 0);
435 disconnect(d->m_model, 0, this, 0);
436 }
436 }
437
437
438 // set new model
438 // set new model
439 if(model)
439 if(model)
440 {
440 {
441 d->m_model = model;
441 d->m_model = model;
442 // connect signals from the model
443 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
444 connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
445 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
446 connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
447 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
448
442 if (d->m_mapper)
449 if (d->m_mapper)
443 d->setMapping();
450 d->initializePieFromModel();
444 }
451 }
445 else
452 else
446 {
453 {
447 d->m_model = 0;
454 d->m_model = 0;
448 }
455 }
449 }
456 }
450
457
451 void QPieSeries::setModelMapper(QPieModelMapper *mapper)
458 void QPieSeries::setModelMapper(QPieModelMapper *mapper)
452 {
459 {
453 Q_D(QPieSeries);
460 Q_D(QPieSeries);
454 // disconnect signals from old mapper
461 // disconnect signals from old mapper
455 if (d->m_mapper) {
462 if (d->m_mapper) {
456 QObject::disconnect(d->m_mapper, 0, this, 0);
463 QObject::disconnect(d->m_mapper, 0, this, 0);
457 }
464 }
458
465
459 if (mapper) {
466 if (mapper) {
460 d->m_mapper = mapper;
467 d->m_mapper = mapper;
468 // connect the signal from the mapper
469 connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializePieFromModel()));
470
461 if (d->m_model)
471 if (d->m_model)
462 d->setMapping();
472 d->initializePieFromModel();
463 } else {
473 } else {
464 d->m_mapper = 0;
474 d->m_mapper = 0;
465 }
475 }
466 }
476 }
467
477
468 QPieModelMapper* QPieSeries::modelMapper() const
478 QPieModelMapper* QPieSeries::modelMapper() const
469 {
479 {
470 Q_D(const QPieSeries);
480 Q_D(const QPieSeries);
471 return d->m_mapper;
481 return d->m_mapper;
472 }
482 }
473
483
474 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
484 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
475
485
476
486
477 QPieSeriesPrivate::QPieSeriesPrivate(QPieSeries *parent) :
487 QPieSeriesPrivate::QPieSeriesPrivate(QPieSeries *parent) :
478 QAbstractSeriesPrivate(parent),
488 QAbstractSeriesPrivate(parent),
479 m_pieRelativeHorPos(0.5),
489 m_pieRelativeHorPos(0.5),
480 m_pieRelativeVerPos(0.5),
490 m_pieRelativeVerPos(0.5),
481 m_pieRelativeSize(0.7),
491 m_pieRelativeSize(0.7),
482 m_pieStartAngle(0),
492 m_pieStartAngle(0),
483 m_pieEndAngle(360),
493 m_pieEndAngle(360),
484 m_sum(0),
494 m_sum(0),
485 m_mapper(0)
495 m_mapper(0)
486 {
496 {
487
497
488 }
498 }
489
499
490 QPieSeriesPrivate::~QPieSeriesPrivate()
500 QPieSeriesPrivate::~QPieSeriesPrivate()
491 {
501 {
492
502
493 }
503 }
494
504
495 void QPieSeriesPrivate::updateDerivativeData()
505 void QPieSeriesPrivate::updateDerivativeData()
496 {
506 {
497 m_sum = 0;
507 m_sum = 0;
498
508
499 // nothing to do?
509 // nothing to do?
500 if (m_slices.count() == 0)
510 if (m_slices.count() == 0)
501 return;
511 return;
502
512
503 // calculate sum of all slices
513 // calculate sum of all slices
504 foreach (QPieSlice* s, m_slices)
514 foreach (QPieSlice* s, m_slices)
505 m_sum += s->value();
515 m_sum += s->value();
506
516
507 // nothing to show..
517 // nothing to show..
508 if (qFuzzyIsNull(m_sum))
518 if (qFuzzyIsNull(m_sum))
509 return;
519 return;
510
520
511 // update slice attributes
521 // update slice attributes
512 qreal sliceAngle = m_pieStartAngle;
522 qreal sliceAngle = m_pieStartAngle;
513 qreal pieSpan = m_pieEndAngle - m_pieStartAngle;
523 qreal pieSpan = m_pieEndAngle - m_pieStartAngle;
514 QVector<QPieSlice*> changed;
524 QVector<QPieSlice*> changed;
515 foreach (QPieSlice* s, m_slices) {
525 foreach (QPieSlice* s, m_slices) {
516
526
517 PieSliceData data = PieSliceData::data(s);
527 PieSliceData data = PieSliceData::data(s);
518 data.m_percentage = s->value() / m_sum;
528 data.m_percentage = s->value() / m_sum;
519 data.m_angleSpan = pieSpan * data.m_percentage;
529 data.m_angleSpan = pieSpan * data.m_percentage;
520 data.m_startAngle = sliceAngle;
530 data.m_startAngle = sliceAngle;
521 sliceAngle += data.m_angleSpan;
531 sliceAngle += data.m_angleSpan;
522
532
523 if (PieSliceData::data(s) != data) {
533 if (PieSliceData::data(s) != data) {
524 PieSliceData::data(s) = data;
534 PieSliceData::data(s) = data;
525 changed << s;
535 changed << s;
526 }
536 }
527 }
537 }
528
538
529 // emit signals
539 // emit signals
530 foreach (QPieSlice* s, changed)
540 foreach (QPieSlice* s, changed)
531 PieSliceData::data(s).emitChangedSignal(s);
541 PieSliceData::data(s).emitChangedSignal(s);
532 }
542 }
533
543
534 QPieSeriesPrivate* QPieSeriesPrivate::seriesData(QPieSeries &series)
544 QPieSeriesPrivate* QPieSeriesPrivate::seriesData(QPieSeries &series)
535 {
545 {
536 return series.d_func();
546 return series.d_func();
537 }
547 }
538
548
539 void QPieSeriesPrivate::sliceChanged()
549 void QPieSeriesPrivate::sliceChanged()
540 {
550 {
541 Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
551 Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
542 updateDerivativeData();
552 updateDerivativeData();
543 }
553 }
544
554
545 void QPieSeriesPrivate::sliceClicked()
555 void QPieSeriesPrivate::sliceClicked()
546 {
556 {
547 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
557 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
548 Q_ASSERT(m_slices.contains(slice));
558 Q_ASSERT(m_slices.contains(slice));
549 Q_Q(QPieSeries);
559 Q_Q(QPieSeries);
550 emit q->clicked(slice);
560 emit q->clicked(slice);
551 }
561 }
552
562
553 void QPieSeriesPrivate::sliceHovered(bool state)
563 void QPieSeriesPrivate::sliceHovered(bool state)
554 {
564 {
555 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
565 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
556 Q_ASSERT(m_slices.contains(slice));
566 Q_ASSERT(m_slices.contains(slice));
557 Q_Q(QPieSeries);
567 Q_Q(QPieSeries);
558 emit q->hovered(slice, state);
568 emit q->hovered(slice, state);
559 }
569 }
560
570
561 void QPieSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
571 void QPieSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
562 {
572 {
563 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
573 if (m_mapper) {
564 for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
574 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
565 if (m_mapper->orientation() == Qt::Vertical)
575 for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
566 {
576 if (m_mapper->orientation() == Qt::Vertical)
567 if ( topLeft.row() >= m_mapper->first() && (m_mapper->count() == - 1 || topLeft.row() < m_mapper->first() + m_mapper->count())) {
577 {
568 if (topLeft.column() == m_mapper->mapValues())
578 if ( topLeft.row() >= m_mapper->first() && (m_mapper->count() == - 1 || topLeft.row() < m_mapper->first() + m_mapper->count())) {
569 m_slices.at(topLeft.row() - m_mapper->first())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
579 if (topLeft.column() == m_mapper->mapValues())
570 if (topLeft.column() == m_mapper->mapLabels())
580 m_slices.at(topLeft.row() - m_mapper->first())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
571 m_slices.at(topLeft.row() - m_mapper->first())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
581 if (topLeft.column() == m_mapper->mapLabels())
582 m_slices.at(topLeft.row() - m_mapper->first())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
583 }
572 }
584 }
573 }
585 else
574 else
586 {
575 {
587 if (topLeft.column() >= m_mapper->first() && (m_mapper->count() == - 1 || topLeft.column() < m_mapper->first() + m_mapper->count())) {
576 if (topLeft.column() >= m_mapper->first() && (m_mapper->count() == - 1 || topLeft.column() < m_mapper->first() + m_mapper->count())) {
588 if (topLeft.row() == m_mapper->mapValues())
577 if (topLeft.row() == m_mapper->mapValues())
589 m_slices.at(topLeft.column() - m_mapper->first())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
578 m_slices.at(topLeft.column() - m_mapper->first())->setValue(m_model->data(topLeft, Qt::DisplayRole).toDouble());
590 if (topLeft.row() == m_mapper->mapLabels())
579 if (topLeft.row() == m_mapper->mapLabels())
591 m_slices.at(topLeft.column() - m_mapper->first())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
580 m_slices.at(topLeft.column() - m_mapper->first())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
592 }
581 }
593 }
582 }
594 }
583 }
595 }
584 }
596 }
585 }
597 }
586
598
587
599
588 void QPieSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
600 void QPieSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
589 {
601 {
590 Q_UNUSED(parent);
602 Q_UNUSED(parent);
591 if (m_mapper->orientation() == Qt::Vertical)
603 if (m_mapper) {
592 insertData(start, end);
604 if (m_mapper->orientation() == Qt::Vertical)
593 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
605 insertData(start, end);
594 initializePieFromModel();
606 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
607 initializePieFromModel();
608 }
595 }
609 }
596
610
597 void QPieSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
611 void QPieSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
598 {
612 {
599 Q_UNUSED(parent);
613 Q_UNUSED(parent);
600 if (m_mapper->orientation() == Qt::Vertical)
614 if (m_mapper) {
601 removeData(start, end);
615 if (m_mapper->orientation() == Qt::Vertical)
602 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
616 removeData(start, end);
603 initializePieFromModel();
617 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
618 initializePieFromModel();
619 }
604 }
620 }
605
621
606 void QPieSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
622 void QPieSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
607 {
623 {
608 Q_UNUSED(parent);
624 Q_UNUSED(parent);
609 if (m_mapper->orientation() == Qt::Horizontal)
625 if (m_mapper) {
610 insertData(start, end);
626 if (m_mapper->orientation() == Qt::Horizontal)
611 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
627 insertData(start, end);
612 initializePieFromModel();
628 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
629 initializePieFromModel();
630 }
613 }
631 }
614
632
615 void QPieSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
633 void QPieSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
616 {
634 {
617 Q_UNUSED(parent);
635 Q_UNUSED(parent);
618 if (m_mapper->orientation() == Qt::Horizontal)
636 if (m_mapper) {
619 removeData(start, end);
637 if (m_mapper->orientation() == Qt::Horizontal)
620 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
638 removeData(start, end);
621 initializePieFromModel();
639 else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
640 initializePieFromModel();
641 }
622 }
642 }
623
643
624 void QPieSeriesPrivate::insertData(int start, int end)
644 void QPieSeriesPrivate::insertData(int start, int end)
625 {
645 {
626 Q_Q(QPieSeries);
646 Q_Q(QPieSeries);
627 if (m_mapper->count() != -1 && start >= m_mapper->first() + m_mapper->count()) {
647 if (m_mapper) {
628 return;
648 if (m_mapper->count() != -1 && start >= m_mapper->first() + m_mapper->count()) {
629 } else {
649 return;
630 int addedCount = end - start + 1;
650 } else {
631 if (m_mapper->count() != -1 && addedCount > m_mapper->count())
651 int addedCount = end - start + 1;
632 addedCount = m_mapper->count();
652 if (m_mapper->count() != -1 && addedCount > m_mapper->count())
633 int first = qMax(start, m_mapper->first());
653 addedCount = m_mapper->count();
634 int last = qMin(first + addedCount - 1, m_mapper->orientation() == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
654 int first = qMax(start, m_mapper->first());
635 for (int i = first; i <= last; i++) {
655 int last = qMin(first + addedCount - 1, m_mapper->orientation() == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
636 QPieSlice *slice = new QPieSlice;
656 for (int i = first; i <= last; i++) {
637 if (m_mapper->orientation() == Qt::Vertical) {
657 QPieSlice *slice = new QPieSlice;
638 slice->setValue(m_model->data(m_model->index(i, m_mapper->mapValues()), Qt::DisplayRole).toDouble());
658 if (m_mapper->orientation() == Qt::Vertical) {
639 slice->setLabel(m_model->data(m_model->index(i, m_mapper->mapLabels()), Qt::DisplayRole).toString());
659 slice->setValue(m_model->data(m_model->index(i, m_mapper->mapValues()), Qt::DisplayRole).toDouble());
640 } else {
660 slice->setLabel(m_model->data(m_model->index(i, m_mapper->mapLabels()), Qt::DisplayRole).toString());
641 slice->setValue(m_model->data(m_model->index(m_mapper->mapValues(), i), Qt::DisplayRole).toDouble());
661 } else {
642 slice->setLabel(m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString());
662 slice->setValue(m_model->data(m_model->index(m_mapper->mapValues(), i), Qt::DisplayRole).toDouble());
663 slice->setLabel(m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString());
664 }
665 slice->setLabelVisible();
666 q->insert(i - m_mapper->first(), slice);
643 }
667 }
644 slice->setLabelVisible();
668 if (m_mapper->count() != -1 && m_slices.size() > m_mapper->count())
645 q->insert(i - m_mapper->first(), slice);
669 for (int i = m_slices.size() - 1; i >= m_mapper->count(); i--)
670 q->remove(q->slices().at(i));
646 }
671 }
647 if (m_mapper->count() != -1 && m_slices.size() > m_mapper->count())
648 for (int i = m_slices.size() - 1; i >= m_mapper->count(); i--)
649 q->remove(q->slices().at(i));
650 }
672 }
651 }
673 }
652
674
653 void QPieSeriesPrivate::removeData(int start, int end)
675 void QPieSeriesPrivate::removeData(int start, int end)
654 {
676 {
655 Q_Q(QPieSeries);
677 Q_Q(QPieSeries);
656 int removedCount = end - start + 1;
678 if (m_mapper) {
657 if (m_mapper->count() != -1 && start >= m_mapper->first() + m_mapper->count()) {
679 int removedCount = end - start + 1;
658 return;
680 if (m_mapper->count() != -1 && start >= m_mapper->first() + m_mapper->count()) {
659 } else {
681 return;
660 int toRemove = qMin(m_slices.size(), removedCount); // first find how many items can actually be removed
682 } else {
661 int first = qMax(start, m_mapper->first()); // get the index of the first item that will be removed.
683 int toRemove = qMin(m_slices.size(), removedCount); // first find how many items can actually be removed
662 int last = qMin(first + toRemove - 1, m_slices.size() + m_mapper->first() - 1); // get the index of the last item that will be removed.
684 int first = qMax(start, m_mapper->first()); // get the index of the first item that will be removed.
663 for (int i = last; i >= first; i--)
685 int last = qMin(first + toRemove - 1, m_slices.size() + m_mapper->first() - 1); // get the index of the last item that will be removed.
664 q->remove(q->slices().at(i - m_mapper->first()));
686 for (int i = last; i >= first; i--)
665
687 q->remove(q->slices().at(i - m_mapper->first()));
666 if (m_mapper->count() != -1) {
688
667 int itemsAvailable; // check how many are available to be added
689 if (m_mapper->count() != -1) {
668 if (m_mapper->orientation() == Qt::Vertical)
690 int itemsAvailable; // check how many are available to be added
669 itemsAvailable = m_model->rowCount() - m_mapper->first() - m_slices.size();
691 if (m_mapper->orientation() == Qt::Vertical)
670 else
692 itemsAvailable = m_model->rowCount() - m_mapper->first() - m_slices.size();
671 itemsAvailable = m_model->columnCount() - m_mapper->first() - m_slices.size();
693 else
672 int toBeAdded = qMin(itemsAvailable, m_mapper->count() - m_slices.size()); // add not more items than there is space left to be filled.
694 itemsAvailable = m_model->columnCount() - m_mapper->first() - m_slices.size();
673 int currentSize = m_slices.size();
695 int toBeAdded = qMin(itemsAvailable, m_mapper->count() - m_slices.size()); // add not more items than there is space left to be filled.
674 if (toBeAdded > 0)
696 int currentSize = m_slices.size();
675 for (int i = m_slices.size(); i < currentSize + toBeAdded; i++) {
697 if (toBeAdded > 0)
676 QPieSlice *slice = new QPieSlice;
698 for (int i = m_slices.size(); i < currentSize + toBeAdded; i++) {
677 if (m_mapper->orientation() == Qt::Vertical) {
699 QPieSlice *slice = new QPieSlice;
678 slice->setValue(m_model->data(m_model->index(i + m_mapper->first(), m_mapper->mapValues()), Qt::DisplayRole).toDouble());
700 if (m_mapper->orientation() == Qt::Vertical) {
679 slice->setLabel(m_model->data(m_model->index(i + m_mapper->first(), m_mapper->mapLabels()), Qt::DisplayRole).toString());
701 slice->setValue(m_model->data(m_model->index(i + m_mapper->first(), m_mapper->mapValues()), Qt::DisplayRole).toDouble());
680 } else {
702 slice->setLabel(m_model->data(m_model->index(i + m_mapper->first(), m_mapper->mapLabels()), Qt::DisplayRole).toString());
681 slice->setValue(m_model->data(m_model->index(m_mapper->mapValues(), i + m_mapper->first()), Qt::DisplayRole).toDouble());
703 } else {
682 slice->setLabel(m_model->data(m_model->index(m_mapper->mapLabels(), i + m_mapper->first()), Qt::DisplayRole).toString());
704 slice->setValue(m_model->data(m_model->index(m_mapper->mapValues(), i + m_mapper->first()), Qt::DisplayRole).toDouble());
705 slice->setLabel(m_model->data(m_model->index(m_mapper->mapLabels(), i + m_mapper->first()), Qt::DisplayRole).toString());
706 }
707 slice->setLabelVisible();
708 q->insert(i, slice);
683 }
709 }
684 slice->setLabelVisible();
710 }
685 q->insert(i, slice);
686 }
687 }
711 }
688 }
712 }
689 }
713 }
690
714
691 void QPieSeriesPrivate::setMapping()
692 {
693 initializePieFromModel();
694
695 // connect signals from the model
696 connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
697 connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelRowsAdded(QModelIndex,int,int)));
698 connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelRowsRemoved(QModelIndex,int,int)));
699 connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelColumnsAdded(QModelIndex,int,int)));
700 connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
701
702 // connect the signal from the mapper
703 connect(m_mapper, SIGNAL(updated()), this, SLOT(initializePieFromModel()));
704 }
705
706 void QPieSeriesPrivate::initializePieFromModel()
715 void QPieSeriesPrivate::initializePieFromModel()
707 {
716 {
708 Q_Q(QPieSeries);
717 Q_Q(QPieSeries);
709 // clear current content
718 // clear current content
710 q->clear();
719 q->clear();
711
720
712 // create the initial slices set
721 // create the initial slices set
713 if (m_mapper->orientation() == Qt::Vertical) {
722 if (m_mapper->orientation() == Qt::Vertical) {
714 if (m_mapper->mapValues() >= m_model->columnCount() || m_mapper->mapLabels() >= m_model->columnCount())
723 if (m_mapper->mapValues() >= m_model->columnCount() || m_mapper->mapLabels() >= m_model->columnCount())
715 return; // mapped columns are not existing
724 return; // mapped columns are not existing
716
725
717 int sliceCount = 0;
726 int sliceCount = 0;
718 if(m_mapper->count() == -1)
727 if(m_mapper->count() == -1)
719 sliceCount = m_model->rowCount() - m_mapper->first();
728 sliceCount = m_model->rowCount() - m_mapper->first();
720 else
729 else
721 sliceCount = qMin(m_mapper->count(), m_model->rowCount() - m_mapper->first());
730 sliceCount = qMin(m_mapper->count(), m_model->rowCount() - m_mapper->first());
722 for (int i = m_mapper->first(); i < m_mapper->first() + sliceCount; i++)
731 for (int i = m_mapper->first(); i < m_mapper->first() + sliceCount; i++)
723 q->append(m_model->data(m_model->index(i, m_mapper->mapValues()), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, m_mapper->mapLabels()), Qt::DisplayRole).toString());
732 q->append(m_model->data(m_model->index(i, m_mapper->mapValues()), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, m_mapper->mapLabels()), Qt::DisplayRole).toString());
724 } else {
733 } else {
725 if (m_mapper->mapValues() >= m_model->rowCount() || m_mapper->mapLabels() >= m_model->rowCount())
734 if (m_mapper->mapValues() >= m_model->rowCount() || m_mapper->mapLabels() >= m_model->rowCount())
726 return; // mapped columns are not existing
735 return; // mapped columns are not existing
727
736
728 int sliceCount = 0;
737 int sliceCount = 0;
729 if(m_mapper->count() == -1)
738 if(m_mapper->count() == -1)
730 sliceCount = m_model->columnCount() - m_mapper->first();
739 sliceCount = m_model->columnCount() - m_mapper->first();
731 else
740 else
732 sliceCount = qMin(m_mapper->count(), m_model->columnCount() - m_mapper->first());
741 sliceCount = qMin(m_mapper->count(), m_model->columnCount() - m_mapper->first());
733 for (int i = m_mapper->first(); i < m_mapper->first() + sliceCount; i++)
742 for (int i = m_mapper->first(); i < m_mapper->first() + sliceCount; i++)
734 q->append(m_model->data(m_model->index(m_mapper->mapValues(), i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString());
743 q->append(m_model->data(m_model->index(m_mapper->mapValues(), i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString());
735 }
744 }
736 q->setLabelsVisible(true);
745 q->setLabelsVisible(true);
737 }
746 }
738
747
739 bool QPieSeriesPrivate::setRealValue(qreal &value, qreal newValue, qreal max, qreal min)
748 bool QPieSeriesPrivate::setRealValue(qreal &value, qreal newValue, qreal max, qreal min)
740 {
749 {
741 // Remove rounding errors
750 // Remove rounding errors
742 qreal roundedValue = newValue;
751 qreal roundedValue = newValue;
743 if (qFuzzyIsNull(min) && qFuzzyIsNull(newValue))
752 if (qFuzzyIsNull(min) && qFuzzyIsNull(newValue))
744 roundedValue = 0.0;
753 roundedValue = 0.0;
745 else if (qFuzzyCompare(newValue, max))
754 else if (qFuzzyCompare(newValue, max))
746 roundedValue = max;
755 roundedValue = max;
747 else if (qFuzzyCompare(newValue, min))
756 else if (qFuzzyCompare(newValue, min))
748 roundedValue = min;
757 roundedValue = min;
749
758
750 // Check if the position is valid after removing the rounding errors
759 // Check if the position is valid after removing the rounding errors
751 if (roundedValue < min || roundedValue > max) {
760 if (roundedValue < min || roundedValue > max) {
752 qWarning("QPieSeries: Illegal value");
761 qWarning("QPieSeries: Illegal value");
753 return false;
762 return false;
754 }
763 }
755
764
756 if (!qFuzzyIsNull(value - roundedValue)) {
765 if (!qFuzzyIsNull(value - roundedValue)) {
757 value = roundedValue;
766 value = roundedValue;
758 return true;
767 return true;
759 }
768 }
760
769
761 // The change was so small it is considered a rounding error
770 // The change was so small it is considered a rounding error
762 return false;
771 return false;
763 }
772 }
764
773
765 void QPieSeriesPrivate::scaleDomain(Domain& domain)
774 void QPieSeriesPrivate::scaleDomain(Domain& domain)
766 {
775 {
767 Q_UNUSED(domain);
776 Q_UNUSED(domain);
768 #ifndef QT_NO_DEBUG
777 #ifndef QT_NO_DEBUG
769 qWarning() << __FILE__<<__FUNCTION__<<"not implemented";
778 qWarning() << __FILE__<<__FUNCTION__<<"not implemented";
770 #endif
779 #endif
771 }
780 }
772
781
773 Chart* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
782 Chart* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
774 {
783 {
775 Q_Q(QPieSeries);
784 Q_Q(QPieSeries);
776 PieChartItem* pie = new PieChartItem(q,presenter);
785 PieChartItem* pie = new PieChartItem(q,presenter);
777 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
786 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
778 presenter->animator()->addAnimation(pie);
787 presenter->animator()->addAnimation(pie);
779 }
788 }
780 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
789 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
781 return pie;
790 return pie;
782 }
791 }
783
792
784 QList<LegendMarker*> QPieSeriesPrivate::createLegendMarker(QLegend* legend)
793 QList<LegendMarker*> QPieSeriesPrivate::createLegendMarker(QLegend* legend)
785 {
794 {
786 Q_Q(QPieSeries);
795 Q_Q(QPieSeries);
787 QList<LegendMarker*> markers;
796 QList<LegendMarker*> markers;
788 foreach(QPieSlice* slice, q->slices()) {
797 foreach(QPieSlice* slice, q->slices()) {
789 PieLegendMarker* marker = new PieLegendMarker(q,slice,legend);
798 PieLegendMarker* marker = new PieLegendMarker(q,slice,legend);
790 markers << marker;
799 markers << marker;
791 }
800 }
792 return markers;
801 return markers;
793 }
802 }
794
803
795 #include "moc_qpieseries.cpp"
804 #include "moc_qpieseries.cpp"
796 #include "moc_qpieseries_p.cpp"
805 #include "moc_qpieseries_p.cpp"
797
806
798 QTCOMMERCIALCHART_END_NAMESPACE
807 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -1,91 +1,90
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 #ifndef QPIESERIES_P_H
21 #ifndef QPIESERIES_P_H
22 #define QPIESERIES_P_H
22 #define QPIESERIES_P_H
23
23
24 #include "qpieseries.h"
24 #include "qpieseries.h"
25 #include "qabstractseries_p.h"
25 #include "qabstractseries_p.h"
26
26
27 class QModelIndex;
27 class QModelIndex;
28
28
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30 class QLegendPrivate;
30 class QLegendPrivate;
31 class QPieModelMapper;
31 class QPieModelMapper;
32
32
33 class QPieSeriesPrivate : public QAbstractSeriesPrivate
33 class QPieSeriesPrivate : public QAbstractSeriesPrivate
34 {
34 {
35 Q_OBJECT
35 Q_OBJECT
36
36
37 public:
37 public:
38 QPieSeriesPrivate(QPieSeries *parent);
38 QPieSeriesPrivate(QPieSeries *parent);
39 ~QPieSeriesPrivate();
39 ~QPieSeriesPrivate();
40
40
41 void scaleDomain(Domain& domain);
41 void scaleDomain(Domain& domain);
42 Chart* createGraphics(ChartPresenter *presenter);
42 Chart* createGraphics(ChartPresenter *presenter);
43 QList<LegendMarker*> createLegendMarker(QLegend *legend);
43 QList<LegendMarker*> createLegendMarker(QLegend *legend);
44
44
45 void updateDerivativeData();
45 void updateDerivativeData();
46
46
47 static QPieSeriesPrivate* seriesData(QPieSeries &series);
47 static QPieSeriesPrivate* seriesData(QPieSeries &series);
48
48
49 Q_SIGNALS:
49 Q_SIGNALS:
50 void added(QList<QPieSlice*> slices);
50 void added(QList<QPieSlice*> slices);
51 void removed(QList<QPieSlice*> slices);
51 void removed(QList<QPieSlice*> slices);
52 void piePositionChanged();
52 void piePositionChanged();
53 void pieSizeChanged();
53 void pieSizeChanged();
54
54
55 public Q_SLOTS:
55 public Q_SLOTS:
56 void sliceChanged();
56 void sliceChanged();
57 void sliceClicked();
57 void sliceClicked();
58 void sliceHovered(bool state);
58 void sliceHovered(bool state);
59 void initializePieFromModel();
59 void initializePieFromModel();
60 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
60 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
61 void modelRowsAdded(QModelIndex parent, int start, int end);
61 void modelRowsAdded(QModelIndex parent, int start, int end);
62 void modelRowsRemoved(QModelIndex parent, int start, int end);
62 void modelRowsRemoved(QModelIndex parent, int start, int end);
63 void modelColumnsAdded(QModelIndex parent, int start, int end);
63 void modelColumnsAdded(QModelIndex parent, int start, int end);
64 void modelColumnsRemoved(QModelIndex parent, int start, int end);
64 void modelColumnsRemoved(QModelIndex parent, int start, int end);
65 bool setRealValue(qreal &value, qreal newValue, qreal max, qreal min = 0.0);
65 bool setRealValue(qreal &value, qreal newValue, qreal max, qreal min = 0.0);
66
66
67 private:
67 private:
68 void setMapping();
69 void insertData(int start, int end);
68 void insertData(int start, int end);
70 void removeData(int start, int end);
69 void removeData(int start, int end);
71
70
72 public:
71 public:
73 QList<QPieSlice*> m_slices;
72 QList<QPieSlice*> m_slices;
74 qreal m_pieRelativeHorPos;
73 qreal m_pieRelativeHorPos;
75 qreal m_pieRelativeVerPos;
74 qreal m_pieRelativeVerPos;
76 qreal m_pieRelativeSize;
75 qreal m_pieRelativeSize;
77 qreal m_pieStartAngle;
76 qreal m_pieStartAngle;
78 qreal m_pieEndAngle;
77 qreal m_pieEndAngle;
79 qreal m_sum;
78 qreal m_sum;
80
79
81 // model map
80 // model map
82 QPieModelMapper *m_mapper;
81 QPieModelMapper *m_mapper;
83
82
84 private:
83 private:
85 friend class QLegendPrivate;
84 friend class QLegendPrivate;
86 Q_DECLARE_PUBLIC(QPieSeries)
85 Q_DECLARE_PUBLIC(QPieSeries)
87 };
86 };
88
87
89 QTCOMMERCIALCHART_END_NAMESPACE
88 QTCOMMERCIALCHART_END_NAMESPACE
90
89
91 #endif // QPIESERIES_P_H
90 #endif // QPIESERIES_P_H
Show file before | Show file after | Hide comments
@@ -1,518 +1,524
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 "qxyseries.h"
21 #include "qxyseries.h"
22 #include "qxyseries_p.h"
22 #include "qxyseries_p.h"
23 #include "domain_p.h"
23 #include "domain_p.h"
24 #include "legendmarker_p.h"
24 #include "legendmarker_p.h"
25 #include <QAbstractItemModel>
25 #include <QAbstractItemModel>
26 #include "qxymodelmapper.h"
26 #include "qxymodelmapper.h"
27
27
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29
29
30 /*!
30 /*!
31 \class QXYSeries
31 \class QXYSeries
32 \brief The QXYSeries class is a base class for line, spline and scatter series.
32 \brief The QXYSeries class is a base class for line, spline and scatter series.
33 */
33 */
34
34
35 /*!
35 /*!
36 \fn QPen QXYSeries::pen() const
36 \fn QPen QXYSeries::pen() const
37 \brief Returns pen used to draw points for series.
37 \brief Returns pen used to draw points for series.
38 \sa setPen()
38 \sa setPen()
39 */
39 */
40
40
41 /*!
41 /*!
42 \fn QBrush QXYSeries::brush() const
42 \fn QBrush QXYSeries::brush() const
43 \brief Returns brush used to draw points for series.
43 \brief Returns brush used to draw points for series.
44 \sa setBrush()
44 \sa setBrush()
45 */
45 */
46
46
47 /*!
47 /*!
48 \fn void QXYSeries::clicked(const QPointF& point)
48 \fn void QXYSeries::clicked(const QPointF& point)
49 \brief Signal is emitted when user clicks the \a point on chart.
49 \brief Signal is emitted when user clicks the \a point on chart.
50 */
50 */
51
51
52
52
53 /*!
53 /*!
54 \fn void QXYSeriesPrivate::pointReplaced(int index)
54 \fn void QXYSeriesPrivate::pointReplaced(int index)
55 \brief \internal \a index
55 \brief \internal \a index
56 */
56 */
57
57
58 /*!
58 /*!
59 \fn void QXYSeriesPrivate::pointAdded(int index)
59 \fn void QXYSeriesPrivate::pointAdded(int index)
60 \brief \internal \a index
60 \brief \internal \a index
61 */
61 */
62
62
63 /*!
63 /*!
64 \fn void QXYSeriesPrivate::pointRemoved(int index)
64 \fn void QXYSeriesPrivate::pointRemoved(int index)
65 \brief \internal \a index
65 \brief \internal \a index
66 */
66 */
67
67
68 /*!
68 /*!
69 \fn void QXYSeriesPrivate::updated()
69 \fn void QXYSeriesPrivate::updated()
70 \brief \internal
70 \brief \internal
71 */
71 */
72
72
73 /*!
73 /*!
74 \internal
74 \internal
75
75
76 Constructs empty series object which is a child of \a parent.
76 Constructs empty series object which is a child of \a parent.
77 When series object is added to QChartView or QChart instance ownerships is transferred.
77 When series object is added to QChartView or QChart instance ownerships is transferred.
78 */
78 */
79 QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent) : QAbstractSeries(d, parent)
79 QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent) : QAbstractSeries(d, parent)
80 {
80 {
81
81
82 }
82 }
83 /*!
83 /*!
84 Destroys the object. Series added to QChartView or QChart instances are owned by those,
84 Destroys the object. Series added to QChartView or QChart instances are owned by those,
85 and are deleted when mentioned object are destroyed.
85 and are deleted when mentioned object are destroyed.
86 */
86 */
87 QXYSeries::~QXYSeries()
87 QXYSeries::~QXYSeries()
88 {
88 {
89 }
89 }
90
90
91 /*!
91 /*!
92 Adds data point \a x \a y to the series. Points are connected with lines on the chart.
92 Adds data point \a x \a y to the series. Points are connected with lines on the chart.
93 */
93 */
94 void QXYSeries::append(qreal x,qreal y)
94 void QXYSeries::append(qreal x,qreal y)
95 {
95 {
96 append(QPointF(x,y));
96 append(QPointF(x,y));
97 }
97 }
98
98
99 /*!
99 /*!
100 This is an overloaded function.
100 This is an overloaded function.
101 Adds data \a point to the series. Points are connected with lines on the chart.
101 Adds data \a point to the series. Points are connected with lines on the chart.
102 */
102 */
103 void QXYSeries::append(const QPointF &point)
103 void QXYSeries::append(const QPointF &point)
104 {
104 {
105 Q_D(QXYSeries);
105 Q_D(QXYSeries);
106 d->m_points<<point;
106 d->m_points<<point;
107 emit d->pointAdded(d->m_points.count()-1);
107 emit d->pointAdded(d->m_points.count()-1);
108 }
108 }
109
109
110 /*!
110 /*!
111 This is an overloaded function.
111 This is an overloaded function.
112 Adds list of data \a points to the series. Points are connected with lines on the chart.
112 Adds list of data \a points to the series. Points are connected with lines on the chart.
113 */
113 */
114 void QXYSeries::append(const QList<QPointF> &points)
114 void QXYSeries::append(const QList<QPointF> &points)
115 {
115 {
116 foreach(const QPointF& point , points) {
116 foreach(const QPointF& point , points) {
117 append(point);
117 append(point);
118 }
118 }
119 }
119 }
120
120
121
121
122 void QXYSeries::replace(qreal oldX,qreal oldY,qreal newX,qreal newY)
122 void QXYSeries::replace(qreal oldX,qreal oldY,qreal newX,qreal newY)
123 {
123 {
124 replace(QPointF(oldX,oldY),QPointF(newX,newY));
124 replace(QPointF(oldX,oldY),QPointF(newX,newY));
125 }
125 }
126
126
127 void QXYSeries::replace(const QPointF &oldPoint,const QPointF &newPoint)
127 void QXYSeries::replace(const QPointF &oldPoint,const QPointF &newPoint)
128 {
128 {
129 Q_D(QXYSeries);
129 Q_D(QXYSeries);
130 int index = d->m_points.indexOf(oldPoint);
130 int index = d->m_points.indexOf(oldPoint);
131 if(index==-1) return;
131 if(index==-1) return;
132 d->m_points[index] = newPoint;
132 d->m_points[index] = newPoint;
133 emit d->pointReplaced(index);
133 emit d->pointReplaced(index);
134 }
134 }
135
135
136 /*!
136 /*!
137 Removes current \a x and \a y value.
137 Removes current \a x and \a y value.
138 */
138 */
139 void QXYSeries::remove(qreal x,qreal y)
139 void QXYSeries::remove(qreal x,qreal y)
140 {
140 {
141 remove(QPointF(x,y));
141 remove(QPointF(x,y));
142 }
142 }
143
143
144 /*!
144 /*!
145 Removes current \a point x value. Note \a point y value is ignored.
145 Removes current \a point x value. Note \a point y value is ignored.
146 */
146 */
147 void QXYSeries::remove(const QPointF &point)
147 void QXYSeries::remove(const QPointF &point)
148 {
148 {
149 Q_D(QXYSeries);
149 Q_D(QXYSeries);
150 int index = d->m_points.indexOf(point);
150 int index = d->m_points.indexOf(point);
151 if(index==-1) return;
151 if(index==-1) return;
152 d->m_points.remove(index);
152 d->m_points.remove(index);
153 emit d->pointRemoved(index);
153 emit d->pointRemoved(index);
154 }
154 }
155
155
156 /*!
156 /*!
157 Removes all data points from the series.
157 Removes all data points from the series.
158 */
158 */
159 void QXYSeries::removeAll()
159 void QXYSeries::removeAll()
160 {
160 {
161 Q_D(QXYSeries);
161 Q_D(QXYSeries);
162 foreach(const QPointF& point, d->m_points) {
162 foreach(const QPointF& point, d->m_points) {
163 remove(point);
163 remove(point);
164 }
164 }
165 }
165 }
166
166
167 /*!
167 /*!
168 \internal \a pos
168 \internal \a pos
169 */
169 */
170 QList<QPointF> QXYSeries::points() const
170 QList<QPointF> QXYSeries::points() const
171 {
171 {
172 // Q_ASSERT(false);
172 // Q_ASSERT(false);
173 Q_D(const QXYSeries);
173 Q_D(const QXYSeries);
174 if (d->m_model && d->m_mapper) {
174 if (d->m_model && d->m_mapper) {
175 QList<QPointF> result;
175 QList<QPointF> result;
176 if (d->m_mapper->orientation() == Qt::Vertical){
176 if (d->m_mapper->orientation() == Qt::Vertical){
177 // consecutive data is read from model's column
177 // consecutive data is read from model's column
178 if (d->m_mapper->mapX() >= d->m_model->columnCount() || d->m_mapper->mapY() >= d->m_model->columnCount())
178 if (d->m_mapper->mapX() >= d->m_model->columnCount() || d->m_mapper->mapY() >= d->m_model->columnCount())
179 return result; // mapped columns are not existing
179 return result; // mapped columns are not existing
180
180
181 for(int i = d->m_mapper->first(); i< d->m_mapper->first() + count(); ++i) {
181 for(int i = d->m_mapper->first(); i< d->m_mapper->first() + count(); ++i) {
182 qreal x = d->m_model->data(d->m_model->index(i, d->m_mapper->mapX()), Qt::DisplayRole).toReal();
182 qreal x = d->m_model->data(d->m_model->index(i, d->m_mapper->mapX()), Qt::DisplayRole).toReal();
183 qreal y = d->m_model->data(d->m_model->index(i, d->m_mapper->mapY()), Qt::DisplayRole).toReal();
183 qreal y = d->m_model->data(d->m_model->index(i, d->m_mapper->mapY()), Qt::DisplayRole).toReal();
184 result << QPointF(x,y);
184 result << QPointF(x,y);
185 }
185 }
186 return result;
186 return result;
187 }
187 }
188 else{
188 else{
189 // consecutive data is read from model's row
189 // consecutive data is read from model's row
190 if (d->m_mapper->mapX() >= d->m_model->rowCount() || d->m_mapper->mapY() >= d->m_model->rowCount())
190 if (d->m_mapper->mapX() >= d->m_model->rowCount() || d->m_mapper->mapY() >= d->m_model->rowCount())
191 return result; // mapped rows are not existing
191 return result; // mapped rows are not existing
192
192
193 for(int i = d->m_mapper->first(); i< d->m_mapper->first() + count(); ++i) {
193 for(int i = d->m_mapper->first(); i< d->m_mapper->first() + count(); ++i) {
194 qreal x = d->m_model->data(d->m_model->index(d->m_mapper->mapX(), i), Qt::DisplayRole).toReal();
194 qreal x = d->m_model->data(d->m_model->index(d->m_mapper->mapX(), i), Qt::DisplayRole).toReal();
195 qreal y = d->m_model->data(d->m_model->index(d->m_mapper->mapY(), i), Qt::DisplayRole).toReal();
195 qreal y = d->m_model->data(d->m_model->index(d->m_mapper->mapY(), i), Qt::DisplayRole).toReal();
196 result << QPointF(x,y);
196 result << QPointF(x,y);
197 }
197 }
198 return result;
198 return result;
199 }
199 }
200 } else {
200 } else {
201 // model is not specified, return the data from series' internal data store
201 // model is not specified, return the data from series' internal data store
202 return d->m_points.toList();
202 return d->m_points.toList();
203 }
203 }
204 }
204 }
205
205
206 /*!
206 /*!
207 Returns number of data points within series.
207 Returns number of data points within series.
208 */
208 */
209 int QXYSeries::count() const
209 int QXYSeries::count() const
210 {
210 {
211 Q_D(const QXYSeries);
211 Q_D(const QXYSeries);
212
212
213 if (d->m_model && d->m_mapper) {
213 if (d->m_model && d->m_mapper) {
214
214
215 if (d->m_mapper->orientation() == Qt::Vertical) {
215 if (d->m_mapper->orientation() == Qt::Vertical) {
216 // data is in a column. Return the number of mapped items if the model's column have enough items
216 // data is in a column. Return the number of mapped items if the model's column have enough items
217 // or the number of items that can be mapped
217 // or the number of items that can be mapped
218 if (d->m_mapper->mapX() >= d->m_model->columnCount() || d->m_mapper->mapY() >= d->m_model->columnCount())
218 if (d->m_mapper->mapX() >= d->m_model->columnCount() || d->m_mapper->mapY() >= d->m_model->columnCount())
219 return 0; // mapped columns are not existing
219 return 0; // mapped columns are not existing
220 else if (d->m_mapper->count() != -1)
220 else if (d->m_mapper->count() != -1)
221 return qMin(d->m_mapper->count(), qMax(d->m_model->rowCount() - d->m_mapper->first(), 0));
221 return qMin(d->m_mapper->count(), qMax(d->m_model->rowCount() - d->m_mapper->first(), 0));
222 else
222 else
223 return qMax(d->m_model->rowCount() - d->m_mapper->first(), 0);
223 return qMax(d->m_model->rowCount() - d->m_mapper->first(), 0);
224 } else {
224 } else {
225 // data is in a row. Return the number of mapped items if the model's row have enough items
225 // data is in a row. Return the number of mapped items if the model's row have enough items
226 // or the number of items that can be mapped
226 // or the number of items that can be mapped
227 if (d->m_mapper->mapX() >= d->m_model->rowCount() || d->m_mapper->mapY() >= d->m_model->rowCount())
227 if (d->m_mapper->mapX() >= d->m_model->rowCount() || d->m_mapper->mapY() >= d->m_model->rowCount())
228 return 0; // mapped rows are not existing
228 return 0; // mapped rows are not existing
229 else if (d->m_mapper->count() != -1)
229 else if (d->m_mapper->count() != -1)
230 return qMin(d->m_mapper->count(), qMax(d->m_model->columnCount() - d->m_mapper->first(), 0));
230 return qMin(d->m_mapper->count(), qMax(d->m_model->columnCount() - d->m_mapper->first(), 0));
231 else
231 else
232 return qMax(d->m_model->columnCount() - d->m_mapper->first(), 0);
232 return qMax(d->m_model->columnCount() - d->m_mapper->first(), 0);
233 }
233 }
234 }
234 }
235
235
236 // model is not specified, return the number of points in the series internal data store
236 // model is not specified, return the number of points in the series internal data store
237 return d->m_points.count();
237 return d->m_points.count();
238 }
238 }
239
239
240
240
241 /*!
241 /*!
242 Sets \a pen used for drawing points on the chart. If the pen is not defined, the
242 Sets \a pen used for drawing points on the chart. If the pen is not defined, the
243 pen from chart theme is used.
243 pen from chart theme is used.
244 \sa QChart::setTheme()
244 \sa QChart::setTheme()
245 */
245 */
246 void QXYSeries::setPen(const QPen &pen)
246 void QXYSeries::setPen(const QPen &pen)
247 {
247 {
248 Q_D(QXYSeries);
248 Q_D(QXYSeries);
249 if (d->m_pen!=pen) {
249 if (d->m_pen!=pen) {
250 d->m_pen = pen;
250 d->m_pen = pen;
251 emit d->updated();
251 emit d->updated();
252 }
252 }
253 }
253 }
254
254
255 QPen QXYSeries::pen() const
255 QPen QXYSeries::pen() const
256 {
256 {
257 Q_D(const QXYSeries);
257 Q_D(const QXYSeries);
258 return d->m_pen;
258 return d->m_pen;
259 }
259 }
260
260
261 /*!
261 /*!
262 Sets \a brush used for drawing points on the chart. If the brush is not defined, brush
262 Sets \a brush used for drawing points on the chart. If the brush is not defined, brush
263 from chart theme setting is used.
263 from chart theme setting is used.
264 \sa QChart::setTheme()
264 \sa QChart::setTheme()
265 */
265 */
266 void QXYSeries::setBrush(const QBrush &brush)
266 void QXYSeries::setBrush(const QBrush &brush)
267 {
267 {
268 Q_D(QXYSeries);
268 Q_D(QXYSeries);
269 if (d->m_brush!=brush) {
269 if (d->m_brush!=brush) {
270 d->m_brush = brush;
270 d->m_brush = brush;
271 emit d->updated();
271 emit d->updated();
272 }
272 }
273 }
273 }
274
274
275 QBrush QXYSeries::brush() const
275 QBrush QXYSeries::brush() const
276 {
276 {
277 Q_D(const QXYSeries);
277 Q_D(const QXYSeries);
278 return d->m_brush;
278 return d->m_brush;
279 }
279 }
280
280
281
281
282 /*!
282 /*!
283 Sets if data points are \a visible and should be drawn on line.
283 Sets if data points are \a visible and should be drawn on line.
284 */
284 */
285 void QXYSeries::setPointsVisible(bool visible)
285 void QXYSeries::setPointsVisible(bool visible)
286 {
286 {
287 Q_D(QXYSeries);
287 Q_D(QXYSeries);
288 if (d->m_pointsVisible != visible){
288 if (d->m_pointsVisible != visible){
289 d->m_pointsVisible = visible;
289 d->m_pointsVisible = visible;
290 emit d->updated();
290 emit d->updated();
291 }
291 }
292 }
292 }
293
293
294 /*!
294 /*!
295 Returns true if drawing the data points of the series is enabled.
295 Returns true if drawing the data points of the series is enabled.
296 */
296 */
297 bool QXYSeries::pointsVisible() const
297 bool QXYSeries::pointsVisible() const
298 {
298 {
299 Q_D(const QXYSeries);
299 Q_D(const QXYSeries);
300 return d->m_pointsVisible;
300 return d->m_pointsVisible;
301 }
301 }
302
302
303
303
304 /*!
304 /*!
305 Stream operator for adding a data \a point to the series.
305 Stream operator for adding a data \a point to the series.
306 \sa append()
306 \sa append()
307 */
307 */
308 QXYSeries& QXYSeries::operator<< (const QPointF &point)
308 QXYSeries& QXYSeries::operator<< (const QPointF &point)
309 {
309 {
310 append(point);
310 append(point);
311 return *this;
311 return *this;
312 }
312 }
313
313
314
314
315 /*!
315 /*!
316 Stream operator for adding a list of \a points to the series.
316 Stream operator for adding a list of \a points to the series.
317 \sa append()
317 \sa append()
318 */
318 */
319
319
320 QXYSeries& QXYSeries::operator<< (const QList<QPointF>& points)
320 QXYSeries& QXYSeries::operator<< (const QList<QPointF>& points)
321 {
321 {
322 append(points);
322 append(points);
323 return *this;
323 return *this;
324 }
324 }
325
325
326 /*!
326 /*!
327 \fn bool QXYSeries::setModel(QAbstractItemModel *model)
327 \fn bool QXYSeries::setModel(QAbstractItemModel *model)
328 Sets the \a model to be used as a data source
328 Sets the \a model to be used as a data source
329 \sa setModelMapping()
329 \sa setModelMapping()
330 */
330 */
331 void QXYSeries::setModel(QAbstractItemModel *model)
331 void QXYSeries::setModel(QAbstractItemModel *model)
332 {
332 {
333 Q_D(QXYSeries);
333 Q_D(QXYSeries);
334 // disconnect signals from old model
334 // disconnect signals from old model
335 if (d->m_model) {
335 if (d->m_model) {
336 QObject::disconnect(d->m_model, 0, this, 0);
336 QObject::disconnect(d->m_model, 0, this, 0);
337 }
337 }
338
338
339 // set new model
339 // set new model
340 if (model) {
340 if (model) {
341 d->m_model = model;
341 d->m_model = model;
342 if (d->m_mapper)
342 emit d->reinitialized();
343 d->setMapping();
343
344 // connect signals from the model
345 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
346 connect(d->m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
347 connect(d->m_model,SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
348 connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
349 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
344 } else {
350 } else {
345 d->m_model = 0;
351 d->m_model = 0;
346 }
352 }
347 }
353 }
348
354
349 void QXYSeries::setModelMapper(QXYModelMapper *mapper)
355 void QXYSeries::setModelMapper(QXYModelMapper *mapper)
350 {
356 {
351 Q_D(QXYSeries);
357 Q_D(QXYSeries);
352 // disconnect signals from old mapper
358 // disconnect signals from old mapper
353 if (d->m_mapper) {
359 if (d->m_mapper) {
354 QObject::disconnect(d->m_mapper, 0, this, 0);
360 QObject::disconnect(d->m_mapper, 0, this, 0);
355 }
361 }
356
362
357 if (mapper) {
363 if (mapper) {
358 d->m_mapper = mapper;
364 d->m_mapper = mapper;
359 if (d->m_model)
365 emit d->reinitialized();
360 d->setMapping();
366
367 // connect the signal from the mapper
368 connect(d->m_mapper, SIGNAL(updated()), d, SLOT(mappingUpdated()));
361 } else {
369 } else {
362 d->m_mapper = 0;
370 d->m_mapper = 0;
363 }
371 }
364 }
372 }
365
373
366 QXYModelMapper* QXYSeries::modelMapper() const
374 QXYModelMapper* QXYSeries::modelMapper() const
367 {
375 {
368 Q_D(const QXYSeries);
376 Q_D(const QXYSeries);
369 return d->m_mapper;
377 return d->m_mapper;
370 }
378 }
371
379
372 /*!
380 /*!
373 Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
381 Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
374 as a data source for y coordinate. The \a orientation parameter specifies whether the data
382 as a data source for y coordinate. The \a orientation parameter specifies whether the data
375 is in columns or in rows.
383 is in columns or in rows.
376 \sa setModel()
384 \sa setModel()
377 */
385 */
378
386
379
387
380 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
388 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
381
389
382
390
383 QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) : QAbstractSeriesPrivate(q),
391 QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) : QAbstractSeriesPrivate(q),
384 m_mapper(0),
392 m_mapper(0),
385 m_pointsVisible(false)
393 m_pointsVisible(false)
386 {
394 {
387 }
395 }
388
396
389 void QXYSeriesPrivate::scaleDomain(Domain& domain)
397 void QXYSeriesPrivate::scaleDomain(Domain& domain)
390 {
398 {
391 qreal minX(domain.minX());
399 qreal minX(domain.minX());
392 qreal minY(domain.minY());
400 qreal minY(domain.minY());
393 qreal maxX(domain.maxX());
401 qreal maxX(domain.maxX());
394 qreal maxY(domain.maxY());
402 qreal maxY(domain.maxY());
395 int tickXCount(domain.tickXCount());
403 int tickXCount(domain.tickXCount());
396 int tickYCount(domain.tickYCount());
404 int tickYCount(domain.tickYCount());
397
405
398 Q_Q(QXYSeries);
406 Q_Q(QXYSeries);
399
407
400 const QList<QPointF>& points = q->points();
408 const QList<QPointF>& points = q->points();
401
409
402 // if(points.isEmpty()){
410 // if(points.isEmpty()){
403 // minX=0.0;
411 // minX=0.0;
404 // minY=0.0;
412 // minY=0.0;
405 // maxX=1.0;
413 // maxX=1.0;
406 // maxY=1.0;
414 // maxY=1.0;
407 // }
415 // }
408
416
409 // for (int i = 0; i < points.count(); i++)
417 // for (int i = 0; i < points.count(); i++)
410 // {
418 // {
411 // qreal x = points[i].x();
419 // qreal x = points[i].x();
412 // qreal y = points[i].y();
420 // qreal y = points[i].y();
413 // minX = qMin(minX, x);
421 // minX = qMin(minX, x);
414 // minY = qMin(minY, y);
422 // minY = qMin(minY, y);
415 // maxX = qMax(maxX, x);
423 // maxX = qMax(maxX, x);
416 // maxY = qMax(maxY, y);
424 // maxY = qMax(maxY, y);
417 // }
425 // }
418
426
419 // domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
427 // domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
420
428
421 if (!points.isEmpty()) {
429 if (!points.isEmpty()) {
422 for (int i = 0; i < points.count(); i++) {
430 for (int i = 0; i < points.count(); i++) {
423 qreal x = points[i].x();
431 qreal x = points[i].x();
424 qreal y = points[i].y();
432 qreal y = points[i].y();
425 minX = qMin(minX, x);
433 minX = qMin(minX, x);
426 minY = qMin(minY, y);
434 minY = qMin(minY, y);
427 maxX = qMax(maxX, x);
435 maxX = qMax(maxX, x);
428 maxY = qMax(maxY, y);
436 maxY = qMax(maxY, y);
429 }
437 }
430 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
438 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
431 }
439 }
432 }
440 }
433
441
434 QList<LegendMarker*> QXYSeriesPrivate::createLegendMarker(QLegend* legend)
442 QList<LegendMarker*> QXYSeriesPrivate::createLegendMarker(QLegend* legend)
435 {
443 {
436 Q_Q(QXYSeries);
444 Q_Q(QXYSeries);
437 QList<LegendMarker*> list;
445 QList<LegendMarker*> list;
438 return list << new XYLegendMarker(q,legend);
446 return list << new XYLegendMarker(q,legend);
439 }
447 }
440
448
441 void QXYSeriesPrivate::setMapping()
442 {
443 // connect signals from the model
444 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
445 connect(m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelRowsAdded(QModelIndex,int,int)));
446 connect(m_model,SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelRowsRemoved(QModelIndex,int,int)));
447 connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelColumnsAdded(QModelIndex,int,int)));
448 connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
449
450 // connect the signal from the mapper
451 connect(m_mapper, SIGNAL(updated()), this, SLOT(mappingUpdated()));
452 }
453
454 void QXYSeriesPrivate::mappingUpdated()
449 void QXYSeriesPrivate::mappingUpdated()
455 {
450 {
456 emit reinitialized();
451 if (m_model)
452 emit reinitialized();
457 }
453 }
458
454
459 void QXYSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
455 void QXYSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
460 {
456 {
461 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
457 if (m_mapper) {
462 for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
458 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
463 if (m_mapper->orientation() == Qt::Vertical) {
459 for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
464 if ((column == m_mapper->mapX() || column == m_mapper->mapY()) // modified item is in a mapped column
460 if (m_mapper->orientation() == Qt::Vertical) {
465 && row >= m_mapper->first() // modfied item in not before first item
461 if ((column == m_mapper->mapX() || column == m_mapper->mapY()) // modified item is in a mapped column
466 && (m_mapper->count() == -1 || row < m_mapper->first() + m_mapper->count())) // map is not limited or item lays before the end of map
462 && row >= m_mapper->first() // modfied item in not before first item
467 emit pointReplaced(row - m_mapper->first());
463 && (m_mapper->count() == -1 || row < m_mapper->first() + m_mapper->count())) // map is not limited or item lays before the end of map
468 } else {
464 emit pointReplaced(row - m_mapper->first());
469 if ((row == m_mapper->mapX() || row == m_mapper->mapY()) // modified item is in a mapped row
465 } else {
470 && column >= m_mapper->first() // modfied item in not before first item
466 if ((row == m_mapper->mapX() || row == m_mapper->mapY()) // modified item is in a mapped row
471 && (m_mapper->count() == -1 || column < m_mapper->first() + m_mapper->count())) // map is not limited or item lays before the end of map
467 && column >= m_mapper->first() // modfied item in not before first item
472 emit pointReplaced(column - m_mapper->first());
468 && (m_mapper->count() == -1 || column < m_mapper->first() + m_mapper->count())) // map is not limited or item lays before the end of map
469 emit pointReplaced(column - m_mapper->first());
470 }
473 }
471 }
474 }
472 }
475 }
473 }
476 }
474 }
477
475
478
476
479 void QXYSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
477 void QXYSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
480 {
478 {
481 Q_UNUSED(parent);
479 Q_UNUSED(parent);
482 if (m_mapper->orientation() == Qt::Vertical)
480 if (m_mapper) {
483 emit pointsAdded(start, end);
481 if (m_mapper->orientation() == Qt::Vertical)
484 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
482 emit pointsAdded(start, end);
485 emit reinitialized();
483 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
484 emit reinitialized();
485 }
486 }
486 }
487
487
488 void QXYSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
488 void QXYSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
489 {
489 {
490 Q_UNUSED(parent);
490 Q_UNUSED(parent);
491 if (m_mapper->orientation() == Qt::Vertical)
491 if (m_mapper) {
492 emit pointsRemoved(start, end);
492 if (m_mapper->orientation() == Qt::Vertical)
493 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
493 emit pointsRemoved(start, end);
494 emit reinitialized();
494 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
495 emit reinitialized();
496 }
495 }
497 }
496
498
497 void QXYSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
499 void QXYSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
498 {
500 {
499 Q_UNUSED(parent);
501 Q_UNUSED(parent);
500 if (m_mapper->orientation() == Qt::Horizontal)
502 if (m_mapper) {
501 emit pointsAdded(start, end);
503 if (m_mapper->orientation() == Qt::Horizontal)
502 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
504 emit pointsAdded(start, end);
503 emit reinitialized();
505 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
506 emit reinitialized();
507 }
504 }
508 }
505
509
506 void QXYSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
510 void QXYSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
507 {
511 {
508 Q_UNUSED(parent);
512 Q_UNUSED(parent);
509 if (m_mapper->orientation() == Qt::Horizontal)
513 if (m_mapper) {
510 emit pointsRemoved(start, end);
514 if (m_mapper->orientation() == Qt::Horizontal)
511 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
515 emit pointsRemoved(start, end);
512 emit reinitialized();
516 else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
517 emit reinitialized();
518 }
513 }
519 }
514
520
515 #include "moc_qxyseries.cpp"
521 #include "moc_qxyseries.cpp"
516 #include "moc_qxyseries_p.cpp"
522 #include "moc_qxyseries_p.cpp"
517
523
518 QTCOMMERCIALCHART_END_NAMESPACE
524 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -1,88 +1,87
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 // W A R N I N G
21 // W A R N I N G
22 // -------------
22 // -------------
23 //
23 //
24 // This file is not part of the QtCommercial Chart API. It exists purely as an
24 // This file is not part of the QtCommercial Chart API. It exists purely as an
25 // implementation detail. This header file may change from version to
25 // implementation detail. This header file may change from version to
26 // version without notice, or even be removed.
26 // version without notice, or even be removed.
27 //
27 //
28 // We mean it.
28 // We mean it.
29
29
30 #ifndef QXYSERIES_P_H
30 #ifndef QXYSERIES_P_H
31 #define QXYSERIES_P_H
31 #define QXYSERIES_P_H
32
32
33 #include "qabstractseries_p.h"
33 #include "qabstractseries_p.h"
34
34
35 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35 QTCOMMERCIALCHART_BEGIN_NAMESPACE
36
36
37 class QXYSeries;
37 class QXYSeries;
38 class QXYModelMapper;
38 class QXYModelMapper;
39
39
40 class QXYSeriesPrivate: public QAbstractSeriesPrivate
40 class QXYSeriesPrivate: public QAbstractSeriesPrivate
41 {
41 {
42 Q_OBJECT
42 Q_OBJECT
43
43
44 public:
44 public:
45 QXYSeriesPrivate(QXYSeries* q);
45 QXYSeriesPrivate(QXYSeries* q);
46
46
47 void scaleDomain(Domain& domain);
47 void scaleDomain(Domain& domain);
48 QList<LegendMarker*> createLegendMarker(QLegend* legend);
48 QList<LegendMarker*> createLegendMarker(QLegend* legend);
49
49
50 protected Q_SLOTS:
50 protected Q_SLOTS:
51 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
51 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
52 virtual void modelRowsAdded(QModelIndex parent, int start, int end);
52 virtual void modelRowsAdded(QModelIndex parent, int start, int end);
53 virtual void modelRowsRemoved(QModelIndex parent, int start, int end);
53 virtual void modelRowsRemoved(QModelIndex parent, int start, int end);
54 virtual void modelColumnsAdded(QModelIndex parent, int start, int end);
54 virtual void modelColumnsAdded(QModelIndex parent, int start, int end);
55 virtual void modelColumnsRemoved(QModelIndex parent, int start, int end);
55 virtual void modelColumnsRemoved(QModelIndex parent, int start, int end);
56 virtual void mappingUpdated();
56 virtual void mappingUpdated();
57
57
58 private:
58 private:
59 void setMapping();
60 void insertData(int start, int end);
59 void insertData(int start, int end);
61 void removeData(int start, int end);
60 void removeData(int start, int end);
62
61
63 Q_SIGNALS:
62 Q_SIGNALS:
64 void updated();
63 void updated();
65 void pointReplaced(int index);
64 void pointReplaced(int index);
66 void pointRemoved(int index);
65 void pointRemoved(int index);
67 void pointsRemoved(int start, int end);
66 void pointsRemoved(int start, int end);
68 void pointAdded(int index);
67 void pointAdded(int index);
69 void pointsAdded(int start, int end);
68 void pointsAdded(int start, int end);
70 void reinitialized();
69 void reinitialized();
71
70
72 protected:
71 protected:
73 QVector<QPointF> m_points;
72 QVector<QPointF> m_points;
74
73
75 QPen m_pen;
74 QPen m_pen;
76 QBrush m_brush;
75 QBrush m_brush;
77 QXYModelMapper* m_mapper;
76 QXYModelMapper* m_mapper;
78 bool m_pointsVisible;
77 bool m_pointsVisible;
79
78
80 private:
79 private:
81 Q_DECLARE_PUBLIC(QXYSeries);
80 Q_DECLARE_PUBLIC(QXYSeries);
82 friend class QScatterSeries;
81 friend class QScatterSeries;
83
82
84 };
83 };
85
84
86 QTCOMMERCIALCHART_END_NAMESPACE
85 QTCOMMERCIALCHART_END_NAMESPACE
87
86
88 #endif
87 #endif
General Comments 0
You need to be logged in to leave comments. Login now