summaryrefslogtreecommitdiffstats
path: root/tradeshow/iot-sensortag/resources
diff options
context:
space:
mode:
Diffstat (limited to 'tradeshow/iot-sensortag/resources')
-rw-r--r--tradeshow/iot-sensortag/resources/base/AccelChart.qml16
-rw-r--r--tradeshow/iot-sensortag/resources/base/AltitudeChart.qml15
-rw-r--r--tradeshow/iot-sensortag/resources/base/HumidityChart.qml25
-rw-r--r--tradeshow/iot-sensortag/resources/base/LightChart.qml21
-rw-r--r--tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml17
-rw-r--r--tradeshow/iot-sensortag/resources/base/TemperatureChart.qml17
6 files changed, 34 insertions, 77 deletions
diff --git a/tradeshow/iot-sensortag/resources/base/AccelChart.qml b/tradeshow/iot-sensortag/resources/base/AccelChart.qml
index 92f8b50..10a7758 100644
--- a/tradeshow/iot-sensortag/resources/base/AccelChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/AccelChart.qml
@@ -52,27 +52,17 @@ import SensorTag.DataProvider 1.0
BaseChart {
- property real acceXValue
- property real acceYValue
- property real acceZValue
+ property real acceXValue: sensor ? sensor.accelometer_xAxis.toFixed(1) : 0
+ property real acceYValue: sensor ? sensor.accelometer_yAxis.toFixed(1) : 0
+ property real acceZValue: sensor ? sensor.accelometer_zAxis.toFixed(1) : 0
antialiasing: true
title: qsTr("Accelometer")
rightSide: true
- onSensorChanged: if (sensor) {
- sensor.accelometerChanged.connect(contentItem.updateAcceValues)
- }
-
content: Item {
anchors.fill: parent
- function updateAcceValues() {
- acceXValue = sensor.accelometer_xAxis.toFixed(1)
- acceYValue = sensor.accelometer_yAxis.toFixed(1)
- acceZValue = sensor.accelometer_zAxis.toFixed(1)
- }
-
Row {
id: itemRow
anchors.fill: parent
diff --git a/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml b/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml
index 8e95834..2c05bc7 100644
--- a/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/AltitudeChart.qml
@@ -52,7 +52,7 @@ import SensorTag.DataProvider 1.0
import QtGraphicalEffects 1.0
BaseChart {
- property real altitude
+ property real altitude: sensor ? sensor.altitude : 0
property real altitudeRounded
property real maxAltitude
@@ -68,15 +68,10 @@ 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;
- });
- }
+ onAltitudeChanged: {
+ altitudeRounded = Math.floor(altitude + 0.5).toFixed(0)
+ if (altitudeRounded > maxAltitude)
+ maxAltitude = altitudeRounded
}
content: Item {
diff --git a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
index f144a8f..60d1ee7 100644
--- a/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/HumidityChart.qml
@@ -57,34 +57,23 @@ import QtQuick.Extras 1.4
BaseChart {
property int humiditySeriesIndex: 0
property int maxNumOfHumiReadings: 30
- property real humidityValue: 0
antialiasing: true
title: qsTr("Humidity")
- onSensorChanged: if (sensor) {
- sensor.relativeHumidityChanged.connect(contentItem.getMaxOchMinHum)
- }
-
content: Item {
anchors.fill: parent
+ property real humidityValue: sensor ? sensor.relativeHumidity : 0
property real maxHumi: 0
- property real minHumi: 0
+ property real minHumi: 100
- function getMaxOchMinHum()
- {
- humidityValue = sensor.relativeHumidity;
+ onHumidityValueChanged: {
+ if (humidityValue > maxHumi)
+ maxHumi = humidityValue
- if (humidityValue > contentItem.maxHumi)
- {
- contentItem.maxHumi = humidityValue
- }
-
- if (humidityValue < contentItem.minHumi)
- {
- contentItem.minHumi = humidityValue;
- }
+ if (humidityValue < minHumi)
+ minHumi = humidityValue
}
Image {
diff --git a/tradeshow/iot-sensortag/resources/base/LightChart.qml b/tradeshow/iot-sensortag/resources/base/LightChart.qml
index f170e81..a51787d 100644
--- a/tradeshow/iot-sensortag/resources/base/LightChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/LightChart.qml
@@ -57,10 +57,6 @@ BaseChart {
title: qsTr("Light Intensity")
rightSide: true
- onSensorChanged: if (sensor) {
- sensor.lightIntensityChanged.connect(contentItem.getLightText)
- }
-
content: Item {
id: container
@@ -68,21 +64,18 @@ BaseChart {
property alias lightText: lightMainText.text
property alias lightImg: brightnessImg
- property real lightValue: 0
+ property real lightValue: sensor ? sensor.lightIntensityLux : 0
property real maxLightValue: 1
property real normalizedLightValue: 0
- function getLightText()
- {
- lightValue = sensor.lightIntensityLux;
- contentItem.lightText = lightValue.toFixed(1);
+ onLightValueChanged: {
+ contentItem.lightText = lightValue.toFixed(1)
if (lightValue > maxLightValue)
- {
- maxLightValue = lightValue;
- }
- normalizedLightValue = lightValue / maxLightValue;
- lightImg.opacity = normalizedLightValue;
+ maxLightValue = lightValue
+
+ normalizedLightValue = lightValue / maxLightValue
+ lightImg.opacity = normalizedLightValue
}
Image {
diff --git a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
index f06f165..ffba32b 100644
--- a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml
@@ -55,20 +55,15 @@ BaseChart {
property real minValue: Number.MAX_VALUE
property real maxValue: Number.MIN_VALUE
- property real value
-
- function updateTemps(){
- value = sensor.infraredObjectTemperature.toFixed(1);
- if (minValue > value)
- minValue = value;
- if (maxValue < value)
- maxValue = value;
- }
+ property real value: sensor ? sensor.infraredObjectTemperature.toFixed(1) : 0
title: qsTr("Object Temperature")
- onSensorChanged: if (sensor) {
- sensor.infraredObjectTemperatureChanged.connect(updateTemps)
+ onValueChanged: {
+ if (minValue > value)
+ minValue = value
+ if (maxValue < value)
+ maxValue = value
}
content: Item {
diff --git a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
index 8bb1a25..7ecaf66 100644
--- a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml
@@ -62,13 +62,16 @@ BaseChart {
property real defaultAvgValue: (maximum + minimum) / 2
property real minValue: defaultAvgValue
property real maxValue: defaultAvgValue
- property real value
+ property real value: sensor ? sensor.infraredAmbientTemperature : 0
readonly property color legendColor: "white"
readonly property color chartColor: "#15bdff"
- onSensorChanged: if (sensor) {
- sensor.infraredAmbientTemperatureChanged.connect(contentItem.updateTemperatureGraph)
+ onValueChanged: {
+ if (minValue > value)
+ minValue = value;
+ if (maxValue < value)
+ maxValue = value;
}
title: qsTr("Ambient Temperature")
@@ -84,14 +87,6 @@ BaseChart {
}
}
- function updateTemperatureGraph() {
- var value = sensor.infraredAmbientTemperature;
- if (minValue > value)
- minValue = value;
- if (maxValue < value)
- maxValue = value;
- }
-
Item {
id: valueReading