diff options
author | Mika Salmela <mika.salmela@digia.com> | 2014-07-04 09:58:12 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2014-07-04 10:03:13 +0300 |
commit | 6e4fb232702fa128b5efa3eef5dfaff4870a9fd0 (patch) | |
tree | 315abbc95d09a558e3eb47c757c06fe66ce3c236 /tests | |
parent | 6264a2ff1518d374e6150bf584f2ad3d133457dd (diff) |
Texture to surface
API for setting a texture to surface.
Task-number: QTRD-3232
Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/surfacetest/graphmodifier.cpp | 22 | ||||
-rw-r--r-- | tests/surfacetest/graphmodifier.h | 2 | ||||
-rw-r--r-- | tests/surfacetest/main.cpp | 17 | ||||
-rw-r--r-- | tests/surfacetest/mapimage.png | bin | 0 -> 159540 bytes | |||
-rw-r--r-- | tests/surfacetest/surfacetest.qrc | 1 |
5 files changed, 29 insertions, 13 deletions
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index 0bf63a2f..a685b71b 100644 --- a/tests/surfacetest/graphmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -48,12 +48,12 @@ GraphModifier::GraphModifier(Q3DSurface *graph) m_zCount(24), m_activeSample(0), m_fontSize(40), - m_rangeX(16.0), + m_rangeX(34.0), m_rangeY(16.0), - m_rangeZ(16.0), - m_minX(-8.0), + m_rangeZ(34.0), + m_minX(-17.0), m_minY(-8.0), - m_minZ(-8.0), + m_minZ(-17.0), m_addRowCounter(m_zCount), m_insertTestZPos(0), m_insertTestIndexPos(1), @@ -1244,12 +1244,12 @@ void GraphModifier::resetArray() void GraphModifier::resetArrayEmpty() { - QSurfaceDataArray *emptryArray = new QSurfaceDataArray; + QSurfaceDataArray *emptyArray = new QSurfaceDataArray; #ifdef MULTI_SERIES int series = rand() % 4; - m_multiseries[series]->dataProxy()->resetArray(emptryArray); + m_multiseries[series]->dataProxy()->resetArray(emptyArray); #else - m_theSeries->dataProxy()->resetArray(emptryArray); + m_theSeries->dataProxy()->resetArray(emptyArray); #endif } @@ -1594,3 +1594,11 @@ void GraphModifier::setHorizontalAspectRatio(int ratio) qreal aspectRatio = qreal(ratio) / 100.0; m_graph->setHorizontalAspectRatio(aspectRatio); } + +void GraphModifier::setSurfaceTexture(bool enabled) +{ + if (enabled) + m_multiseries[3]->setTexture(QImage(":/maps/mapimage")); + else + m_multiseries[3]->setTexture(QImage()); +} diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index f472c1ec..62145d45 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -112,9 +112,9 @@ public: void massiveTestAppendAndScroll(); void testAxisReverse(); void testDataOrdering(); - void setAspectRatio(int ratio); void setHorizontalAspectRatio(int ratio); + void setSurfaceTexture(bool enabled); public slots: void changeShadowQuality(int quality); diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp index 95d4637e..3a7307ea 100644 --- a/tests/surfacetest/main.cpp +++ b/tests/surfacetest/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) surfaceGraph->activeTheme()->setType(Q3DTheme::Theme(initialTheme)); QWidget *container = QWidget::createWindowContainer(surfaceGraph); - container->setMinimumSize(QSize(screenSize.width() / 4, screenSize.height() / 4)); + container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 4)); container->setMaximumSize(screenSize); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); container->setFocusPolicy(Qt::StrongFocus); @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) QSlider *axisRangeSliderX = new QSlider(Qt::Horizontal, widget); axisRangeSliderX->setTickInterval(1); axisRangeSliderX->setMinimum(1); - axisRangeSliderX->setValue(16); + axisRangeSliderX->setValue(34); axisRangeSliderX->setMaximum(100); axisRangeSliderX->setEnabled(true); QSlider *axisRangeSliderY = new QSlider(Qt::Horizontal, widget); @@ -195,14 +195,14 @@ int main(int argc, char *argv[]) QSlider *axisRangeSliderZ = new QSlider(Qt::Horizontal, widget); axisRangeSliderZ->setTickInterval(1); axisRangeSliderZ->setMinimum(1); - axisRangeSliderZ->setValue(16); + axisRangeSliderZ->setValue(34); axisRangeSliderZ->setMaximum(100); axisRangeSliderZ->setEnabled(true); QSlider *axisMinSliderX = new QSlider(Qt::Horizontal, widget); axisMinSliderX->setTickInterval(1); axisMinSliderX->setMinimum(-100); - axisMinSliderX->setValue(-8); + axisMinSliderX->setValue(-17); axisMinSliderX->setMaximum(100); axisMinSliderX->setEnabled(true); QSlider *axisMinSliderY = new QSlider(Qt::Horizontal, widget); @@ -214,7 +214,7 @@ int main(int argc, char *argv[]) QSlider *axisMinSliderZ = new QSlider(Qt::Horizontal, widget); axisMinSliderZ->setTickInterval(1); axisMinSliderZ->setMinimum(-100); - axisMinSliderZ->setValue(-8); + axisMinSliderZ->setValue(-17); axisMinSliderZ->setMaximum(100); axisMinSliderZ->setEnabled(true); @@ -402,6 +402,10 @@ int main(int argc, char *argv[]) polarCB->setText(QStringLiteral("Polar")); polarCB->setChecked(false); + QCheckBox *surfaceTextureCB = new QCheckBox(widget); + surfaceTextureCB->setText(QStringLiteral("Map texture")); + surfaceTextureCB->setChecked(false); + // Add controls to the layout #ifdef MULTI_SERIES vLayout->addWidget(series1CB); @@ -429,6 +433,7 @@ int main(int argc, char *argv[]) vLayout->addWidget(surfaceGridS4CB); vLayout->addWidget(surfaceS4CB); vLayout->addWidget(series4VisibleCB); + vLayout->addWidget(surfaceTextureCB); #endif #ifndef MULTI_SERIES vLayout->addWidget(new QLabel(QStringLiteral("Select surface sample"))); @@ -669,6 +674,8 @@ int main(int argc, char *argv[]) modifier, &GraphModifier::setAspectRatio); QObject::connect(horizontalAspectRatioSlider, &QSlider::valueChanged, modifier, &GraphModifier::setHorizontalAspectRatio); + QObject::connect(surfaceTextureCB, &QCheckBox::stateChanged, + modifier, &GraphModifier::setSurfaceTexture); #ifdef MULTI_SERIES modifier->setSeries1CB(series1CB); diff --git a/tests/surfacetest/mapimage.png b/tests/surfacetest/mapimage.png Binary files differnew file mode 100644 index 00000000..079d0407 --- /dev/null +++ b/tests/surfacetest/mapimage.png diff --git a/tests/surfacetest/surfacetest.qrc b/tests/surfacetest/surfacetest.qrc index c18da2c4..266ed7e0 100644 --- a/tests/surfacetest/surfacetest.qrc +++ b/tests/surfacetest/surfacetest.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/maps"> <file alias="map">Heightmap.png</file> + <file alias="mapimage">mapimage.png</file> </qresource> </RCC> |