diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:16 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:35 +0300 |
| commit | 50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch) | |
| tree | ba5b78cc2187709f33ccc6da9d7581c7f63729f6 /tests/kinectsurface | |
| parent | 0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff) | |
Refactored MeshStyle and InputState
Task-number: QTRD-2362
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/kinectsurface')
| -rw-r--r-- | tests/kinectsurface/surfacedata.cpp | 8 | ||||
| -rw-r--r-- | tests/kinectsurface/surfacedata.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index d69c35ce..b11be8d5 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::SelectionModeNone); m_scatter->setGridVisible(false); - m_scatter->setObjectType(QDataVis::Dots, false); + m_scatter->setObjectType(QDataVis::MeshStyleDots, 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::Bars, true); + m_bars->setBarType(QDataVis::MeshStyleBars, 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 == Bars) { + } else if (m_mode == MeshStyleBars) { 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 == Bars) { + } else if (m_mode == MeshStyleBars) { m_resize = true; m_resolution /= 4; m_barDataArray = new QBarDataArray; diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index 586fcfb6..0bf753cd 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -55,7 +55,7 @@ public: enum VisualizationMode { Surface = 0, Scatter, - Bars + MeshStyleBars }; public slots: |