From 1628d6a96629ccb99c57f14131e5188ae2488347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Fri, 27 Sep 2013 08:50:03 +0300
Subject: Kinect demo update

+ added compile-time option for using bars

Change-Id: Icdab902c7969326cc09974c3e45e40e33a9144f9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 tests/kinectsurface/surfacedata.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'tests/kinectsurface/surfacedata.h')

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
-- 
cgit v1.2.3