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

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

Add ownerships takeover to chartaxis
Michal Klocek -
r248:ded845353666
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,334 +1,334
1 #include "chartdataset_p.h"
1 #include "chartdataset_p.h"
2 #include "qchartaxis.h"
2 #include "qchartaxis.h"
3 //series
3 //series
4 #include "qlinechartseries.h"
4 #include "qlinechartseries.h"
5 #include "qbarchartseries.h"
5 #include "qbarchartseries.h"
6 #include "qstackedbarchartseries.h"
6 #include "qstackedbarchartseries.h"
7 #include "qpercentbarchartseries.h"
7 #include "qpercentbarchartseries.h"
8 #include "qpieseries.h"
8 #include "qpieseries.h"
9 #include "qscatterseries.h"
9 #include "qscatterseries.h"
10
10
11 QTCOMMERCIALCHART_BEGIN_NAMESPACE
11 QTCOMMERCIALCHART_BEGIN_NAMESPACE
12
12
13 ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),
13 ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),
14 m_axisX(new QChartAxis(this)),
14 m_axisX(new QChartAxis(this)),
15 m_axisY(new QChartAxis(this)),
15 m_axisY(new QChartAxis(this)),
16 m_domainIndex(0),
16 m_domainIndex(0),
17 m_axisXInitialized(false)
17 m_axisXInitialized(false)
18 {
18 {
19 }
19 }
20
20
21 ChartDataSet::~ChartDataSet()
21 ChartDataSet::~ChartDataSet()
22 {
22 {
23 // TODO Auto-generated destructor stub
23 // TODO Auto-generated destructor stub
24 }
24 }
25
25
26 const Domain ChartDataSet::domain(QChartAxis *axisY) const
26 const Domain ChartDataSet::domain(QChartAxis *axisY) const
27 {
27 {
28 int i = m_domainMap.count(axisY);
28 int i = m_domainMap.count(axisY);
29 if(i == 0){
29 if(i == 0){
30 return Domain();
30 return Domain();
31 }
31 }
32 i = i - m_domainIndex -1;
32 i = i - m_domainIndex -1;
33 return m_domainMap.values(axisY).at(i);
33 return m_domainMap.values(axisY).at(i);
34 }
34 }
35
35
36 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
36 void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
37 {
37 {
38 // TODO: we should check the series not already added
38 // TODO: we should check the series not already added
39 series->setParent(this); // take ownership
40
39
41 series->setParent(this); // take ownership
40 series->setParent(this); // take ownership
42 clearDomains();
41 clearDomains();
43
42
44 if(axisY==0) axisY = m_axisY;
43 if(axisY==0) axisY = m_axisY;
44 axisY->setParent(this); // take ownership
45
45
46 QList<QChartSeries*> seriesList = m_seriesMap.values(axisY);
46 QList<QChartSeries*> seriesList = m_seriesMap.values(axisY);
47
47
48 QList<Domain> domainList = m_domainMap.values(axisY);
48 QList<Domain> domainList = m_domainMap.values(axisY);
49
49
50 Q_ASSERT(domainList.size()<=1);
50 Q_ASSERT(domainList.size()<=1);
51
51
52 Domain domain;
52 Domain domain;
53
53
54 if(domainList.size()>0) domain = domainList.at(0);
54 if(domainList.size()>0) domain = domainList.at(0);
55
55
56 switch(series->type())
56 switch(series->type())
57 {
57 {
58 case QChartSeries::SeriesTypeLine: {
58 case QChartSeries::SeriesTypeLine: {
59
59
60 QLineChartSeries* xyseries = static_cast<QLineChartSeries*>(series);
60 QLineChartSeries* xyseries = static_cast<QLineChartSeries*>(series);
61
61
62 for (int i = 0; i < xyseries->count(); i++)
62 for (int i = 0; i < xyseries->count(); i++)
63 {
63 {
64 qreal x = xyseries->x(i);
64 qreal x = xyseries->x(i);
65 qreal y = xyseries->y(i);
65 qreal y = xyseries->y(i);
66 domain.m_minX = qMin(domain.m_minX,x);
66 domain.m_minX = qMin(domain.m_minX,x);
67 domain.m_minY = qMin(domain.m_minY,y);
67 domain.m_minY = qMin(domain.m_minY,y);
68 domain.m_maxX = qMax(domain.m_maxX,x);
68 domain.m_maxX = qMax(domain.m_maxX,x);
69 domain.m_maxY = qMax(domain.m_maxY,y);
69 domain.m_maxY = qMax(domain.m_maxY,y);
70 }
70 }
71 break;
71 break;
72 }
72 }
73 case QChartSeries::SeriesTypeBar: {
73 case QChartSeries::SeriesTypeBar: {
74 qDebug() << "QChartSeries::SeriesTypeBar";
74 qDebug() << "QChartSeries::SeriesTypeBar";
75 QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
75 QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
76 qreal x = barSeries->countCategories();
76 qreal x = barSeries->countCategories();
77 qreal y = barSeries->max();
77 qreal y = barSeries->max();
78 domain.m_minX = qMin(domain.m_minX,x);
78 domain.m_minX = qMin(domain.m_minX,x);
79 domain.m_minY = qMin(domain.m_minY,y);
79 domain.m_minY = qMin(domain.m_minY,y);
80 domain.m_maxX = qMax(domain.m_maxX,x);
80 domain.m_maxX = qMax(domain.m_maxX,x);
81 domain.m_maxY = qMax(domain.m_maxY,y);
81 domain.m_maxY = qMax(domain.m_maxY,y);
82 break;
82 break;
83 }
83 }
84 case QChartSeries::SeriesTypeStackedBar: {
84 case QChartSeries::SeriesTypeStackedBar: {
85 qDebug() << "QChartSeries::SeriesTypeStackedBar";
85 qDebug() << "QChartSeries::SeriesTypeStackedBar";
86
86
87 QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
87 QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
88 qreal x = stackedBarSeries->countCategories();
88 qreal x = stackedBarSeries->countCategories();
89 qreal y = stackedBarSeries->maxCategorySum();
89 qreal y = stackedBarSeries->maxCategorySum();
90 domain.m_minX = qMin(domain.m_minX,x);
90 domain.m_minX = qMin(domain.m_minX,x);
91 domain.m_minY = qMin(domain.m_minY,y);
91 domain.m_minY = qMin(domain.m_minY,y);
92 domain.m_maxX = qMax(domain.m_maxX,x);
92 domain.m_maxX = qMax(domain.m_maxX,x);
93 domain.m_maxY = qMax(domain.m_maxY,y);
93 domain.m_maxY = qMax(domain.m_maxY,y);
94 break;
94 break;
95 }
95 }
96 case QChartSeries::SeriesTypePercentBar: {
96 case QChartSeries::SeriesTypePercentBar: {
97 qDebug() << "QChartSeries::SeriesTypePercentBar";
97 qDebug() << "QChartSeries::SeriesTypePercentBar";
98
98
99 QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
99 QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
100 qreal x = percentBarSeries->countCategories();
100 qreal x = percentBarSeries->countCategories();
101 domain.m_minX = qMin(domain.m_minX,x);
101 domain.m_minX = qMin(domain.m_minX,x);
102 domain.m_minY = 0;
102 domain.m_minY = 0;
103 domain.m_maxX = qMax(domain.m_maxX,x);
103 domain.m_maxX = qMax(domain.m_maxX,x);
104 domain.m_maxY = 100;
104 domain.m_maxY = 100;
105 break;
105 break;
106 }
106 }
107
107
108 case QChartSeries::SeriesTypePie: {
108 case QChartSeries::SeriesTypePie: {
109 QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
109 QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
110 // TODO: domain stuff
110 // TODO: domain stuff
111 break;
111 break;
112 }
112 }
113
113
114 case QChartSeries::SeriesTypeScatter: {
114 case QChartSeries::SeriesTypeScatter: {
115 QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
115 QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
116 Q_ASSERT(scatterSeries);
116 Q_ASSERT(scatterSeries);
117 foreach (QPointF point, scatterSeries->data()) {
117 foreach (QPointF point, scatterSeries->data()) {
118 domain.m_minX = qMin(domain.m_minX, point.x());
118 domain.m_minX = qMin(domain.m_minX, point.x());
119 domain.m_maxX = qMax(domain.m_maxX, point.x());
119 domain.m_maxX = qMax(domain.m_maxX, point.x());
120 domain.m_minY = qMin(domain.m_minY, point.y());
120 domain.m_minY = qMin(domain.m_minY, point.y());
121 domain.m_maxY = qMax(domain.m_maxY, point.y());
121 domain.m_maxY = qMax(domain.m_maxY, point.y());
122 }
122 }
123 break;
123 break;
124 }
124 }
125
125
126 default: {
126 default: {
127 qDebug()<<__FUNCTION__<<"type" << series->type()<<"not supported";
127 qDebug()<<__FUNCTION__<<"type" << series->type()<<"not supported";
128 return;
128 return;
129 break;
129 break;
130 }
130 }
131
131
132 }
132 }
133
133
134 if(!m_domainMap.contains(axisY))
134 if(!m_domainMap.contains(axisY))
135 {
135 {
136 emit axisAdded(axisY);
136 emit axisAdded(axisY);
137 QObject::connect(axisY,SIGNAL(minChanged(qreal)),this,SLOT(handleMinChanged(qreal)));
137 QObject::connect(axisY,SIGNAL(minChanged(qreal)),this,SLOT(handleMinChanged(qreal)));
138 QObject::connect(axisY,SIGNAL(maxChanged(qreal)),this,SLOT(handleMaxChanged(qreal)));
138 QObject::connect(axisY,SIGNAL(maxChanged(qreal)),this,SLOT(handleMaxChanged(qreal)));
139 QObject::connect(axisY,SIGNAL(ticksChanged(QChartAxis*)),this,SLOT(handleTickChanged(QChartAxis*)));
139 QObject::connect(axisY,SIGNAL(ticksChanged(QChartAxis*)),this,SLOT(handleTickChanged(QChartAxis*)));
140 }
140 }
141 m_domainMap.replace(axisY,domain);
141 m_domainMap.replace(axisY,domain);
142 m_seriesMap.insert(axisY,series);
142 m_seriesMap.insert(axisY,series);
143
143
144 if(!m_axisXInitialized)
144 if(!m_axisXInitialized)
145 {
145 {
146 emit axisAdded(axisX());
146 emit axisAdded(axisX());
147 QObject::connect(axisX(),SIGNAL(minChanged(qreal)),this,SLOT(handleMinChanged(qreal)));
147 QObject::connect(axisX(),SIGNAL(minChanged(qreal)),this,SLOT(handleMinChanged(qreal)));
148 QObject::connect(axisX(),SIGNAL(maxChanged(qreal)),this,SLOT(handleMaxChanged(qreal)));
148 QObject::connect(axisX(),SIGNAL(maxChanged(qreal)),this,SLOT(handleMaxChanged(qreal)));
149 QObject::connect(axisX(),SIGNAL(ticksChanged(QChartAxis*)),this,SLOT(handleTickChanged(QChartAxis*)));
149 QObject::connect(axisX(),SIGNAL(ticksChanged(QChartAxis*)),this,SLOT(handleTickChanged(QChartAxis*)));
150 m_axisXInitialized=true;
150 m_axisXInitialized=true;
151 }
151 }
152
152
153
153
154 emit seriesAdded(series);
154 emit seriesAdded(series);
155 QStringList ylabels = createLabels(axisY,domain.m_minY,domain.m_maxY);
155 QStringList ylabels = createLabels(axisY,domain.m_minY,domain.m_maxY);
156 QStringList xlabels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
156 QStringList xlabels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
157 emit axisLabelsChanged(axisY,ylabels);
157 emit axisLabelsChanged(axisY,ylabels);
158 emit axisLabelsChanged(axisX(),xlabels);
158 emit axisLabelsChanged(axisX(),xlabels);
159 emit seriesDomainChanged(series,domain);
159 emit seriesDomainChanged(series,domain);
160
160
161 }
161 }
162
162
163 void ChartDataSet::removeSeries(QChartSeries* series)
163 void ChartDataSet::removeSeries(QChartSeries* series)
164 {
164 {
165 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
165 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
166 foreach(QChartAxis* axis , keys) {
166 foreach(QChartAxis* axis , keys) {
167 if(m_seriesMap.contains(axis,series)){
167 if(m_seriesMap.contains(axis,series)){
168 emit seriesRemoved(series);
168 emit seriesRemoved(series);
169 m_seriesMap.remove(axis,series);
169 m_seriesMap.remove(axis,series);
170 //remove axis if no longer there
170 //remove axis if no longer there
171 if(!m_seriesMap.contains(axis) && axis != m_axisY){
171 if(!m_seriesMap.contains(axis) && axis != m_axisY){
172 emit axisRemoved(axis);
172 emit axisRemoved(axis);
173 m_domainMap.remove(axis);
173 m_domainMap.remove(axis);
174 delete axis;
174 delete axis;
175 }
175 }
176 break;
176 break;
177 }
177 }
178 }
178 }
179 }
179 }
180
180
181 bool ChartDataSet::nextDomain()
181 bool ChartDataSet::nextDomain()
182 {
182 {
183 int limit = (m_domainMap.values().size()/m_domainMap.uniqueKeys().size())-1;
183 int limit = (m_domainMap.values().size()/m_domainMap.uniqueKeys().size())-1;
184
184
185 if (m_domainIndex < limit) {
185 if (m_domainIndex < limit) {
186 m_domainIndex++;
186 m_domainIndex++;
187 setDomain(m_domainIndex);
187 setDomain(m_domainIndex);
188 return true;
188 return true;
189 }
189 }
190 else {
190 else {
191 return false;
191 return false;
192 }
192 }
193 }
193 }
194
194
195 bool ChartDataSet::previousDomain()
195 bool ChartDataSet::previousDomain()
196 {
196 {
197 if (m_domainIndex > 0) {
197 if (m_domainIndex > 0) {
198 m_domainIndex--;
198 m_domainIndex--;
199 setDomain(m_domainIndex);
199 setDomain(m_domainIndex);
200 return true;
200 return true;
201 }
201 }
202 else {
202 else {
203 return false;
203 return false;
204 }
204 }
205 }
205 }
206
206
207 void ChartDataSet::setDomain(int index)
207 void ChartDataSet::setDomain(int index)
208 {
208 {
209 QList<QChartAxis*> domainList = m_domainMap.uniqueKeys();
209 QList<QChartAxis*> domainList = m_domainMap.uniqueKeys();
210 foreach (QChartAxis* axis , domainList) {
210 foreach (QChartAxis* axis , domainList) {
211 int i = m_domainMap.count(axis) - index -1;
211 int i = m_domainMap.count(axis) - index -1;
212 Q_ASSERT(i>=0);
212 Q_ASSERT(i>=0);
213 Domain domain = m_domainMap.values(axis).at(i);
213 Domain domain = m_domainMap.values(axis).at(i);
214 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
214 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
215 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
215 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
216 foreach(QChartSeries* series, seriesList) {
216 foreach(QChartSeries* series, seriesList) {
217 emit seriesDomainChanged(series,domain);
217 emit seriesDomainChanged(series,domain);
218 }
218 }
219 emit axisLabelsChanged(axis,labels);
219 emit axisLabelsChanged(axis,labels);
220 }
220 }
221
221
222 Domain domain = m_domainMap.value(axisY());
222 Domain domain = m_domainMap.value(axisY());
223 QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
223 QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
224 emit axisLabelsChanged(axisX(),labels);
224 emit axisLabelsChanged(axisX(),labels);
225 }
225 }
226
226
227 void ChartDataSet::clearDomains(int toIndex)
227 void ChartDataSet::clearDomains(int toIndex)
228 {
228 {
229 Q_ASSERT(toIndex>=0);
229 Q_ASSERT(toIndex>=0);
230
230
231 m_domainIndex = toIndex;
231 m_domainIndex = toIndex;
232
232
233 QList<QChartAxis*> keys = m_domainMap.uniqueKeys();
233 QList<QChartAxis*> keys = m_domainMap.uniqueKeys();
234
234
235 foreach (QChartAxis* key , keys)
235 foreach (QChartAxis* key , keys)
236 {
236 {
237 QList<Domain> domains = m_domainMap.values(key);
237 QList<Domain> domains = m_domainMap.values(key);
238 m_domainMap.remove(key);
238 m_domainMap.remove(key);
239 int i = domains.size() - toIndex - 1;
239 int i = domains.size() - toIndex - 1;
240 while(i--){
240 while(i--){
241 domains.removeFirst();
241 domains.removeFirst();
242 }
242 }
243 for(int j=domains.size()-1; j>=0 ;j--)
243 for(int j=domains.size()-1; j>=0 ;j--)
244 m_domainMap.insert(key,domains.at(j));
244 m_domainMap.insert(key,domains.at(j));
245 }
245 }
246 }
246 }
247
247
248 void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport)
248 void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport)
249 {
249 {
250 Q_ASSERT(rect.isValid());
250 Q_ASSERT(rect.isValid());
251 Q_ASSERT(viewport.isValid());
251 Q_ASSERT(viewport.isValid());
252
252
253 clearDomains(m_domainIndex);
253 clearDomains(m_domainIndex);
254
254
255 QList<QChartAxis*> domainList = m_domainMap.uniqueKeys();
255 QList<QChartAxis*> domainList = m_domainMap.uniqueKeys();
256
256
257 foreach (QChartAxis* axis , domainList){
257 foreach (QChartAxis* axis , domainList){
258 Domain domain(m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height()));
258 Domain domain(m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height()));
259 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
259 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
260 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
260 QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
261 foreach(QChartSeries* series, seriesList){
261 foreach(QChartSeries* series, seriesList){
262 emit seriesDomainChanged(series,domain);
262 emit seriesDomainChanged(series,domain);
263 }
263 }
264 emit axisLabelsChanged(axis,labels);
264 emit axisLabelsChanged(axis,labels);
265 m_domainMap.insert(axis,domain);
265 m_domainMap.insert(axis,domain);
266 }
266 }
267
267
268 Domain domain = m_domainMap.value(axisY());
268 Domain domain = m_domainMap.value(axisY());
269 QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
269 QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
270 emit axisLabelsChanged(axisX(),labels);
270 emit axisLabelsChanged(axisX(),labels);
271
271
272 m_domainIndex++;
272 m_domainIndex++;
273 }
273 }
274
274
275 QChartAxis* ChartDataSet::axisY(QChartSeries* series) const
275 QChartAxis* ChartDataSet::axisY(QChartSeries* series) const
276 {
276 {
277 if(series == 0) return m_axisY;
277 if(series == 0) return m_axisY;
278
278
279 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
279 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
280
280
281 foreach(QChartAxis* axis , keys) {
281 foreach(QChartAxis* axis , keys) {
282 if(m_seriesMap.contains(axis,series)){
282 if(m_seriesMap.contains(axis,series)){
283 return axis;
283 return axis;
284 }
284 }
285 }
285 }
286 return 0;
286 return 0;
287 }
287 }
288
288
289 QStringList ChartDataSet::createLabels(QChartAxis* axis,qreal min, qreal max)
289 QStringList ChartDataSet::createLabels(QChartAxis* axis,qreal min, qreal max)
290 {
290 {
291 Q_ASSERT(max>=min);
291 Q_ASSERT(max>=min);
292
292
293 QStringList labels;
293 QStringList labels;
294
294
295 int ticks = axis->ticksCount()-1;
295 int ticks = axis->ticksCount()-1;
296
296
297 for(int i=0; i<= ticks; i++){
297 for(int i=0; i<= ticks; i++){
298 qreal value = min + (i * (max - min)/ ticks);
298 qreal value = min + (i * (max - min)/ ticks);
299 QString label = axis->axisTickLabel(value);
299 QString label = axis->axisTickLabel(value);
300 if(label.isEmpty()){
300 if(label.isEmpty()){
301 labels << QString::number(value);
301 labels << QString::number(value);
302 }else{
302 }else{
303 labels << label;
303 labels << label;
304 }
304 }
305 }
305 }
306 return labels;
306 return labels;
307 }
307 }
308
308
309
309
310 void ChartDataSet::handleMinChanged(qreal min)
310 void ChartDataSet::handleMinChanged(qreal min)
311 {
311 {
312
312
313 }
313 }
314
314
315 void ChartDataSet::handleMaxChanged(qreal max)
315 void ChartDataSet::handleMaxChanged(qreal max)
316 {
316 {
317
317
318 }
318 }
319
319
320 void ChartDataSet::handleTickChanged(QChartAxis* axis)
320 void ChartDataSet::handleTickChanged(QChartAxis* axis)
321 {
321 {
322 Domain domain = m_domainMap.value(axisY());
322 Domain domain = m_domainMap.value(axisY());
323 if(axis==axisX()){
323 if(axis==axisX()){
324 QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);
324 QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);
325 emit axisLabelsChanged(axis,labels);
325 emit axisLabelsChanged(axis,labels);
326 }else{
326 }else{
327 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
327 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
328 emit axisLabelsChanged(axis,labels);
328 emit axisLabelsChanged(axis,labels);
329 }
329 }
330 }
330 }
331
331
332 #include "moc_chartdataset_p.cpp"
332 #include "moc_chartdataset_p.cpp"
333
333
334 QTCOMMERCIALCHART_END_NAMESPACE
334 QTCOMMERCIALCHART_END_NAMESPACE
General Comments 0
You need to be logged in to leave comments. Login now