diff options
author | Kari Hautamäki <kari.hautamaki@qt.io> | 2017-02-01 17:41:53 +0200 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-02 05:13:32 +0000 |
commit | 71859115ecb5defd82687a03fbbe56a6bc985255 (patch) | |
tree | 01d4e3c588aec3a5eab0417e8ba79bc1dae66bba /tradeshow/iot-sensortag | |
parent | 80da360e5213c0481ba7c19a463129eb19e3d7fa (diff) |
Background image added and humity chart tweaked
- Blue background image added that is used in all UI variants
- Readings in HumidityChart tweaked to show 0% when starting the app
Change-Id: I8cca1cf4cafdd83063a6bcf9b98572839906dac3
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag')
-rw-r--r-- | tradeshow/iot-sensortag/base.qrc | 1 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/base/HumidityChart.qml | 5 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/base/images/bg_blue.jpg | bin | 0 -> 96777 bytes | |||
-rw-r--r-- | tradeshow/iot-sensortag/resources/base/main.qml | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/tradeshow/iot-sensortag/base.qrc b/tradeshow/iot-sensortag/base.qrc index 3d99d9f..685269f 100644 --- a/tradeshow/iot-sensortag/base.qrc +++ b/tradeshow/iot-sensortag/base.qrc @@ -19,5 +19,6 @@ <file>resources/base/fonts/titilliumweb/TitilliumWeb-Bold.ttf</file> <file>resources/base/fonts/titilliumweb/TitilliumWeb-Regular.ttf</file> <file>resources/base/fonts/titilliumweb/TitilliumWeb-SemiBold.ttf</file> + <file>resources/base/images/bg_blue.jpg</file> </qresource> </RCC> diff --git a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml index fdffc5a..c94448f 100644 --- a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml +++ b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml @@ -69,14 +69,12 @@ BaseChart { content: Item { anchors.fill: parent - property alias humiText: humidityMainText.text property real maxHumi: 0 - property real minHumi: 1000 + property real minHumi: 0 function getMaxOchMinHum() { humidityValue = sensor.relativeHumidity; - contentItem.humiText = humidityValue.toFixed(1) + " %"; if (humidityValue > contentItem.maxHumi) { @@ -105,6 +103,7 @@ BaseChart { anchors.centerIn: parent color: "white" + text: humidityValue.toFixed(1) + " %" } } diff --git a/tradeshow/iot-sensortag/resources/base/images/bg_blue.jpg b/tradeshow/iot-sensortag/resources/base/images/bg_blue.jpg Binary files differnew file mode 100644 index 0000000..bff57e8 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/base/images/bg_blue.jpg diff --git a/tradeshow/iot-sensortag/resources/base/main.qml b/tradeshow/iot-sensortag/resources/base/main.qml index 8f092ba..679a8dc 100644 --- a/tradeshow/iot-sensortag/resources/base/main.qml +++ b/tradeshow/iot-sensortag/resources/base/main.qml @@ -63,6 +63,11 @@ Window { visible: true color: "black" + Image { + source: "images/bg_blue.jpg" + anchors.fill: parent + } + Loader { id: contentLoader |