From cf2ec248f2c8d6fabc539f2acef4df5d3c0e8b6c Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 20 Sep 2017 09:35:56 +0200 Subject: 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 --- .../iot-sensortag/resources/medium/MainMedium.qml | 177 --------------------- .../iot-sensortag/resources/medium/StyleMedium.qml | 59 ------- .../images/AirPressure/AirPre_base_gauge.png | Bin 23594 -> 0 bytes .../AmbientTemperature/ambTemp_display_amb.png | Bin 4744 -> 0 bytes .../medium/images/General/icon_sensor.png | Bin 691 -> 0 bytes .../resources/medium/images/General/separator.png | Bin 966 -> 0 bytes .../medium/images/Humidity/humidity_base_gauge.png | Bin 29413 -> 0 bytes .../medium/images/Humidity/humidity_max_hum.png | Bin 1356 -> 0 bytes .../medium/images/Humidity/humidity_min_hum.png | Bin 1432 -> 0 bytes .../medium/images/Light/light_base_gauge.png | Bin 15242 -> 0 bytes .../medium/images/Light/light_brightness.png | Bin 8479 -> 0 bytes .../ObjectTemperature/objTemp_base_circle.png | Bin 35320 -> 0 bytes .../ObjectTemperature/objTemp_display_obj.png | Bin 17544 -> 0 bytes 13 files changed, 236 deletions(-) delete mode 100644 tradeshow/iot-sensortag/resources/medium/MainMedium.qml delete mode 100644 tradeshow/iot-sensortag/resources/medium/StyleMedium.qml delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/AirPressure/AirPre_base_gauge.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/AmbientTemperature/ambTemp_display_amb.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/General/icon_sensor.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/General/separator.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_base_gauge.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_max_hum.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_min_hum.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/Light/light_base_gauge.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/Light/light_brightness.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_base_circle.png delete mode 100644 tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_display_obj.png (limited to 'tradeshow/iot-sensortag/resources/medium') diff --git a/tradeshow/iot-sensortag/resources/medium/MainMedium.qml b/tradeshow/iot-sensortag/resources/medium/MainMedium.qml deleted file mode 100644 index d855c0e..0000000 --- a/tradeshow/iot-sensortag/resources/medium/MainMedium.qml +++ /dev/null @@ -1,177 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.6 -import SensorTag.DataProvider 1.0 -import "../base" - -Item { - id: main - - width: 1920 - height: 1080 - - Component.onCompleted: { - dataProviderPool.startScanning() - } - - Connections { - target: dataProviderPool - onScanFinished: { - 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); - } - } - - Column { - id: leftPane - - property int indicatorHeight: height / 4 - spacing - - anchors.left: parent.left - anchors.leftMargin: 8 - anchors.top: main.top - anchors.bottom: main.bottom - width: 360 - spacing: 16 - - TemperatureChart { - id: ambientTemp - - width: leftPane.width - height: leftPane.indicatorHeight - } - - ObjectTemperatureChart { - id: objectTemp - - width: leftPane.width - height: leftPane.indicatorHeight - } - - HumidityChart { - id: humidity - - width: leftPane.width - height: leftPane.indicatorHeight - } - -// AirPressureChart { -// id: airPressure - -// width: leftPane.width -// height: leftPane.indicatorHeight -// } - } - - Column { - id: rightPane - - anchors.right: parent.right - anchors.rightMargin: 8 - anchors.top: main.top - anchors.bottom: main.bottom - width: 360 - spacing: 16 - - LightChart { - id: light - - width: rightPane.width - height: leftPane.height / 4 - } - - MagnetometerChart { - id: magnetometer - - width: rightPane.width - height: leftPane.height / 4 - } - - GyroPage { - id: rotation - - width: rightPane.width - height: leftPane.height / 4 - onClicked: mainContainer.source = "../base/GyroPage.qml" - } - } - - Loader { - id: mainContainer - - anchors.top: topToolbar.bottom - anchors.left: leftPane.right - anchors.leftMargin: 32 - anchors.right: rightPane.left - anchors.rightMargin: 32 - anchors.bottom: bottomToolbar.top - } - - TopToolbar { - id: topToolbar - - anchors.left: leftPane.right - anchors.right: rightPane.left - } - - BottomToolbar { - id: bottomToolbar - - anchors.left: leftPane.right - anchors.right: rightPane.left - anchors.bottom: main.bottom - height: 30 - } -} diff --git a/tradeshow/iot-sensortag/resources/medium/StyleMedium.qml b/tradeshow/iot-sensortag/resources/medium/StyleMedium.qml deleted file mode 100644 index e4d439d..0000000 --- a/tradeshow/iot-sensortag/resources/medium/StyleMedium.qml +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -pragma Singleton -import QtQuick 2.0 - -QtObject { - property int indicatorTitleFontSize: 22 - property int indicatorTitleSize: 41 - - property int topToolbarSmallFontSize: 20 - property int topToolbarLargeFontSize: 62 -} diff --git a/tradeshow/iot-sensortag/resources/medium/images/AirPressure/AirPre_base_gauge.png b/tradeshow/iot-sensortag/resources/medium/images/AirPressure/AirPre_base_gauge.png deleted file mode 100644 index 2f1d658..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/AirPressure/AirPre_base_gauge.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/AmbientTemperature/ambTemp_display_amb.png b/tradeshow/iot-sensortag/resources/medium/images/AmbientTemperature/ambTemp_display_amb.png deleted file mode 100644 index cad440a..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/AmbientTemperature/ambTemp_display_amb.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/General/icon_sensor.png b/tradeshow/iot-sensortag/resources/medium/images/General/icon_sensor.png deleted file mode 100644 index 49cc090..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/General/icon_sensor.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/General/separator.png b/tradeshow/iot-sensortag/resources/medium/images/General/separator.png deleted file mode 100644 index dbd25a4..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/General/separator.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_base_gauge.png b/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_base_gauge.png deleted file mode 100644 index 494a0e6..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_base_gauge.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_max_hum.png b/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_max_hum.png deleted file mode 100644 index c4a7d7b..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_max_hum.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_min_hum.png b/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_min_hum.png deleted file mode 100644 index 75b83d1..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/Humidity/humidity_min_hum.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/Light/light_base_gauge.png b/tradeshow/iot-sensortag/resources/medium/images/Light/light_base_gauge.png deleted file mode 100644 index 9c66fbb..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/Light/light_base_gauge.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/Light/light_brightness.png b/tradeshow/iot-sensortag/resources/medium/images/Light/light_brightness.png deleted file mode 100644 index fc8e82a..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/Light/light_brightness.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_base_circle.png b/tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_base_circle.png deleted file mode 100644 index 86c966f..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_base_circle.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_display_obj.png b/tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_display_obj.png deleted file mode 100644 index 77d53f3..0000000 Binary files a/tradeshow/iot-sensortag/resources/medium/images/ObjectTemperature/objTemp_display_obj.png and /dev/null differ -- cgit v1.2.3