diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-27 08:50:03 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-27 08:52:53 +0300 |
| commit | 1628d6a96629ccb99c57f14131e5188ae2488347 (patch) | |
| tree | 4be9693e11230b528f77615b3e2f6b07e142b68d /tests/kinectsurface/surfacedata.h | |
| parent | f2a5c09144f17f3240ae6a7e7b48237f1b234d9b (diff) | |
Kinect demo update
+ added compile-time option for using bars
Change-Id: Icdab902c7969326cc09974c3e45e40e33a9144f9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/kinectsurface/surfacedata.h')
| -rw-r--r-- | tests/kinectsurface/surfacedata.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index 9a89dd13..707bf3c8 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -20,10 +20,13 @@ #define SURFACEDATA_H //#define USE_SCATTER +//#define USE_BARS #include "QKinectWrapper.h" -#ifdef USE_SCATTER +#if defined(USE_SCATTER) #include <QtDataVisualization/Q3DScatter> +#elif defined(USE_BARS) +#include <QtDataVisualization/Q3DBars> #else #include <QtDataVisualization/Q3DSurface> #endif @@ -36,8 +39,10 @@ class SurfaceData : public QObject Q_OBJECT public: -#ifdef USE_SCATTER +#if defined(USE_SCATTER) explicit SurfaceData(Q3DScatter *surface, QTextEdit *statusLabel); +#elif defined(USE_BARS) + explicit SurfaceData(Q3DBars *surface, QTextEdit *statusLabel); #else explicit SurfaceData(Q3DSurface *surface, QTextEdit *statusLabel); #endif @@ -51,19 +56,21 @@ public: void setDistance(int distance); void scrollDown(); -#ifndef USE_SCATTER +#if defined(USE_SCATTER) || defined(USE_BARS) + void setData(const QImage &image); +#else void useGradientOne(); void useGradientTwo(); -#else - void setData(const QImage &image); #endif public slots: void setResolution(int selection); private: -#ifdef USE_SCATTER +#if defined(USE_SCATTER) Q3DScatter *m_surface; +#elif defined(USE_BARS) + Q3DBars *m_surface; #else Q3DSurface *m_surface; #endif |