diff options
author | Kari Hautamäki <kari.hautamaki@qt.io> | 2017-02-08 11:22:46 +0200 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-09 05:30:25 +0000 |
commit | 17e7603fb93554238224d4b0b0c89b867bd3d189 (patch) | |
tree | 342e1c00179f4d87db6a834b34f8d444b15b093e /tradeshow | |
parent | 2444e187bca15832c25845d69789e7926a23f170 (diff) |
iot-sensortag: Zero level altitude in mock data provider
- Zero level for altitude is set in mock data provider
- Fix alignment problem in AltitudeChart
Change-Id: I67f1ef9296201a0990cd17d79f33971441e15b32
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow')
-rw-r--r-- | tradeshow/iot-sensortag/mockdataprovider.cpp | 13 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/mockdataprovider.h | 3 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/base/AltitudeChart.qml | 20 |
3 files changed, 26 insertions, 10 deletions
diff --git a/tradeshow/iot-sensortag/mockdataprovider.cpp b/tradeshow/iot-sensortag/mockdataprovider.cpp index 90fbcce..075b308 100644 --- a/tradeshow/iot-sensortag/mockdataprovider.cpp +++ b/tradeshow/iot-sensortag/mockdataprovider.cpp @@ -69,6 +69,7 @@ MockDataProvider::MockDataProvider(QString id, QObject* parent) irObjectTemperature = 25; barometerCelsiusTemperature = 25; barometerHPa = 1040; + pressureAtZeroAltitude = 1040; accelometerX = 1; accelometerZ = 0; magnetometerMicroT_xAxis = 333; @@ -235,3 +236,15 @@ void MockDataProvider::rapidTimerExpired() rotationDegPerSecZIncrease *= -1; emit gyroscopeDegPerSecChanged(); } + +void MockDataProvider::reset() +{ + rotation_x = 0; + rotation_y = 0; + rotation_z = 0; + emit rotationXChanged(); + emit rotationYChanged(); + emit rotationZChanged(); + + pressureAtZeroAltitude = 1040; +} diff --git a/tradeshow/iot-sensortag/mockdataprovider.h b/tradeshow/iot-sensortag/mockdataprovider.h index 5b70b16..7f2c032 100644 --- a/tradeshow/iot-sensortag/mockdataprovider.h +++ b/tradeshow/iot-sensortag/mockdataprovider.h @@ -71,8 +71,9 @@ public: public slots: void slowTimerExpired(); void rapidTimerExpired(); + protected: - void reset() {} + void reset() override; private: QTimer *slowUpdateTimer; diff --git a/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml b/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml index b9394d2..8e95834 100644 --- a/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml +++ b/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml @@ -68,14 +68,16 @@ BaseChart { } } - onSensorChanged: if (sensor) { - sensor.altitudeChanged.connect(this, function() { - altitude = sensor.altitude; - altitudeRounded = Math.floor(altitude + 0.5).toFixed(0); - if (altitudeRounded > maxAltitude) - maxAltitude = altitudeRounded; - }); - } + onSensorChanged: { + if (sensor) { + sensor.altitudeChanged.connect(this, function() { + altitude = sensor.altitude; + altitudeRounded = Math.floor(altitude + 0.5).toFixed(0); + if (altitudeRounded > maxAltitude) + maxAltitude = altitudeRounded; + }); + } + } content: Item { id: container @@ -141,8 +143,8 @@ BaseChart { Text { text: "m" color: "white" - horizontalAlignment: Text.AlignHCenter font.pixelSize: 16 + anchors.horizontalCenter: pressureText.horizontalCenter } } } |