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

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

Update tst_qchart to match current axis implementation
Michal Klocek -
r1660:525c02d166a8
parent child
Show More
Side by Side Unified
Context file:
r1660:525c02d166a8 Loading diff...:
Show file before | Show file after | Hide comments
@@ -174,7 +174,6 void tst_ChartDataSet::addSeries()
174
174
175 void tst_ChartDataSet::setAxisX_data()
175 void tst_ChartDataSet::setAxisX_data()
176 {
176 {
177
178 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
177 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
179 QTest::addColumn<QList<QAbstractAxis*> >("axisList");
178 QTest::addColumn<QList<QAbstractAxis*> >("axisList");
180 QTest::addColumn<int>("axisCount");
179 QTest::addColumn<int>("axisCount");
Show file before | Show file after | Hide comments
@@ -30,11 +30,13
30 #include <qpercentbarseries.h>
30 #include <qpercentbarseries.h>
31 #include <qstackedbarseries.h>
31 #include <qstackedbarseries.h>
32 #include <qvaluesaxis.h>
32 #include <qvaluesaxis.h>
33 #include <qbarcategoriesaxis.h>
33
34
34 QTCOMMERCIALCHART_USE_NAMESPACE
35 QTCOMMERCIALCHART_USE_NAMESPACE
35
36
36 Q_DECLARE_METATYPE(QAbstractAxis *)
37 Q_DECLARE_METATYPE(QAbstractAxis *)
37 Q_DECLARE_METATYPE(QValuesAxis *)
38 Q_DECLARE_METATYPE(QValuesAxis *)
39 Q_DECLARE_METATYPE(QBarCategoriesAxis *)
38 Q_DECLARE_METATYPE(QAbstractSeries *)
40 Q_DECLARE_METATYPE(QAbstractSeries *)
39 Q_DECLARE_METATYPE(QChart::AnimationOption)
41 Q_DECLARE_METATYPE(QChart::AnimationOption)
40 Q_DECLARE_METATYPE(QBrush)
42 Q_DECLARE_METATYPE(QBrush)
@@ -54,7 +56,6 public slots:
54 private slots:
56 private slots:
55 void qchart_data();
57 void qchart_data();
56 void qchart();
58 void qchart();
57
58 void addSeries_data();
59 void addSeries_data();
59 void addSeries();
60 void addSeries();
60 void animationOptions_data();
61 void animationOptions_data();
@@ -77,8 +78,14 private slots:
77 void removeAllSeries();
78 void removeAllSeries();
78 void removeSeries_data();
79 void removeSeries_data();
79 void removeSeries();
80 void removeSeries();
80 void scroll_data();
81 void scroll_right_data();
81 void scroll();
82 void scroll_right();
83 void scroll_left_data();
84 void scroll_left();
85 void scroll_up_data();
86 void scroll_up();
87 void scroll_down_data();
88 void scroll_down();
82 void theme_data();
89 void theme_data();
83 void theme();
90 void theme();
84 void title_data();
91 void title_data();
@@ -116,6 +123,14 void tst_QChart::init()
116 m_chart = m_view->chart();
123 m_chart = m_view->chart();
117 }
124 }
118
125
126 void tst_QChart::cleanup()
127 {
128 delete m_view;
129 m_view = 0;
130 m_chart = 0;
131 }
132
133
119 void tst_QChart::createTestData()
134 void tst_QChart::createTestData()
120 {
135 {
121 QLineSeries* series0 = new QLineSeries(this);
136 QLineSeries* series0 = new QLineSeries(this);
@@ -125,13 +140,6 void tst_QChart::createTestData()
125 QTest::qWaitForWindowShown(m_view);
140 QTest::qWaitForWindowShown(m_view);
126 }
141 }
127
142
128 void tst_QChart::cleanup()
129 {
130 delete m_view;
131 m_view = 0;
132 m_chart = 0;
133 }
134
135 void tst_QChart::qchart_data()
143 void tst_QChart::qchart_data()
136 {
144 {
137 }
145 }
@@ -143,8 +151,8 void tst_QChart::qchart()
143 QVERIFY(m_chart->legend()->isVisible());
151 QVERIFY(m_chart->legend()->isVisible());
144
152
145 QCOMPARE(m_chart->animationOptions(), QChart::NoAnimation);
153 QCOMPARE(m_chart->animationOptions(), QChart::NoAnimation);
146 QVERIFY(m_chart->axisX());
154 QVERIFY(!m_chart->axisX());
147 QVERIFY(m_chart->axisY());
155 QVERIFY(!m_chart->axisY());
148 QVERIFY(m_chart->backgroundBrush()!=QBrush());
156 QVERIFY(m_chart->backgroundBrush()!=QBrush());
149 QVERIFY(m_chart->backgroundPen()!=QPen());
157 QVERIFY(m_chart->backgroundPen()!=QPen());
150 QCOMPARE(m_chart->isBackgroundVisible(), true);
158 QCOMPARE(m_chart->isBackgroundVisible(), true);
@@ -171,53 +179,46 void tst_QChart::qchart()
171 void tst_QChart::addSeries_data()
179 void tst_QChart::addSeries_data()
172 {
180 {
173 QTest::addColumn<QAbstractSeries *>("series");
181 QTest::addColumn<QAbstractSeries *>("series");
174 QTest::addColumn<QAbstractAxis *>("axis");
175
182
176 QAbstractSeries* series0 = new QLineSeries(this);
183 QAbstractSeries* line = new QLineSeries(this);
177 QAbstractSeries* series1 = new QAreaSeries(static_cast<QLineSeries*>(series0));
184 QAbstractSeries* area = new QAreaSeries(static_cast<QLineSeries*>(line));
178 QAbstractSeries* series2 = new QScatterSeries(this);
185 QAbstractSeries* scatter = new QScatterSeries(this);
179 QAbstractSeries* series3 = new QSplineSeries(this);
186 QAbstractSeries* spline = new QSplineSeries(this);
180 QAbstractSeries* series4 = new QPieSeries(this);
187 QAbstractSeries* pie = new QPieSeries(this);
181 QAbstractSeries* series5 = new QBarSeries(this);
188 QAbstractSeries* bar = new QBarSeries(this);
182 QAbstractSeries* series6 = new QPercentBarSeries(this);
189 QAbstractSeries* percent = new QPercentBarSeries(this);
183 QAbstractSeries* series7 = new QStackedBarSeries(this);
190 QAbstractSeries* stacked = new QStackedBarSeries(this);
184
191
185 QValuesAxis* axis = new QValuesAxis(this);
192 QTest::newRow("lineSeries") << line;
186
193 QTest::newRow("areaSeries") << area;
187 QTest::newRow("default axis: lineSeries") << series0 << (QAbstractAxis*) 0;
194 QTest::newRow("scatterSeries") << scatter;
188 QTest::newRow("axis0: lineSeries") << series0 << axis;
195 QTest::newRow("splineSeries") << spline;
189 QTest::newRow("default axis: areaSeries") << series1 << (QAbstractAxis*) 0;
196 QTest::newRow("pieSeries") << pie;
190 QTest::newRow("axis: areaSeries") << series1 << axis;
197 QTest::newRow("barSeries") << bar;
191 QTest::newRow("default axis: scatterSeries") << series2 << (QAbstractAxis*) 0;
198 QTest::newRow("percentBarSeries") << percent;
192 QTest::newRow("axis1: scatterSeries") << series2 << axis;
199 QTest::newRow("stackedBarSeries") << stacked;
193 QTest::newRow("default axis: splineSeries") << series3 << (QAbstractAxis*) 0;
194 QTest::newRow("axis: splineSeries") << series3 << axis;
195 QTest::newRow("default axis: pieSeries") << series4 << (QAbstractAxis*) 0;
196 QTest::newRow("axis: pieSeries") << series4 << axis;
197 QTest::newRow("default axis: barSeries") << series5 << (QAbstractAxis*) 0;
198 QTest::newRow("axis: barSeries") << series5 << axis;
199 QTest::newRow("default axis: percentBarSeries") << series6 << (QAbstractAxis*) 0;
200 QTest::newRow("axis: barSeries") << series6 << axis;
201 QTest::newRow("default axis: stackedBarSeries") << series7 << (QAbstractAxis*) 0;
202 QTest::newRow("axis: barSeries") << series7 << axis;
203
200
204 }
201 }
205
202
206 void tst_QChart::addSeries()
203 void tst_QChart::addSeries()
207 {
204 {
208 QFETCH(QAbstractSeries *, series);
205 QFETCH(QAbstractSeries *, series);
209 QFETCH(QAbstractAxis *, axis);
210 m_view->show();
206 m_view->show();
211 QTest::qWaitForWindowShown(m_view);
207 QTest::qWaitForWindowShown(m_view);
212 if(!axis) axis = m_chart->axisY();
213 QVERIFY(!series->chart());
208 QVERIFY(!series->chart());
214 QCOMPARE(m_chart->series().count(), 0);
209 QCOMPARE(m_chart->series().count(), 0);
215 m_chart->addSeries(series);
210 m_chart->addSeries(series);
216 m_chart->setAxisY(axis,series);
217 QCOMPARE(m_chart->series().count(), 1);
211 QCOMPARE(m_chart->series().count(), 1);
218 QCOMPARE(m_chart->series().first(), series);
212 QCOMPARE(m_chart->series().first(), series);
219 QVERIFY(series->chart() == m_chart);
213 QVERIFY(series->chart() == m_chart);
220 QCOMPARE(m_chart->axisY(series),axis);
214 m_chart->createDefaultAxes();
215 if(series->type()!=QAbstractSeries::SeriesTypePie){
216 QVERIFY(m_chart->axisY(series));
217 QVERIFY(m_chart->axisX(series));
218 }else{
219 QVERIFY(!m_chart->axisY(series));
220 QVERIFY(!m_chart->axisX(series));
221 }
221 m_chart->removeSeries(series);
222 m_chart->removeSeries(series);
222 QVERIFY(!series->chart());
223 QVERIFY(!series->chart());
223 QCOMPARE(m_chart->series().count(), 0);
224 QCOMPARE(m_chart->series().count(), 0);
@@ -243,59 +244,57 void tst_QChart::animationOptions()
243 void tst_QChart::axisX_data()
244 void tst_QChart::axisX_data()
244 {
245 {
245
246
247 QTest::addColumn<QAbstractAxis*>("axis");
248 QTest::addColumn<QAbstractSeries *>("series");
249
250 QTest::newRow("categories,lineSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QLineSeries(this);
251 QTest::newRow("categories,areaSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this));
252 QTest::newRow("categories,scatterSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QScatterSeries(this);
253 QTest::newRow("categories,splineSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QSplineSeries(this);
254 QTest::newRow("categories,pieSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QPieSeries(this);
255 QTest::newRow("categories,barSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QBarSeries(this);
256 QTest::newRow("categories,percentBarSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QPercentBarSeries(this);
257 QTest::newRow("categories,stackedBarSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QStackedBarSeries(this);
258
259 QTest::newRow("value,lineSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QLineSeries(this);
260 QTest::newRow("value,areaSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this));
261 QTest::newRow("value,scatterSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QScatterSeries(this);
262 QTest::newRow("value,splineSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QSplineSeries(this);
263 QTest::newRow("value,pieSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QPieSeries(this);
264 QTest::newRow("value,barSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QBarSeries(this);
265 QTest::newRow("value,percentBarSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QPercentBarSeries(this);
266 QTest::newRow("value,stackedBarSeries") << (QAbstractAxis*) new QValuesAxis() << (QAbstractSeries*) new QStackedBarSeries(this);
267
246 }
268 }
247
269
248 void tst_QChart::axisX()
270 void tst_QChart::axisX()
249 {
271 {
250 QVERIFY(m_chart->axisX());
272 QFETCH(QAbstractAxis*, axis);
251 QAbstractAxis* axis = m_chart->axisX();
273 QFETCH(QAbstractSeries*, series);
252 createTestData();
274 QVERIFY(!m_chart->axisX());
253 //it should be the same axis
275 m_view->show();
254 QCOMPARE(axis,m_chart->axisX());
276 QTest::qWaitForWindowShown(m_view);
277 m_chart->addSeries(series);
278 m_chart->setAxisX(axis,series);
279 QVERIFY(m_chart->axisX(series)==axis);
255 }
280 }
256
281
257 void tst_QChart::axisY_data()
282 void tst_QChart::axisY_data()
258 {
283 {
259 QTest::addColumn<QAbstractAxis*>("axis0");
284 axisX_data();
260 QTest::addColumn<QAbstractAxis*>("axis1");
261 QTest::addColumn<QAbstractAxis*>("axis2");
262 QTest::newRow("1 defualt, 2 optional") << (QAbstractAxis*)0 << new QValuesAxis() << new QValuesAxis();
263 QTest::newRow("3 optional") << new QValuesAxis() << new QValuesAxis() << new QValuesAxis();
264 }
285 }
265
286
266
287
267 void tst_QChart::axisY()
288 void tst_QChart::axisY()
268 {
289 {
269 QFETCH(QAbstractAxis*, axis0);
290 QFETCH(QAbstractAxis*, axis);
270 QFETCH(QAbstractAxis*, axis1);
291 QFETCH(QAbstractSeries*, series);
271 QFETCH(QAbstractAxis*, axis2);
292 QVERIFY(!m_chart->axisY());
272
293 m_view->show();
273 QAbstractAxis* defaultAxisY = m_chart->axisY();
294 QTest::qWaitForWindowShown(m_view);
274
295 m_chart->addSeries(series);
275 QVERIFY2(defaultAxisY, "Missing axisY.");
296 m_chart->setAxisY(axis,series);
276
297 QVERIFY(m_chart->axisY(series)==axis);
277 QLineSeries* series0 = new QLineSeries();
278 m_chart->addSeries(series0);
279 m_chart->setAxisY(axis0,series0);
280
281 QLineSeries* series1 = new QLineSeries();
282 m_chart->addSeries(series1);
283 m_chart->setAxisY(axis1,series1);
284
285 QLineSeries* series2 = new QLineSeries();
286 m_chart->addSeries(series2);
287 m_chart->setAxisY(axis2,series2);
288
289 if (!axis0)
290 axis0 = defaultAxisY;
291 if (!axis1)
292 axis1 = defaultAxisY;
293 if (!axis2)
294 axis2 = defaultAxisY;
295
296 QVERIFY(m_chart->axisY(series0) == axis0);
297 QVERIFY(m_chart->axisY(series1) == axis1);
298 QVERIFY(m_chart->axisY(series2) == axis2);
299 }
298 }
300
299
301 void tst_QChart::backgroundBrush_data()
300 void tst_QChart::backgroundBrush_data()
@@ -401,7 +400,6 void tst_QChart::margins()
401 {
400 {
402 createTestData();
401 createTestData();
403 QRectF rect = m_chart->geometry();
402 QRectF rect = m_chart->geometry();
404
405 QVERIFY(m_chart->margins().top()+m_chart->margins().bottom() < rect.height());
403 QVERIFY(m_chart->margins().top()+m_chart->margins().bottom() < rect.height());
406 QVERIFY(m_chart->margins().left()+m_chart->margins().right() < rect.width());
404 QVERIFY(m_chart->margins().left()+m_chart->margins().right() < rect.width());
407 }
405 }
@@ -425,7 +423,7 void tst_QChart::removeAllSeries()
425 m_chart->addSeries(series2);
423 m_chart->addSeries(series2);
426 m_view->show();
424 m_view->show();
427 QTest::qWaitForWindowShown(m_view);
425 QTest::qWaitForWindowShown(m_view);
428
426 m_chart->createDefaultAxes();
429 QVERIFY(m_chart->axisY(series0)!=0);
427 QVERIFY(m_chart->axisY(series0)!=0);
430 QVERIFY(m_chart->axisY(series1)!=0);
428 QVERIFY(m_chart->axisY(series1)!=0);
431 QVERIFY(m_chart->axisY(series2)!=0);
429 QVERIFY(m_chart->axisY(series2)!=0);
@@ -441,13 +439,13 void tst_QChart::removeAllSeries()
441
439
442 void tst_QChart::removeSeries_data()
440 void tst_QChart::removeSeries_data()
443 {
441 {
444 addSeries_data();
442 axisX_data();
445 }
443 }
446
444
447 void tst_QChart::removeSeries()
445 void tst_QChart::removeSeries()
448 {
446 {
449 QFETCH(QAbstractSeries *, series);
450 QFETCH(QAbstractAxis *, axis);
447 QFETCH(QAbstractAxis *, axis);
448 QFETCH(QAbstractSeries *, series);
451 QSignalSpy deleteSpy(series, SIGNAL(destroyed()));
449 QSignalSpy deleteSpy(series, SIGNAL(destroyed()));
452 m_view->show();
450 m_view->show();
453 QTest::qWaitForWindowShown(m_view);
451 QTest::qWaitForWindowShown(m_view);
@@ -460,18 +458,187 void tst_QChart::removeSeries()
460 QCOMPARE(deleteSpy.count(), 0);
458 QCOMPARE(deleteSpy.count(), 0);
461 }
459 }
462
460
463 void tst_QChart::scroll_data()
461 void tst_QChart::scroll_right_data()
462 {
463 QTest::addColumn<QAbstractSeries *>("series");
464
465 QLineSeries* series0 = new QLineSeries(this);
466 *series0 << QPointF(0, 0) << QPointF(100, 100);
467
468 QLineSeries* series1 = new QLineSeries(this);
469 *series1 << QPointF(0, 0) << QPointF(100, 100);
470
471 QTest::newRow("lineSeries") << (QAbstractSeries*) series0;
472
473
474 }
475
476 void tst_QChart::scroll_right()
464 {
477 {
478 QFETCH(QAbstractSeries *, series);
479 m_chart->addSeries(series);
480 m_chart->createDefaultAxes();
481 m_view->show();
482 QTest::qWaitForWindowShown(m_view);
483 QAbstractAxis * axis = m_chart->axisX();
484 QVERIFY(axis!=0);
465
485
486 switch(axis->type())
487 {
488 case QAbstractAxis::AxisTypeValues:{
489 QValuesAxis* vaxis = qobject_cast<QValuesAxis*>(axis);
490 QVERIFY(vaxis!=0);
491 qreal min = vaxis->min();
492 qreal max = vaxis->max();
493 QVERIFY(max>min);
494 m_chart->scroll(50, 0);
495 QVERIFY(min<vaxis->min());
496 QVERIFY(max<vaxis->max());
497 break;
498 }
499 case QAbstractAxis::AxisTypeCategories:{
500 QBarCategoriesAxis* caxis = qobject_cast<QBarCategoriesAxis*>(axis);
501 QVERIFY(caxis!=0);
502 qreal min = caxis->min().toDouble();
503 qreal max = caxis->max().toDouble();
504 m_chart->scroll(50, 0);
505 QVERIFY(min<caxis->min().toDouble());
506 QVERIFY(max<caxis->max().toDouble());
507 break;
508 }
509 default:
510 qFatal("Unsupported type");
511 break;
512 }
466 }
513 }
467
514
468 void tst_QChart::scroll()
515 void tst_QChart::scroll_left_data()
469 {
516 {
470 qFatal("implement me");
517 scroll_right_data();
471 createTestData();
518 }
472 //TODO qreal min = m_chart->axisY()->min();
519
473 m_chart->scroll(0,0);
520 void tst_QChart::scroll_left()
474 //TODO QVERIFY(m_chart->axisY()->min()<min);
521 {
522 QFETCH(QAbstractSeries *, series);
523 m_chart->addSeries(series);
524 m_chart->createDefaultAxes();
525 m_view->show();
526 QTest::qWaitForWindowShown(m_view);
527 QAbstractAxis * axis = m_chart->axisX();
528 QVERIFY(axis!=0);
529
530 switch(axis->type())
531 {
532 case QAbstractAxis::AxisTypeValues:{
533 QValuesAxis* vaxis = qobject_cast<QValuesAxis*>(axis);
534 QVERIFY(vaxis!=0);
535 qreal min = vaxis->min();
536 qreal max = vaxis->max();
537 m_chart->scroll(-50, 0);
538 QVERIFY(min>vaxis->min());
539 QVERIFY(max>vaxis->max());
540 break;
541 }
542 case QAbstractAxis::AxisTypeCategories:{
543 QBarCategoriesAxis* caxis = qobject_cast<QBarCategoriesAxis*>(axis);
544 QVERIFY(caxis!=0);
545 qreal min = caxis->min().toDouble();
546 qreal max = caxis->max().toDouble();
547 m_chart->scroll(-50, 0);
548 QVERIFY(min>caxis->min().toDouble());
549 QVERIFY(max>caxis->max().toDouble());
550 break;
551 }
552 default:
553 qFatal("Unsupported type");
554 break;
555 }
556 }
557
558 void tst_QChart::scroll_up_data()
559 {
560 scroll_right_data();
561 }
562
563 void tst_QChart::scroll_up()
564 {
565 QFETCH(QAbstractSeries *, series);
566 m_chart->addSeries(series);
567 m_chart->createDefaultAxes();
568 m_view->show();
569 QTest::qWaitForWindowShown(m_view);
570 QAbstractAxis * axis = m_chart->axisY();
571 QVERIFY(axis!=0);
572
573 switch(axis->type())
574 {
575 case QAbstractAxis::AxisTypeValues:{
576 QValuesAxis* vaxis = qobject_cast<QValuesAxis*>(axis);
577 QVERIFY(vaxis!=0);
578 qreal min = vaxis->min();
579 qreal max = vaxis->max();
580 m_chart->scroll(0, 50);
581 QVERIFY(min<vaxis->min());
582 QVERIFY(max<vaxis->max());
583 break;
584 }
585 case QAbstractAxis::AxisTypeCategories:{
586 QBarCategoriesAxis* caxis = qobject_cast<QBarCategoriesAxis*>(axis);
587 QVERIFY(caxis!=0);
588 qreal min = caxis->min().toDouble();
589 qreal max = caxis->max().toDouble();
590 m_chart->scroll(0, 50);
591 QVERIFY(min<caxis->min().toDouble());
592 QVERIFY(max<caxis->max().toDouble());
593 break;
594 }
595 default:
596 qFatal("Unsupported type");
597 break;
598 }
599 }
600
601 void tst_QChart::scroll_down_data()
602 {
603 scroll_right_data();
604 }
605
606 void tst_QChart::scroll_down()
607 {
608 QFETCH(QAbstractSeries *, series);
609 m_chart->addSeries(series);
610 m_chart->createDefaultAxes();
611 m_view->show();
612 QTest::qWaitForWindowShown(m_view);
613 QAbstractAxis * axis = m_chart->axisY();
614 QVERIFY(axis!=0);
615
616 switch(axis->type())
617 {
618 case QAbstractAxis::AxisTypeValues:{
619 QValuesAxis* vaxis = qobject_cast<QValuesAxis*>(axis);
620 QVERIFY(vaxis!=0);
621 qreal min = vaxis->min();
622 qreal max = vaxis->max();
623 m_chart->scroll(0, -50);
624 QVERIFY(min>vaxis->min());
625 QVERIFY(max>vaxis->max());
626 break;
627 }
628 case QAbstractAxis::AxisTypeCategories:{
629 QBarCategoriesAxis* caxis = qobject_cast<QBarCategoriesAxis*>(axis);
630 QVERIFY(caxis!=0);
631 qreal min = caxis->min().toDouble();
632 qreal max = caxis->max().toDouble();
633 m_chart->scroll(0, -50);
634 QVERIFY(min>caxis->min().toDouble());
635 QVERIFY(max>caxis->max().toDouble());
636 break;
637 }
638 default:
639 qFatal("Unsupported type");
640 break;
641 }
475 }
642 }
476
643
477 void tst_QChart::theme_data()
644 void tst_QChart::theme_data()
@@ -549,24 +716,28 void tst_QChart::zoomIn_data()
549
716
550 void tst_QChart::zoomIn()
717 void tst_QChart::zoomIn()
551 {
718 {
552 qFatal("implement me");
719
553 /*
554 QFETCH(QRectF, rect);
720 QFETCH(QRectF, rect);
555 createTestData();
721 createTestData();
722 m_chart->createDefaultAxes();
556 QRectF marigns = m_chart->margins();
723 QRectF marigns = m_chart->margins();
557 rect.adjust(marigns.left(),marigns.top(),-marigns.right(),-marigns.bottom());
724 rect.adjust(marigns.left(),marigns.top(),-marigns.right(),-marigns.bottom());
558 qreal minX = m_chart->axisX()->min();
725 QValuesAxis* axisX = qobject_cast<QValuesAxis*>(m_chart->axisX());
559 qreal minY = m_chart->axisY()->min();
726 QVERIFY(axisX!=0);
560 qreal maxX = m_chart->axisX()->max();
727 QValuesAxis* axisY = qobject_cast<QValuesAxis*>(m_chart->axisY());
561 qreal maxY = m_chart->axisY()->max();
728 QVERIFY(axisY!=0);
729 qreal minX = axisX->min();
730 qreal minY = axisY->min();
731 qreal maxX = axisX->max();
732 qreal maxY = axisY->max();
562 m_chart->zoomIn(rect);
733 m_chart->zoomIn(rect);
563 if(rect.isValid()){
734 if(rect.isValid()){
564 QVERIFY(minX<m_chart->axisX()->min());
735 QVERIFY(minX<axisX->min());
565 QVERIFY(maxX>m_chart->axisX()->max());
736 QVERIFY(maxX>axisX->max());
566 QVERIFY(minY<m_chart->axisY()->min());
737 QVERIFY(minY<axisY->min());
567 QVERIFY(maxY>m_chart->axisY()->max());
738 QVERIFY(maxY>axisY->max());
568 }
739 }
569 */
740
570 }
741 }
571
742
572 void tst_QChart::zoomOut_data()
743 void tst_QChart::zoomOut_data()
@@ -576,38 +747,43 void tst_QChart::zoomOut_data()
576
747
577 void tst_QChart::zoomOut()
748 void tst_QChart::zoomOut()
578 {
749 {
579 qFatal("implement me");
580 createTestData();
750 createTestData();
581 /*
751 m_chart->createDefaultAxes();
582 qreal minX = m_chart->axisX()->min();
752
583 qreal minY = m_chart->axisY()->min();
753 QValuesAxis* axisX = qobject_cast<QValuesAxis*>(m_chart->axisX());
584 qreal maxX = m_chart->axisX()->max();
754 QVERIFY(axisX!=0);
585 qreal maxY = m_chart->axisY()->max();
755 QValuesAxis* axisY = qobject_cast<QValuesAxis*>(m_chart->axisY());
756 QVERIFY(axisY!=0);
757
758 qreal minX = axisX->min();
759 qreal minY = axisY->min();
760 qreal maxX = axisX->max();
761 qreal maxY = axisY->max();
586
762
587 m_chart->zoomIn();
763 m_chart->zoomIn();
588
764
589 QVERIFY(minX < m_chart->axisX()->min());
765 QVERIFY(minX < axisX->min());
590 QVERIFY(maxX > m_chart->axisX()->max());
766 QVERIFY(maxX > axisX->max());
591 QVERIFY(minY < m_chart->axisY()->min());
767 QVERIFY(minY < axisY->min());
592 QVERIFY(maxY > m_chart->axisY()->max());
768 QVERIFY(maxY > axisY->max());
593
769
594 m_chart->zoomOut();
770 m_chart->zoomOut();
595
771
596 // min x may be a zero value
772 // min x may be a zero value
597 if (qFuzzyIsNull(minX))
773 if (qFuzzyIsNull(minX))
598 QVERIFY(qFuzzyIsNull(m_chart->axisX()->min()));
774 QVERIFY(qFuzzyIsNull(axisX->min()));
599 else
775 else
600 QCOMPARE(minX, m_chart->axisX()->min());
776 QCOMPARE(minX, axisX->min());
601
777
602 // min y may be a zero value
778 // min y may be a zero value
603 if (qFuzzyIsNull(minY))
779 if (qFuzzyIsNull(minY))
604 QVERIFY(qFuzzyIsNull(m_chart->axisY()->min()));
780 QVERIFY(qFuzzyIsNull(axisY->min()));
605 else
781 else
606 QCOMPARE(minY, m_chart->axisY()->min());
782 QCOMPARE(minY, axisY->min());
783
784 QVERIFY(maxX == axisX->max());
785 QVERIFY(maxY == axisY->max());
607
786
608 QVERIFY(maxX == m_chart->axisX()->max());
609 QVERIFY(maxY == m_chart->axisY()->max());
610 */
611 }
787 }
612
788
613 QTEST_MAIN(tst_QChart)
789 QTEST_MAIN(tst_QChart)
General Comments 0
You need to be logged in to leave comments. Login now