diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-06 12:02:02 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-08 08:37:22 +0300 |
commit | 7b6ae38253e946225f1df27b7c97661d1cc14cf2 (patch) | |
tree | 9c8fd90caedac81e796d0396e305aa98613ca4f8 /tests | |
parent | 8ff45fe94c3f3f6916f8f673c3ce0b574a69cfdf (diff) |
Allow surface rows and cols be in ascending or descending XZ order
This allows adding rows that have smaller Z-value than the
previously added row instead of being forced to insert rows
into the beginning of the data array in these cases.
Task-number: QTRD-2428
Change-Id: I4dc6c5a48a55ca494a2372f917aa7447f61f336e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/surfacetest/graphmodifier.cpp | 73 | ||||
-rw-r--r-- | tests/surfacetest/graphmodifier.h | 3 | ||||
-rw-r--r-- | tests/surfacetest/main.cpp | 6 |
3 files changed, 76 insertions, 6 deletions
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index 6dd20de7..33cfb8a1 100644 --- a/tests/surfacetest/graphmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -782,7 +782,8 @@ QSurfaceDataRow *GraphModifier::createMultiRow(int row, int series, bool change) } void GraphModifier::populateRisingSeries(QSurface3DSeries *series, int rows, int columns, - float minValue, float maxValue) + float minValue, float maxValue, bool ascendingX, + bool ascendingZ) { QSurfaceDataArray *dataArray = new QSurfaceDataArray; dataArray->reserve(rows); @@ -791,8 +792,10 @@ void GraphModifier::populateRisingSeries(QSurface3DSeries *series, int rows, int for (int i = 0; i < rows; i++) { QSurfaceDataRow *dataRow = new QSurfaceDataRow(columns); for (int j = 0; j < columns; j++) { + float xValue = ascendingX ? float(j) : float(columns - j - 1); float yValue = minValue + (range * i * j / arraySize); - (*dataRow)[j].setPosition(QVector3D(float(j), yValue, float(i))); + float zValue = ascendingZ ? float(i) : float(rows - i - 1); + (*dataRow)[j].setPosition(QVector3D(xValue, yValue, zValue)); } dataArray->append(dataRow); } @@ -1168,6 +1171,7 @@ void GraphModifier::massiveDataTest() const float yRangeMax = 1.0f; const float yRangeMargin = 0.05f; static QTimer *massiveTestTimer = 0; + static QSurface3DSeries *series = new QSurface3DSeries; // To speed up massive array creation, we generate a smaller cache array // and copy rows from that to our main array @@ -1221,6 +1225,9 @@ void GraphModifier::massiveDataTest() qDebug() << __FUNCTION__ << testPhase << ": Creating massive array..." << rows << "x" << columns; + // Reset to zero first to avoid having memory allocated for two massive arrays at the same + // time on the second and subsequent runs. + series->dataProxy()->resetArray(0); QSurfaceDataArray *massiveArray = new QSurfaceDataArray; massiveArray->reserve(rows); @@ -1232,7 +1239,6 @@ void GraphModifier::massiveDataTest() } qDebug() << __FUNCTION__ << testPhase << ": Massive array creation finished!"; - QSurface3DSeries *series = new QSurface3DSeries; series->dataProxy()->resetArray(massiveArray); m_graph->addSeries(series); break; @@ -1316,8 +1322,8 @@ void GraphModifier::testAxisReverse() delete series1; series0 = new QSurface3DSeries; series1 = new QSurface3DSeries; - populateRisingSeries(series0, rowCount, colCount, 0.0f, 50.0f); - populateRisingSeries(series1, rowCount, colCount, -20.0f, 30.0f); + populateRisingSeries(series0, rowCount, colCount, 0.0f, 50.0f, true, true); + populateRisingSeries(series1, rowCount, colCount, -20.0f, 30.0f, true, true); m_graph->axisX()->setRange(0.0f, 10.0f); m_graph->axisY()->setRange(-20.0f, 50.0f); m_graph->axisZ()->setRange(5.0f, 15.0f); @@ -1361,6 +1367,63 @@ void GraphModifier::testAxisReverse() counter++; } +void GraphModifier::testDataOrdering() +{ + static int counter = 0; + const int rowCount = 20; + const int colCount = 20; + static QSurface3DSeries *series0 = 0; + static QSurface3DSeries *series1 = 0; + const float series0min = 0.0f; + const float series0max = 50.0f; + const float series1min = -20.0f; + const float series1max = 30.0f; + + switch (counter) { + case 0: { + qDebug() << __FUNCTION__ << counter << "Setup test - both ascending"; + foreach (QSurface3DSeries *series, m_graph->seriesList()) + m_graph->removeSeries(series); + foreach (QValue3DAxis *axis, m_graph->axes()) + m_graph->releaseAxis(axis); + delete series0; + delete series1; + series0 = new QSurface3DSeries; + series1 = new QSurface3DSeries; + populateRisingSeries(series0, rowCount, colCount, series0min, series0max, true, true); + populateRisingSeries(series1, rowCount, colCount, series1min, series1max, true, true); + m_graph->axisX()->setRange(5.0f, 15.0f); + m_graph->axisY()->setRange(-20.0f, 50.0f); + m_graph->axisZ()->setRange(5.0f, 15.0f); + m_graph->addSeries(series0); + m_graph->addSeries(series1); + } + break; + case 1: { + qDebug() << __FUNCTION__ << counter << "Ascending X, descending Z"; + populateRisingSeries(series0, rowCount, colCount, series0min, series0max, true, false); + populateRisingSeries(series1, rowCount, colCount, series1min, series1max, true, false); + } + break; + case 2: { + qDebug() << __FUNCTION__ << counter << "Descending X, ascending Z"; + populateRisingSeries(series0, rowCount, colCount, series0min, series0max, false, true); + populateRisingSeries(series1, rowCount, colCount, series1min, series1max, false, true); + } + break; + case 3: { + qDebug() << __FUNCTION__ << counter << "Both descending"; + populateRisingSeries(series0, rowCount, colCount, series0min, series0max, false, false); + populateRisingSeries(series1, rowCount, colCount, series1min, series1max, false, false); + } + break; + default: + qDebug() << __FUNCTION__ << "Resetting test"; + counter = -1; + } + counter++; +} + void GraphModifier::changeMesh() { static int model = 0; diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index f3e95a1b..b02e1c31 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -111,6 +111,7 @@ public: void massiveTestScroll(); void massiveTestAppendAndScroll(); void testAxisReverse(); + void testDataOrdering(); public slots: void changeShadowQuality(int quality); @@ -130,7 +131,7 @@ private: float maxX); QSurfaceDataRow *createMultiRow(int row, int series, bool change); void populateRisingSeries(QSurface3DSeries *series, int rows, int columns, float minValue, - float maxValue); + float maxValue, bool ascendingX, bool ascendingZ); Q3DSurface *m_graph; QSurface3DSeries *m_multiseries[4]; diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp index 8371e2cf..9d6165e6 100644 --- a/tests/surfacetest/main.cpp +++ b/tests/surfacetest/main.cpp @@ -350,6 +350,9 @@ int main(int argc, char *argv[]) QPushButton *testReverseButton = new QPushButton(widget); testReverseButton->setText(QStringLiteral("Test Axis Reversing")); + QPushButton *testDataOrderingButton = new QPushButton(widget); + testDataOrderingButton->setText(QStringLiteral("Test data ordering")); + QFrame* line = new QFrame(); line->setFrameShape(QFrame::HLine); line->setFrameShadow(QFrame::Sunken); @@ -439,6 +442,7 @@ int main(int argc, char *argv[]) vLayout2->addWidget(resetArrayEmptyButton); vLayout2->addWidget(massiveDataTestButton); vLayout2->addWidget(testReverseButton); + vLayout2->addWidget(testDataOrderingButton); widget->show(); @@ -598,6 +602,8 @@ int main(int argc, char *argv[]) modifier, &GraphModifier::massiveDataTest); QObject::connect(testReverseButton, &QPushButton::clicked, modifier, &GraphModifier::testAxisReverse); + QObject::connect(testDataOrderingButton, &QPushButton::clicked, + modifier, &GraphModifier::testDataOrdering); #ifdef MULTI_SERIES modifier->setSeries1CB(series1CB); |