| @@ -70,11 +70,11 private Q_SLOTS: | |||
|
|
70 | 70 | void seriesCount(); |
|
|
71 | 71 | void seriesIndex_data(); |
|
|
72 | 72 | void seriesIndex(); |
|
|
73 | /* | |
|
|
74 | 73 | void domain_data(); |
|
|
75 | 74 | void domain(); |
|
|
76 | 75 | void zoomInDomain_data(); |
|
|
77 | 76 | void zoomInDomain(); |
|
|
77 | /* | |
|
|
78 | 78 | void zoomOutDomain_data(); |
|
|
79 | 79 | void zoomOutDomain(); |
|
|
80 | 80 | void scrollDomain_data(); |
| @@ -485,7 +485,7 void tst_ChartDataSet::seriesIndex() | |||
|
|
485 | 485 | } |
|
|
486 | 486 | |
|
|
487 | 487 | } |
|
|
488 | /* | |
|
|
488 | ||
|
|
489 | 489 | void tst_ChartDataSet::domain_data() |
|
|
490 | 490 | { |
|
|
491 | 491 | addSeries_data(); |
| @@ -493,68 +493,65 void tst_ChartDataSet::domain_data() | |||
|
|
493 | 493 | |
|
|
494 | 494 | void tst_ChartDataSet::domain() |
|
|
495 | 495 | { |
|
|
496 |
QFETCH(Q |
|
|
|
497 | QFETCH(QAxis*, axis0); | |
|
|
498 | QFETCH(QLineSeries*, series1); | |
|
|
499 | QFETCH(QAxis*, axis1); | |
|
|
500 | QFETCH(QLineSeries*, series2); | |
|
|
501 | QFETCH(QAxis*, axis2); | |
|
|
502 | QFETCH(int, axisCount); | |
|
|
503 | Q_UNUSED(axisCount); | |
|
|
504 | ||
|
|
505 | m_dataset->addSeries(series0, axis0); | |
|
|
506 | m_dataset->addSeries(series1, axis1); | |
|
|
507 | m_dataset->addSeries(series2, axis2); | |
|
|
496 | QFETCH(QAbstractSeries*, series); | |
|
|
508 | 497 | |
|
|
509 | QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAxis *, Domain *))); | |
|
|
510 | QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAxis *))); | |
|
|
498 | QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *))); | |
|
|
499 | QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *))); | |
|
|
511 | 500 | QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *))); |
|
|
512 | 501 | QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); |
|
|
513 | 502 | |
|
|
514 | QVERIFY(m_dataset->domain(axis0)==m_dataset->domain(series0)); | |
|
|
515 |
QVERIFY(m_dataset->domain( |
|
|
|
516 | QVERIFY(m_dataset->domain(axis2)==m_dataset->domain(series2)); | |
|
|
517 | TRY_COMPARE(spy0.count(), 0); | |
|
|
503 | m_dataset->addSeries(series); | |
|
|
504 | QVERIFY(m_dataset->domain(series)); | |
|
|
505 | ||
|
|
506 | if(series->type()!=QAbstractSeries::SeriesTypePie){ | |
|
|
507 | TRY_COMPARE(spy0.count(), 2); | |
|
|
508 | } | |
|
|
509 | ||
|
|
518 | 510 | TRY_COMPARE(spy1.count(), 0); |
|
|
519 |
TRY_COMPARE(spy2.count(), |
|
|
|
511 | TRY_COMPARE(spy2.count(), 1); | |
|
|
512 | ||
|
|
513 | QList<QVariant> arguments = spy2.takeFirst(); | |
|
|
514 | Domain *domain = (Domain *) arguments.at(1).value<Domain *>(); | |
|
|
515 | QVERIFY(m_dataset->domain(series) == domain); | |
|
|
516 | ||
|
|
520 | 517 | TRY_COMPARE(spy3.count(), 0); |
|
|
518 | ||
|
|
521 | 519 | } |
|
|
522 | 520 | |
|
|
523 | 521 | void tst_ChartDataSet::zoomInDomain_data() |
|
|
524 | 522 | { |
|
|
525 | addSeries_data(); | |
|
|
523 | QTest::addColumn<QList<QAbstractSeries*> >("seriesList"); | |
|
|
524 | QTest::newRow("line,line, line, spline") << (QList<QAbstractSeries*>() << new QLineSeries(this) << new QLineSeries(this) << new QLineSeries(this) << new QSplineSeries(this) ); | |
|
|
526 | 525 | } |
|
|
527 | 526 | |
|
|
528 | 527 | void tst_ChartDataSet::zoomInDomain() |
|
|
529 | 528 | { |
|
|
530 |
QFETCH(QLi |
|
|
|
531 | QFETCH(QAxis*, axis0); | |
|
|
532 | QFETCH(QLineSeries*, series1); | |
|
|
533 | QFETCH(QAxis*, axis1); | |
|
|
534 | QFETCH(QLineSeries*, series2); | |
|
|
535 | QFETCH(QAxis*, axis2); | |
|
|
536 | QFETCH(int, axisCount); | |
|
|
537 | Q_UNUSED(axisCount); | |
|
|
529 | QFETCH(QList<QAbstractSeries*>, seriesList); | |
|
|
538 | 530 | |
|
|
539 | m_dataset->addSeries(series0, axis0); | |
|
|
540 |
m_dataset->addSeries(series |
|
|
|
541 | m_dataset->addSeries(series2, axis2); | |
|
|
531 | foreach(QAbstractSeries* series, seriesList) { | |
|
|
532 | m_dataset->addSeries(series); | |
|
|
533 | } | |
|
|
542 | 534 | |
|
|
543 | Domain* domain0 = m_dataset->domain(series0); | |
|
|
544 | Domain* domain1 = m_dataset->domain(series1); | |
|
|
545 | Domain* domain2 = m_dataset->domain(series2); | |
|
|
535 | for (int i = 1; i < seriesList.count(); i++) { | |
|
|
536 | m_dataset->setAxisX(seriesList.at(i), m_dataset->axisX(seriesList.at(0))); | |
|
|
537 | } | |
|
|
546 | 538 | |
|
|
547 | QSignalSpy spy0(domain0, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); | |
|
|
548 | QSignalSpy spy1(domain1, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); | |
|
|
549 | QSignalSpy spy2(domain2, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); | |
|
|
539 | QList<QSignalSpy*> spyList; | |
|
|
550 | 540 | |
|
|
551 | m_dataset->zoomInDomain(QRect(0,0,100,100),QSize(1000,1000)); | |
|
|
541 | foreach(QAbstractSeries* series, seriesList) { | |
|
|
542 | spyList << new QSignalSpy(m_dataset->domain(series),SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); | |
|
|
543 | } | |
|
|
552 | 544 | |
|
|
553 | TRY_COMPARE(spy0.count(), 1); | |
|
|
554 | TRY_COMPARE(spy1.count(), 1); | |
|
|
555 | TRY_COMPARE(spy2.count(), 1); | |
|
|
545 | m_dataset->zoomInDomain(QRect(0, 0, 100, 100), QSize(1000, 1000)); | |
|
|
546 | ||
|
|
547 | foreach(QSignalSpy* spy, spyList) { | |
|
|
548 | TRY_COMPARE(spy->count(), 1); | |
|
|
549 | } | |
|
|
550 | ||
|
|
551 | qDeleteAll(spyList); | |
|
|
556 | 552 | } |
|
|
557 | 553 | |
|
|
554 | /* | |
|
|
558 | 555 | void tst_ChartDataSet::zoomOutDomain_data() |
|
|
559 | 556 | { |
|
|
560 | 557 | addSeries_data(); |
General Comments 0
You need to be logged in to leave comments.
Login now