diff options
Diffstat (limited to 'tests/manual/scattertest/scatterchart.cpp')
-rw-r--r-- | tests/manual/scattertest/scatterchart.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tests/manual/scattertest/scatterchart.cpp b/tests/manual/scattertest/scatterchart.cpp index 3bc7aff4..c6775df2 100644 --- a/tests/manual/scattertest/scatterchart.cpp +++ b/tests/manual/scattertest/scatterchart.cpp @@ -36,6 +36,7 @@ #include <QtDataVisualization/q3dtheme.h> #include <QtDataVisualization/Q3DInputHandler> #include <qmath.h> +#include <qrandom.h> using namespace QtDataVisualization; //#define RANDOM_SCATTER @@ -119,7 +120,7 @@ void ScatterDataModifier::massiveDataTest() m_massiveTestCacheArray.resize(cacheSize); int totalIndex = 0; for (int i = 0; i < unitCount && totalIndex < cacheSize; i++) { - unitBase += direction * (float(rand() % 3) / 100.0f); + unitBase += direction * (QRandomGenerator::global()->bounded(3) / 100.0f); if (unitBase > maxY) { unitBase = maxY; direction = -1.0f; @@ -128,9 +129,9 @@ void ScatterDataModifier::massiveDataTest() direction = 1.0f; } for (int j = 0; j < itemsPerUnit && totalIndex < cacheSize; j++) { - float randFactor = float(rand() % 100) / (100 / yRangeMargin); + float randFactor = float(QRandomGenerator::global()->bounded(100)) / (100 / yRangeMargin); m_massiveTestCacheArray[totalIndex].setPosition( - QVector3D(float(qrand() % itemsPerUnit), + QVector3D(float(QRandomGenerator::global()->bounded(itemsPerUnit)), unitBase + randFactor, 0.0f)); // Z value is irrelevant, we replace it anyway when we take item to use totalIndex++; @@ -780,8 +781,8 @@ void ScatterDataModifier::removeBunch() void ScatterDataModifier::timeout() { - int doWhat = rand() % 10; - if (!(rand() % 100)) + int doWhat = QRandomGenerator::global()->bounded(10); + if (!(QRandomGenerator::global()->bounded(100))) doWhat = -1; switch (doWhat) { @@ -814,7 +815,7 @@ void ScatterDataModifier::timeout() break; case 9: if (m_chart->seriesList().size()) - m_targetSeries = m_chart->seriesList().at(rand() % m_chart->seriesList().size()); + m_targetSeries = m_chart->seriesList().at(QRandomGenerator::global()->bounded(m_chart->seriesList().size())); else addSeries(); break; @@ -937,7 +938,7 @@ void ScatterDataModifier::toggleSeriesVisibility() void ScatterDataModifier::changeSeriesName() { if (m_targetSeries) - m_targetSeries->setName(m_targetSeries->name().append("-").append(QString::number(qrand() % 10))); + m_targetSeries->setName(m_targetSeries->name().append("-").append(QString::number(QRandomGenerator::global()->bounded(10)))); } void ScatterDataModifier::handleAxisXChanged(QValue3DAxis *axis) @@ -1119,9 +1120,9 @@ void ScatterDataModifier::setHorizontalAspectRatio(int ratio) QVector3D ScatterDataModifier::randVector() { QVector3D retvec = QVector3D( - (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f, - (float)(rand() % 100) / 100.0f - (float)(rand() % 100) / 100.0f, - (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f); + (float)(QRandomGenerator::global()->bounded(100)) / 2.0f - (float)(QRandomGenerator::global()->bounded(100)) / 2.0f, + (float)(QRandomGenerator::global()->bounded(100)) / 100.0f - (float)(QRandomGenerator::global()->bounded(100)) / 100.0f, + (float)(QRandomGenerator::global()->bounded(100)) / 2.0f - (float)(QRandomGenerator::global()->bounded(100)) / 2.0f); qDebug() << __FUNCTION__ << retvec; @@ -1142,8 +1143,8 @@ QScatter3DSeries *ScatterDataModifier::createAndAddSeries() series->setItemLabelFormat(QStringLiteral("@seriesName: (X:@xLabel / Z:@zLabel) Y:@yLabel")); series->setMesh(QAbstract3DSeries::MeshSphere); series->setMeshSmooth(true); - series->setBaseColor(QColor(rand() % 256, rand() % 256, rand() % 256)); - series->setItemSize(float(rand() % 90 + 10) / 100.0f); + series->setBaseColor(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256))); + series->setItemSize(float(QRandomGenerator::global()->bounded(90) + 10) / 100.0f); QObject::connect(series, &QScatter3DSeries::selectedItemChanged, this, &ScatterDataModifier::handleSelectionChange); |