summaryrefslogtreecommitdiffstats
path: root/tradeshow/iot-sensortag/resources/small
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2017-09-20 09:35:56 +0200
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2017-09-27 06:35:24 +0000
commitcf2ec248f2c8d6fabc539f2acef4df5d3c0e8b6c (patch)
tree01c4feef45ddf310113a7f2f2d5b06e20b443fbe /tradeshow/iot-sensortag/resources/small
parent55ce120e6ceccb40f19a941fbda05edefd22d64c (diff)
iot-sensortag: Redesign of example
The updated version switches the focus from having multiple sensors locally towards showing one sensor from a list. This list can display local or remote sensors and switch on runtime. Also incorporated many style fixes and cleanups. Change-Id: If7b8acbb2a784ebba95d467176e76728721c82f7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/resources/small')
-rw-r--r--tradeshow/iot-sensortag/resources/small/MainSmall.qml29
1 files changed, 10 insertions, 19 deletions
diff --git a/tradeshow/iot-sensortag/resources/small/MainSmall.qml b/tradeshow/iot-sensortag/resources/small/MainSmall.qml
index 83835e3..7528b6b 100644
--- a/tradeshow/iot-sensortag/resources/small/MainSmall.qml
+++ b/tradeshow/iot-sensortag/resources/small/MainSmall.qml
@@ -55,30 +55,20 @@ Item {
id: main
function startRescan(sensor) {
- if (sensor.state === SensorTagData.NotFound)
- dataProviderPool.startScanning();
- else if (sensor.state === SensorTagData.Scanning)
- dataProviderPool.disconnectProvider(sensor.providerId)
- else if (sensor.state !== SensorTagData.Connected)
- sensor.startServiceScan();
+ // ### Only do this magic when a local device is connected
+// if (sensor.state === SensorTagData.NotFound)
+// dataProviderPool.startScanning();
+// else if (sensor.state === SensorTagData.Scanning)
+// dataProviderPool.disconnectProvider(sensor.providerId)
+// else if (sensor.state !== SensorTagData.Connected)
+// sensor.startServiceScan();
}
anchors.fill: parent
Component.onCompleted: {
- dataProviderPool.startScanning();
-
- // UI gets information about the intended setup of the
- // sensor even though they have not been really discovered yet
- ambientTemp.sensor = dataProviderPool.getProvider(SensorTagData.AmbientTemperature);
- objectTemp.sensor = dataProviderPool.getProvider(SensorTagData.ObjectTemperature);
- humidity.sensor = dataProviderPool.getProvider(SensorTagData.Humidity);
- airPressure.sensor = dataProviderPool.getProvider(SensorTagData.AirPressure);
- light.sensor = dataProviderPool.getProvider(SensorTagData.Light);
- magnetometer.sensor = dataProviderPool.getProvider(SensorTagData.Magnetometer);
- rotation.sensor = dataProviderPool.getProvider(SensorTagData.Rotation);
- accelometer.sensor = dataProviderPool.getProvider(SensorTagData.Accelometer);
- rotationMain.sensor = dataProviderPool.getProvider(SensorTagData.Rotation);
+ localProviderPool.startScanning();
+ remoteProviderPool.startScanning();
}
Column {
@@ -172,6 +162,7 @@ Item {
RotationPage {
id: rotationMain
+ visible: main.width > (leftPane.width + rightPane.width + 800)
anchors.top: topToolbar.bottom
anchors.left: leftPane.right
anchors.leftMargin: 32