diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-31 08:22:32 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-31 08:23:18 +0200 |
commit | 656ced83993b765ddcca04a6f0b26135411ae11c (patch) | |
tree | d4ae6e7d704aee7318697f2bd15cdfc45f78c46c | |
parent | 7669b6ed1aee55b29b06f4077cae537f28f1d9d1 (diff) |
Kinect demo updates
Larger buttons etc.
Change-Id: I519876518859a8e9800154b2b1eff164f7b0b892
Change-Id: I519876518859a8e9800154b2b1eff164f7b0b892
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r-- | tests/kinectsurface/main.cpp | 15 | ||||
-rw-r--r-- | tests/kinectsurface/surfacedata.cpp | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/kinectsurface/main.cpp b/tests/kinectsurface/main.cpp index 1e7fe118..cd33f229 100644 --- a/tests/kinectsurface/main.cpp +++ b/tests/kinectsurface/main.cpp @@ -71,12 +71,15 @@ int main(int argc, char **argv) hLayout->addLayout(vLayout); QPushButton *startButton = new QPushButton(widget); + startButton->setMinimumHeight(60); startButton->setText(QStringLiteral("Start Kinect")); QPushButton *stopButton = new QPushButton(widget); + stopButton->setMinimumHeight(60); stopButton->setText(QStringLiteral("Stop Kinect")); QComboBox *resolutionBox = new QComboBox(widget); + resolutionBox->setMinimumHeight(60); resolutionBox->addItem(QStringLiteral("Low")); resolutionBox->addItem(QStringLiteral("Medium")); resolutionBox->addItem(QStringLiteral("High")); @@ -84,12 +87,14 @@ int main(int argc, char **argv) resolutionBox->setCurrentIndex(0); QComboBox *modeBox = new QComboBox(widget); + modeBox->setMinimumHeight(60); modeBox->addItem(QStringLiteral("Surface Plot")); modeBox->addItem(QStringLiteral("Scatter Chart")); modeBox->addItem(QStringLiteral("Bar Chart")); modeBox->setCurrentIndex(0); QSlider *distanceSlider = new QSlider(Qt::Horizontal, widget); + distanceSlider->setMinimumHeight(60); distanceSlider->setTickInterval(10); distanceSlider->setTickPosition(QSlider::TicksBelow); distanceSlider->setMinimum(10); @@ -102,15 +107,15 @@ int main(int argc, char **argv) gradientOne.setColorAt(0.67, Qt::red); gradientOne.setColorAt(1.0, Qt::yellow); - QPixmap pm(200, 24); + QPixmap pm(200, 60); QPainter pmp(&pm); pmp.setBrush(QBrush(gradientOne)); pmp.setPen(Qt::NoPen); - pmp.drawRect(0, 0, 200, 24); + pmp.drawRect(0, 0, 200, 60); QPushButton *gradientOneButton = new QPushButton(widget); gradientOneButton->setIcon(QIcon(pm)); - gradientOneButton->setIconSize(QSize(200, 24)); + gradientOneButton->setIconSize(QSize(200, 60)); gradientOneButton->setToolTip(QStringLiteral("Colors: Thermal Imitation")); QLinearGradient gradientTwo(0, 0, 200, 1); @@ -120,11 +125,11 @@ int main(int argc, char **argv) pmp.setBrush(QBrush(gradientTwo)); pmp.setPen(Qt::NoPen); - pmp.drawRect(0, 0, 200, 24); + pmp.drawRect(0, 0, 200, 60); QPushButton *gradientTwoButton = new QPushButton(widget); gradientTwoButton->setIcon(QIcon(pm)); - gradientTwoButton->setIconSize(QSize(200, 24)); + gradientTwoButton->setIconSize(QSize(200, 60)); gradientTwoButton->setToolTip(QStringLiteral("Colors: Highlight Foreground")); QTextEdit *status = new QTextEdit(QStringLiteral("<b>Ready</b><br>"), widget); diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index 71240c67..07b18746 100644 --- a/tests/kinectsurface/surfacedata.cpp +++ b/tests/kinectsurface/surfacedata.cpp @@ -148,8 +148,10 @@ void SurfaceData::updateData() if (m_mode != Surface) { setData(depthMap); } else { + static_cast<QHeightMapSurfaceDataProxy *>(m_surface->seriesList().at(0)->dataProxy())->setValueRanges( + 0, depthMap.width(), 0, depthMap.height()); static_cast<QHeightMapSurfaceDataProxy *>(m_surface->seriesList().at(0)->dataProxy())->setHeightMap( - depthMap); + depthMap); } } |