diff --git a/tests/graphicssignalplotterbenchmark.cpp b/tests/graphicssignalplotterbenchmark.cpp index 1b94ea2..d8281e1 100644 --- a/tests/graphicssignalplotterbenchmark.cpp +++ b/tests/graphicssignalplotterbenchmark.cpp @@ -1,56 +1,60 @@ #include "graphicssignalplotterbenchmark.h" #include "signalplotter/kgraphicssignalplotter.h" +#include #include #include #include #include void BenchmarkGraphicsSignalPlotter::init() { scene = new QGraphicsScene; view = new QGraphicsView(scene); s = new KGraphicsSignalPlotter; scene->addItem(s); } void BenchmarkGraphicsSignalPlotter::cleanup() { delete view; delete scene; } void BenchmarkGraphicsSignalPlotter::addData() { s->addBeam(Qt::blue); s->addBeam(Qt::green); s->addBeam(Qt::red); s->addBeam(Qt::yellow); s->resize(1000,500); view->resize(1010,510); view->show(); s->setMaxAxisTextWidth(5); QVERIFY(QTest::qWaitForWindowExposed(view)); + auto *generator = QRandomGenerator::global(); + QBENCHMARK { - s->addSample(QList() << qrand()%10 << qrand()%10 << qrand()%10 << qrand()%10); + s->addSample(QList() << generator->bounded(10) << generator->bounded(10) << generator->bounded(10) << generator->bounded(10)); qApp->processEvents(); } } void BenchmarkGraphicsSignalPlotter::addDataWhenHidden() { s->addBeam(Qt::blue); s->addBeam(Qt::green); s->addBeam(Qt::red); s->addBeam(Qt::yellow); + auto *generator = QRandomGenerator::global(); QBENCHMARK { - s->addSample(QList() << qrand()%10 << qrand()%10 << qrand()%10 << qrand()%10); + s->addSample(QList() << generator->bounded(10) << generator->bounded(10) << generator->bounded(10) << generator->bounded(10)); qApp->processEvents(); } } QTEST_MAIN(BenchmarkGraphicsSignalPlotter) diff --git a/tests/signalplotterbenchmark.cpp b/tests/signalplotterbenchmark.cpp index 597477b..3f6172d 100644 --- a/tests/signalplotterbenchmark.cpp +++ b/tests/signalplotterbenchmark.cpp @@ -1,67 +1,71 @@ #include "signalplotterbenchmark.h" #include "signalplotter/ksignalplotter.h" +#include #include #include #include void BenchmarkSignalPlotter::init() { s = new KSignalPlotter; } void BenchmarkSignalPlotter::cleanup() { delete s; } void BenchmarkSignalPlotter::addData() { s->addBeam(Qt::blue); s->addBeam(Qt::green); s->addBeam(Qt::red); s->addBeam(Qt::yellow); s->show(); s->setMaxAxisTextWidth(5); s->resize(1000,500); QVERIFY(QTest::qWaitForWindowExposed(s)); + auto *generator = QRandomGenerator::global(); QBENCHMARK { - s->addSample(QList() << qrand()%10 << qrand()%10 << qrand()%10 << qrand()%10); + s->addSample(QList() << generator->bounded(10) << generator->bounded(10) << generator->bounded(10) << generator->bounded(10)); qApp->processEvents(); } } void BenchmarkSignalPlotter::stackedData() { s->addBeam(Qt::blue); s->addBeam(Qt::green); s->addBeam(Qt::red); s->addBeam(Qt::yellow); s->setStackGraph(true); s->show(); s->setMaxAxisTextWidth(5); s->resize(1000,500); QVERIFY(QTest::qWaitForWindowExposed(s)); + auto *generator = QRandomGenerator::global(); QBENCHMARK { - s->addSample(QList() << qrand()%10 << qrand()%10 << qrand()%10 << qrand()%10); + s->addSample(QList() << generator->bounded(10) << generator->bounded(10) << generator->bounded(10) << generator->bounded(10)); qApp->processEvents(); } } void BenchmarkSignalPlotter::addDataWhenHidden() { s->addBeam(Qt::blue); s->addBeam(Qt::green); s->addBeam(Qt::red); s->addBeam(Qt::yellow); + auto *generator = QRandomGenerator::global(); QBENCHMARK { - s->addSample(QList() << qrand()%10 << qrand()%10 << qrand()%10 << qrand()%10); + s->addSample(QList() << generator->bounded(10) << generator->bounded(10) << generator->bounded(10) << generator->bounded(10)); qApp->processEvents(); } } QTEST_MAIN(BenchmarkSignalPlotter)