summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tradeshow/iot-sensortag/base.qrc1
-rw-r--r--tradeshow/iot-sensortag/resources/base/HumidityChart.qml5
-rw-r--r--tradeshow/iot-sensortag/resources/base/images/bg_blue.jpgbin0 -> 96777 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/base/main.qml5
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
new file mode 100644
index 0000000..bff57e8
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/base/images/bg_blue.jpg
Binary files differ
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