diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-11 13:26:57 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-11 13:32:21 +0300 |
commit | 444878981185912f88155f27635b509b613a48e8 (patch) | |
tree | 33506a21e7bc9189ea3b7ed1d83aef8916d7cd8e /tradeshow/iot-sensortag/mockdataprovider.cpp | |
parent | 7f17ecb20a42dbf6ad2d994f9521e738b4b97a11 (diff) | |
parent | 3302a40a4e4a83d53493a832bc9b8486b3ad549a (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
iot-sensortag: Add Uuid fallback for device id
iot-sensortag: Use double-click to select connection
iot-sensortag: Add logging window
iot-sensortag: Do not enable MQTT by default
Merge remote-tracking branch 'origin/5.9' into 5.10
iot-sensortag: Disable dateview in portrait mode
iot-sensortag: Show fullscreen on Android
iot-sensortag: Align font sizes
iot-sensortag: Add support for MQTT
iot-sensortag: Redesign of example
Fix typo
Doc: Bump version to 5.10.0
Doc: Bump version to 5.9.2
Change-Id: Id006d6911a42db2a493f7b3f0eb891c791a5879c
Diffstat (limited to 'tradeshow/iot-sensortag/mockdataprovider.cpp')
-rw-r--r-- | tradeshow/iot-sensortag/mockdataprovider.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
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() |