diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-27 07:43:40 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-27 07:46:51 +0300 |
| commit | b776b6d3aa287b973c9346736badc6181e50cbc7 (patch) | |
| tree | 67812fbc8dee1977c6fb34c1274d1f1af8aa9cd0 /tests/kinectsurface/surfacedata.h | |
| parent | 9d0495cae3181f2caf52235df9a4fb81b48789c1 (diff) | |
Kinect demo update
+ added compile-time option to use scatter instead of surface
Change-Id: I1b5edbdc4e3057a6e7a236476e0bc3d83bf533eb
Change-Id: I1b5edbdc4e3057a6e7a236476e0bc3d83bf533eb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/kinectsurface/surfacedata.h')
| -rw-r--r-- | tests/kinectsurface/surfacedata.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index 24b92fad..9a89dd13 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -19,8 +19,14 @@ #ifndef SURFACEDATA_H #define SURFACEDATA_H +//#define USE_SCATTER + #include "QKinectWrapper.h" -#include <QtDataVisualization/q3dsurface.h> +#ifdef USE_SCATTER +#include <QtDataVisualization/Q3DScatter> +#else +#include <QtDataVisualization/Q3DSurface> +#endif #include <QTextEdit> using namespace QtDataVisualization; @@ -30,7 +36,11 @@ class SurfaceData : public QObject Q_OBJECT public: +#ifdef USE_SCATTER + explicit SurfaceData(Q3DScatter *surface, QTextEdit *statusLabel); +#else explicit SurfaceData(Q3DSurface *surface, QTextEdit *statusLabel); +#endif ~SurfaceData(); void start(); @@ -41,14 +51,22 @@ public: void setDistance(int distance); void scrollDown(); +#ifndef USE_SCATTER void useGradientOne(); void useGradientTwo(); +#else + void setData(const QImage &image); +#endif public slots: void setResolution(int selection); private: +#ifdef USE_SCATTER + Q3DScatter *m_surface; +#else Q3DSurface *m_surface; +#endif QTextEdit *m_statusArea; bool m_resize; QSize m_resolution; |