From cf2ec248f2c8d6fabc539f2acef4df5d3c0e8b6c Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@qt.io>
Date: Wed, 20 Sep 2017 09:35:56 +0200
Subject: iot-sensortag: Redesign of example

The updated version switches the focus from having multiple sensors
locally towards showing one sensor from a list. This list can display
local or remote sensors and switch on runtime.

Also incorporated many style fixes and cleanups.

Change-Id: If7b8acbb2a784ebba95d467176e76728721c82f7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 tradeshow/iot-sensortag/mockdataprovider.cpp | 39 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'tradeshow/iot-sensortag/mockdataprovider.cpp')

diff --git a/tradeshow/iot-sensortag/mockdataprovider.cpp b/tradeshow/iot-sensortag/mockdataprovider.cpp
index 7e9607c..d8eb309 100644
--- a/tradeshow/iot-sensortag/mockdataprovider.cpp
+++ b/tradeshow/iot-sensortag/mockdataprovider.cpp
@@ -47,22 +47,23 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include "mockdataprovider.h"
 #include <QtCore/QDateTime>
 
 #define MOCK_DATA_SLOW_REFRESH_INTERVAL_MS   1000
 #define MOCK_DATA_RAPID_REFRESH_INTERVAL_MS   200
 
-MockDataProvider::MockDataProvider(QString id, QObject* parent)
-    : SensorTagDataProvider(id, parent),
-    xAxisG(-0.02f),
-    yAxisG(0.0f),
-    zAxisG(0.02f),
-    luxIncrease(100),
-    rotationDegPerSecXIncrease(5),
-    rotationDegPerSecYIncrease(7),
-    rotationDegPerSecZIncrease(-9),
-    m_smaSamples(0)
+MockDataProvider::MockDataProvider(QString id, QObject *parent)
+    : SensorTagDataProvider(id, parent)
+    , xAxisG(-0.02f)
+    , yAxisG(0.0f)
+    , zAxisG(0.02f)
+    , luxIncrease(100)
+    , rotationDegPerSecXIncrease(5)
+    , rotationDegPerSecYIncrease(7)
+    , rotationDegPerSecZIncrease(-9)
+    , m_smaSamples(0)
 {
     intervalRotation = MOCK_DATA_RAPID_REFRESH_INTERVAL_MS;
     humidity = 40;
@@ -81,21 +82,22 @@ MockDataProvider::MockDataProvider(QString id, QObject* parent)
 bool MockDataProvider::startDataFetching()
 {
     // Mock data is immediately available
-    m_state = Connected;
+    setState(Connected);
 
     qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
-    slowUpdateTimer = new QTimer(this);
-    connect(slowUpdateTimer, SIGNAL(timeout()), this, SLOT(slowTimerExpired()));
-    slowUpdateTimer->start(MOCK_DATA_SLOW_REFRESH_INTERVAL_MS);
-    rapidUpdateTimer = new QTimer(this);
-    connect(rapidUpdateTimer, SIGNAL(timeout()), this, SLOT(rapidTimerExpired()));
-    rapidUpdateTimer->start(MOCK_DATA_RAPID_REFRESH_INTERVAL_MS);
+    connect(&slowUpdateTimer, &QTimer::timeout,
+            this, &MockDataProvider::slowTimerExpired, Qt::UniqueConnection);
+    slowUpdateTimer.start(MOCK_DATA_SLOW_REFRESH_INTERVAL_MS);
+    connect(&rapidUpdateTimer, &QTimer::timeout,
+            this, &MockDataProvider::rapidTimerExpired, Qt::UniqueConnection);
+    rapidUpdateTimer.start(MOCK_DATA_RAPID_REFRESH_INTERVAL_MS);
     return true;
 }
 
 void MockDataProvider::endDataFetching()
 {
-    slowUpdateTimer->stop();
+    slowUpdateTimer.stop();
+    rapidUpdateTimer.stop();
 }
 
 QString MockDataProvider::sensorType() const
@@ -235,7 +237,6 @@ void MockDataProvider::rapidTimerExpired()
 
 void MockDataProvider::startServiceScan()
 {
-
 }
 
 void MockDataProvider::reset()
-- 
cgit v1.2.3