diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-12 16:01:04 -0700 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-07-04 11:46:00 +0000 |
commit | dbb55fba566fd3878b5ef76a2216f0c3f961147f (patch) | |
tree | 0c6f4a7a5cfb7dcfa41c88b205ddb155530b228d /tests/manual | |
parent | 94f565a00cbc8d779251355cdb94704277711da7 (diff) |
Use QRandomGenerator instead of q?rand
Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/barcharttester/chart-widget.cpp | 3 | ||||
-rw-r--r-- | tests/manual/candlesticktester/mainwidget.cpp | 7 | ||||
-rw-r--r-- | tests/manual/chartviewer/model.h | 9 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/mainwidget.cpp | 5 | ||||
-rw-r--r-- | tests/manual/openglseriestest/datasource.cpp | 3 | ||||
-rw-r--r-- | tests/manual/openglseriestest/mainwindow.cpp | 3 | ||||
-rw-r--r-- | tests/manual/presenterchart/chartview.cpp | 4 | ||||
-rw-r--r-- | tests/manual/wavechart/wavechart.cpp | 6 |
8 files changed, 18 insertions, 22 deletions
diff --git a/tests/manual/barcharttester/chart-widget.cpp b/tests/manual/barcharttester/chart-widget.cpp index 6e7157b1..3c58f5ce 100644 --- a/tests/manual/barcharttester/chart-widget.cpp +++ b/tests/manual/barcharttester/chart-widget.cpp @@ -40,7 +40,6 @@ #include <QtCharts/QHorizontalStackedBarSeries> #include <QtCharts/QPercentBarSeries> #include <QtCharts/QStackedBarSeries> -#include <QtCore/QTime> #include <QElapsedTimer> #include <QDebug> @@ -152,8 +151,6 @@ ChartWidget::ChartWidget(QWidget *parent) : series->setBarWidth(barWidth); } - qsrand((uint) QTime::currentTime().msec()); - resize(800, 300); m_horizontalLayout = new QHBoxLayout(this); m_horizontalLayout->setSpacing(6); diff --git a/tests/manual/candlesticktester/mainwidget.cpp b/tests/manual/candlesticktester/mainwidget.cpp index 9c902a3f..f45a7793 100644 --- a/tests/manual/candlesticktester/mainwidget.cpp +++ b/tests/manual/candlesticktester/mainwidget.cpp @@ -35,6 +35,7 @@ #include <QtCharts/QValueAxis> #include <QtCore/QDateTime> #include <QtCore/QDebug> +#include <QtCore/QRandomGenerator> #include <QtWidgets/QCheckBox> #include <QtWidgets/QComboBox> #include <QtWidgets/QDoubleSpinBox> @@ -64,8 +65,6 @@ MainWidget::MainWidget(QWidget *parent) m_customDecreasingColor(false), m_hModelMapper(new QHCandlestickModelMapper(this)) { - qsrand(QDateTime::currentDateTime().toTime_t()); - m_chartView->setRenderHint(QPainter::Antialiasing, false); m_hModelMapper->setModel(new CustomTableModel(this)); @@ -285,7 +284,9 @@ QGridLayout *MainWidget::createModelMapperControlsLayout() qreal MainWidget::randomValue(int min, int max) const { - return (qrand() / (qreal(RAND_MAX) + 1)) * ((qMax(min, max) - qMin(min, max)) + qMin(min, max)); + if (min > max) + qSwap(min, max); + return QRandomGenerator::bounded(min, max); } QCandlestickSet *MainWidget::randomSet(qreal timestamp) diff --git a/tests/manual/chartviewer/model.h b/tests/manual/chartviewer/model.h index fcc53724..5db91e8e 100644 --- a/tests/manual/chartviewer/model.h +++ b/tests/manual/chartviewer/model.h @@ -33,8 +33,8 @@ #include <QtCore/QList> #include <QtCore/QPair> #include <QtCore/QPointF> +#include <QtCore/QRandomGenerator> #include <QtCore/QTime> -#include <stdlib.h> typedef QPair<QPointF, QString> Data; typedef QList<Data> DataList; @@ -51,17 +51,14 @@ public: { DataTable dataTable; - // set seed for random stuff - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - // generate random data for (int i(0); i < listCount; i++) { DataList dataList; qreal yValue(0.1); for (int j(0); j < valueCount; j++) { - yValue = yValue + (qreal)(qrand() % valueMax) / (qreal) valueCount; + yValue = yValue + QRandomGenerator::bounded(valueMax / (qreal) valueCount); QPointF value( - (j + (qreal) qrand() / (qreal) RAND_MAX) + (j + QRandomGenerator::getReal()) * ((qreal) valueMax / (qreal) valueCount), yValue); QString label = "Slice " + QString::number(i) + ":" + QString::number(j); dataList << Data(value, label); diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index c471d0bc..2850de0e 100644 --- a/tests/manual/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -50,6 +50,7 @@ #include <QtWidgets/QMessageBox> #include <qmath.h> #include <QtCore/QDebug> +#include <QtCore/QRandomGenerator> #include <QtGui/QStandardItemModel> #include <QtCharts/QBarCategoryAxis> #include <QtWidgets/QOpenGLWidget> @@ -218,9 +219,9 @@ QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QStr if (dataCharacteristics == "Sin") { newColumn.append(std::abs(sin(M_PI / 50 * i) * 100)); } else if (dataCharacteristics == "Sin + random") { - newColumn.append(std::abs(sin(M_PI / 50 * i) * 100) + (rand() % 5)); + newColumn.append(std::abs(sin(M_PI / 50 * i) * 100) + QRandomGenerator::bounded(5)); } else if (dataCharacteristics == "Random") { - newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX); + newColumn.append(QRandomGenerator::bounded(11.0)); } else if (dataCharacteristics == "Linear") { //newColumn.append(i * (j + 1.0)); // TODO: temporary hack to make pie work; prevent zero values: diff --git a/tests/manual/openglseriestest/datasource.cpp b/tests/manual/openglseriestest/datasource.cpp index 4017676b..29d7e2ba 100644 --- a/tests/manual/openglseriestest/datasource.cpp +++ b/tests/manual/openglseriestest/datasource.cpp @@ -29,6 +29,7 @@ #include "datasource.h" #include <QtCore/QtMath> +#include <QtCore/QRandomGenerator> QT_CHARTS_USE_NAMESPACE @@ -118,7 +119,7 @@ void DataSource::generateData(int seriesIndex, int rowCount, int colCount) qreal y(0); // data with sin + random component y = height + (yMultiplier * qSin(M_PI / 50 * j) - + (yMultiplier * (qreal) rand() / (qreal) RAND_MAX)); + + (yMultiplier * QRandomGenerator::getReal())); // 0.000001 added to make values logaxis compatible x = 0.000001 + 20.0 * (qreal(j) / qreal(colCount)) + (xAdjustment * qreal(i)); points.append(QPointF(x, y)); diff --git a/tests/manual/openglseriestest/mainwindow.cpp b/tests/manual/openglseriestest/mainwindow.cpp index 4aaeed13..2d59f18c 100644 --- a/tests/manual/openglseriestest/mainwindow.cpp +++ b/tests/manual/openglseriestest/mainwindow.cpp @@ -36,6 +36,7 @@ #include <QtCharts/QDateTimeAxis> #include <QtCharts/QCategoryAxis> #include <QtCharts/QChart> +#include <QtCore/QRandomGenerator> #include <QtCore/QDebug> #include <QtCore/QDateTime> @@ -548,7 +549,7 @@ void MainWindow::addSeries(bool gl) if (m_seriesList.size() < maxSeriesCount) { QXYSeries *series; - if (qrand() % 2) { + if (QRandomGenerator::bounded(2)) { series = new QLineSeries; series->setPen(QPen(QBrush(color), width)); } else { diff --git a/tests/manual/presenterchart/chartview.cpp b/tests/manual/presenterchart/chartview.cpp index 4bbf8080..86d144ad 100644 --- a/tests/manual/presenterchart/chartview.cpp +++ b/tests/manual/presenterchart/chartview.cpp @@ -32,7 +32,7 @@ #include <QtCharts/QScatterSeries> #include <QtCharts/QSplineSeries> #include <QtCharts/QAreaSeries> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> ChartView::ChartView(QChart *chart, QWidget *parent) : QChartView(chart, parent), @@ -62,7 +62,7 @@ ChartView::ChartView(QChart *chart, QWidget *parent) int numPoints = 10; for (int x = 0; x <= numPoints; ++x) { - qreal y = qrand() % 100; + qreal y = QRandomGenerator::bounded(100); series0->append(x, y); series1->append(x, y); series2->append(x, y); diff --git a/tests/manual/wavechart/wavechart.cpp b/tests/manual/wavechart/wavechart.cpp index 72e5e737..522d2a7c 100644 --- a/tests/manual/wavechart/wavechart.cpp +++ b/tests/manual/wavechart/wavechart.cpp @@ -29,6 +29,7 @@ #include "wavechart.h" #include <qmath.h> +#include <qrandom.h> QT_CHARTS_USE_NAMESPACE @@ -46,9 +47,6 @@ WaveChart::WaveChart(QChart* chart, QWidget* parent) : chart->legend()->setVisible(false); - QTime now = QTime::currentTime(); - qsrand((uint) now.msec()); - int fluctuate = 100; for (qreal x = 0; x <= 2 * M_PI; x += m_step) { @@ -69,7 +67,7 @@ void WaveChart::update() int fluctuate; const QList<QPointF>& points = m_series->points(); for (qreal i = 0, x = 0; x <= 2 * M_PI; x += m_step, i++) { - fluctuate = qrand() % 100; + fluctuate = QRandomGenerator::bounded(100); m_series->replace(x,points[i].y(),x,fabs(sin(x) * fluctuate)); } |