diff options
author | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-02-03 12:55:13 +0200 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-03 12:21:58 +0000 |
commit | a1b4c4ad291ff531b6efe8fabe409dfaae3cc854 (patch) | |
tree | 9a3b0c0c0f17924276134432808221ebd0bbe46d /tradeshow/iot-sensortag/mockdataprovider.cpp | |
parent | 0a85dc729c5602c0914172bbf4b2b4e3171fcd85 (diff) |
RotationPage added
Added a page that has three rotating disks.
Current pictures are placeholders for final graphics.
SensorTag can be recalibrated.
Change-Id: I0666ab06e665d8c40861e170f36b09013b722973
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/mockdataprovider.cpp')
-rw-r--r-- | tradeshow/iot-sensortag/mockdataprovider.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/tradeshow/iot-sensortag/mockdataprovider.cpp b/tradeshow/iot-sensortag/mockdataprovider.cpp index f081c30..d6f0ab8 100644 --- a/tradeshow/iot-sensortag/mockdataprovider.cpp +++ b/tradeshow/iot-sensortag/mockdataprovider.cpp @@ -50,6 +50,9 @@ #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.02), @@ -60,6 +63,7 @@ MockDataProvider::MockDataProvider(QString id, QObject* parent) rotationDegPerSecZIncrease(-9), m_smaSamples(0) { + intervalRotation = MOCK_DATA_RAPID_REFRESH_INTERVAL_MS; humidity = 40; irAmbientTemperature = 25; irObjectTemperature = 25; @@ -78,18 +82,18 @@ bool MockDataProvider::startDataFetching() m_state = Connected; qsrand(QDateTime::currentMSecsSinceEpoch() / 1000); - oneSecondTimer = new QTimer(this); - connect(oneSecondTimer, SIGNAL(timeout()), this, SLOT(oneSecondTimerExpired())); - oneSecondTimer->start(1000); - twentyMillisecondTimer = new QTimer(this); - connect(twentyMillisecondTimer, SIGNAL(timeout()), this, SLOT(twentyMsTimerExpired())); - twentyMillisecondTimer->start(200); + 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); return true; } void MockDataProvider::endDataFetching() { - oneSecondTimer->stop(); + slowUpdateTimer->stop(); } QString MockDataProvider::sensorType() const @@ -107,7 +111,7 @@ void MockDataProvider::setTagType(int tagType) m_tagType = tagType; } -void MockDataProvider::oneSecondTimerExpired() +void MockDataProvider::slowTimerExpired() { /* Emit the signals even if values are unchanged. * Otherwise the scrolling graphs in UI will not scroll. */ @@ -169,7 +173,7 @@ void MockDataProvider::oneSecondTimerExpired() } -void MockDataProvider::twentyMsTimerExpired() +void MockDataProvider::rapidTimerExpired() { //Rotate counter-clockwise around Z axis accelometerX += xAxisG; |