diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-30 15:36:19 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-02 10:53:05 +0300 |
commit | 13d1117087e66c77d2eea2f0a046fc556c19cb3c (patch) | |
tree | f003ec51145278cea0fd2d123da6c0478c961297 /tests/scattertest/main.cpp | |
parent | 44b410f080c4820cea682c4d1278152d2767595c (diff) |
Scatter data changing optimization.
No longer reset the entire render item array if single item
changes, significantly speeding up this operation.
Task-number: QTRD-2190
Change-Id: Ia3de833b761dc6f24acff581ad79668f51c3e9c5
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'tests/scattertest/main.cpp')
-rw-r--r-- | tests/scattertest/main.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp index 78bab934..82d025aa 100644 --- a/tests/scattertest/main.cpp +++ b/tests/scattertest/main.cpp @@ -123,6 +123,9 @@ int main(int argc, char **argv) QPushButton *massiveDataTestButton = new QPushButton(widget); massiveDataTestButton->setText(QStringLiteral("Massive data test")); + QPushButton *testItemChangesButton = new QPushButton(widget); + testItemChangesButton->setText(QStringLiteral("Test Item changing")); + QLinearGradient grBtoY(0, 0, 100, 0); grBtoY.setColorAt(1.0, Qt::black); grBtoY.setColorAt(0.67, Qt::blue); @@ -137,6 +140,12 @@ int main(int argc, char **argv) gradientBtoYPB->setIcon(QIcon(pm)); gradientBtoYPB->setIconSize(QSize(100, 24)); + QLabel *fpsLabel = new QLabel(QStringLiteral("")); + + QCheckBox *fpsCheckBox = new QCheckBox(widget); + fpsCheckBox->setText(QStringLiteral("Measure Fps")); + fpsCheckBox->setChecked(false); + QCheckBox *backgroundCheckBox = new QCheckBox(widget); backgroundCheckBox->setText(QStringLiteral("Show background")); backgroundCheckBox->setChecked(true); @@ -232,9 +241,12 @@ int main(int argc, char **argv) vLayout->addWidget(toggleSeriesVisibilityButton, 0, Qt::AlignTop); vLayout->addWidget(changeSeriesNameButton, 0, Qt::AlignTop); vLayout->addWidget(startTimerButton, 0, Qt::AlignTop); - vLayout->addWidget(massiveDataTestButton, 1, Qt::AlignTop); + vLayout->addWidget(massiveDataTestButton, 0, Qt::AlignTop); + vLayout->addWidget(testItemChangesButton, 1, Qt::AlignTop); vLayout2->addWidget(gradientBtoYPB, 0, Qt::AlignTop); + vLayout2->addWidget(fpsLabel, 0, Qt::AlignTop); + vLayout2->addWidget(fpsCheckBox, 0, Qt::AlignTop); vLayout2->addWidget(backgroundCheckBox); vLayout2->addWidget(gridCheckBox); vLayout2->addWidget(new QLabel(QStringLiteral("Adjust shadow quality"))); @@ -302,6 +314,8 @@ int main(int argc, char **argv) &ScatterDataModifier::startStopTimer); QObject::connect(massiveDataTestButton, &QPushButton::clicked, modifier, &ScatterDataModifier::massiveDataTest); + QObject::connect(testItemChangesButton, &QPushButton::clicked, modifier, + &ScatterDataModifier::testItemChanges); QObject::connect(gradientBtoYPB, &QPushButton::clicked, modifier, &ScatterDataModifier::setGradient); QObject::connect(themeButton, &QPushButton::clicked, modifier, @@ -316,6 +330,8 @@ int main(int argc, char **argv) QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier, &ScatterDataModifier::changeFont); + QObject::connect(fpsCheckBox, &QCheckBox::stateChanged, modifier, + &ScatterDataModifier::setFpsMeasurement); QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier, &ScatterDataModifier::setBackgroundEnabled); QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier, @@ -335,6 +351,8 @@ int main(int argc, char **argv) &ScatterDataModifier::setMaxZ); + modifier->setFpsLabel(fpsLabel); + modifier->start(); return app.exec(); |