summaryrefslogtreecommitdiffstats
path: root/tests/kinectsurface
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-28 08:19:37 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-29 09:53:48 +0200
commit527113321ff103835b89543c5d6f670f55b5b0d5 (patch)
tree01b242ef7b1f30a414b718f99f155f19235951bd /tests/kinectsurface
parent85dda87df2d420dc53959e549d24c4b09ce93d57 (diff)
Move series specific visual elements to series, part 1
Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/kinectsurface')
-rw-r--r--tests/kinectsurface/surfacedata.cpp8
-rw-r--r--tests/kinectsurface/surfacedata.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp
index 79489fc8..e48a4b58 100644
--- a/tests/kinectsurface/surfacedata.cpp
+++ b/tests/kinectsurface/surfacedata.cpp
@@ -59,7 +59,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
m_scatter->setTheme(QDataVis::ThemeStoneMoss);
m_scatter->setSelectionMode(QDataVis::SelectionNone);
m_scatter->setGridVisible(false);
- m_scatter->setObjectType(QDataVis::MeshStyleDots, false);
+ m_scatter->setObjectType(QDataVis::MeshDots, false);
m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow);
m_scatter->setCameraPosition(0.0, 85.0, 110);
m_scatter->axisY()->setMin(-128);
@@ -73,7 +73,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
m_bars->setTheme(QDataVis::ThemeQt);
m_bars->setSelectionMode(QDataVis::SelectionModeNone);
m_bars->setGridVisible(false);
- m_bars->setBarType(QDataVis::MeshStyleBars, true);
+ m_bars->setBarType(QDataVis::MeshBars, true);
#if 1
m_bars->setShadowQuality(QDataVis::ShadowQualityLow);
#else
@@ -98,7 +98,7 @@ SurfaceData::~SurfaceData()
delete m_scatter;
delete m_bars;
delete m_surface;
- } else if (m_mode == MeshStyleBars) {
+ } else if (m_mode == MeshBars) {
delete m_scatter;
delete m_surface;
delete m_bars;
@@ -201,7 +201,7 @@ void SurfaceData::setResolution(int selection)
m_scatter->axisZ()->setMax(m_resolution.height() / 2);
m_scatterDataArray = new QScatterDataArray;
m_scatterDataArray->resize(m_resolution.width() * m_resolution.height());
- } else if (m_mode == MeshStyleBars) {
+ } else if (m_mode == MeshBars) {
m_resize = true;
m_resolution /= 4;
m_barDataArray = new QBarDataArray;
diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h
index 0bf753cd..fcae03b4 100644
--- a/tests/kinectsurface/surfacedata.h
+++ b/tests/kinectsurface/surfacedata.h
@@ -55,7 +55,7 @@ public:
enum VisualizationMode {
Surface = 0,
Scatter,
- MeshStyleBars
+ MeshBars
};
public slots: