From eaec031cc108dd37d9506eb1eda45c42b639c982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kari=20Hautam=C3=A4ki?= Date: Mon, 6 Feb 2017 17:39:54 +0200 Subject: iot-sensortag: Visual style updated for most of the charts - Updated appearance and graphics of ambient and object temperature, air pressure, humidity and light charts. - Removed AirPressure chart - Added Altitude chart - Added altitude information to SensorTagData and derived classes Change-Id: Ief8eb9dd4f87f967b037eed3e9a4dd12c3c6efc9 Reviewed-by: Titta Heikkala --- .../iot-sensortag/resources/small/MainSmall.qml | 13 ++----------- .../small/images/AirPressure/AirPre_base_gauge.png | Bin 15022 -> 0 bytes .../small/images/Altitude/Altitude_base_gauge.png | Bin 0 -> 27454 bytes .../images/Altitude/Altitude_base_gauge_outer.png | Bin 0 -> 22387 bytes .../resources/small/images/Altitude/Height_bar.png | Bin 0 -> 1190 bytes .../small/images/Humidity/Hum_combined_all.png | Bin 0 -> 89797 bytes .../small/images/Humidity/humidity_base_gauge.png | Bin 18601 -> 0 bytes .../small/images/Humidity/humidity_max_hum.png | Bin 880 -> 0 bytes .../small/images/Humidity/humidity_min_hum.png | Bin 940 -> 0 bytes .../small/images/Light/light_base_gauge.png | Bin 9677 -> 22364 bytes .../small/images/Light/light_brightness.png | Bin 5375 -> 21975 bytes .../images/ObjectTemperature/objTemp_base_circle.png | Bin 21226 -> 0 bytes .../images/ObjectTemperature/objTemp_display_obj.png | Bin 11591 -> 0 bytes .../ObjectTemperature/objTemp_display_obj_blue.png | Bin 0 -> 32531 bytes .../ObjectTemperature/objTemp_display_obj_green.png | Bin 0 -> 26613 bytes .../ObjectTemperature/objTemp_display_obj_orange.png | Bin 0 -> 28249 bytes .../ObjectTemperature/objTemp_display_obj_red.png | Bin 0 -> 28994 bytes .../ObjectTemperature/objTemp_outer_inner_ring.png | Bin 0 -> 40868 bytes 18 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.png delete mode 100644 tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.png delete mode 100644 tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.png delete mode 100644 tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.png delete mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.png delete mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.png (limited to 'tradeshow/iot-sensortag/resources/small') diff --git a/tradeshow/iot-sensortag/resources/small/MainSmall.qml b/tradeshow/iot-sensortag/resources/small/MainSmall.qml index 6d87009..f3d49a8 100644 --- a/tradeshow/iot-sensortag/resources/small/MainSmall.qml +++ b/tradeshow/iot-sensortag/resources/small/MainSmall.qml @@ -107,7 +107,7 @@ Item { height: leftPane.indicatorHeight } - AirPressureChart { + AltitudeChart { id: airPressure width: leftPane.width @@ -180,7 +180,7 @@ Item { anchors.leftMargin: 32 anchors.right: rightPane.left anchors.rightMargin: 32 - anchors.bottom: bottomToolbar.top + anchors.bottom: parent.bottom } @@ -191,13 +191,4 @@ Item { anchors.left: main.left anchors.right: main.right } - - BottomToolbar { - id: bottomToolbar - - anchors.left: leftPane.right - anchors.right: rightPane.left - anchors.bottom: main.bottom - height: 30 - } } diff --git a/tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.png b/tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.png deleted file mode 100644 index 16b819b..0000000 Binary files a/tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.png b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.png new file mode 100644 index 0000000..296079f Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.png b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.png new file mode 100644 index 0000000..b47b140 Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png b/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png new file mode 100644 index 0000000..aa2cab6 Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.png b/tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.png new file mode 100644 index 0000000..b58297b Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.png b/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.png deleted file mode 100644 index 3ecd62d..0000000 Binary files a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.png b/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.png deleted file mode 100644 index 8bff102..0000000 Binary files a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.png b/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.png deleted file mode 100644 index 416e376..0000000 Binary files a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.png b/tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.png index 8bc33a9..3ae8cfb 100644 Binary files a/tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.png and b/tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png b/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png index e47ce5f..710be6c 100644 Binary files a/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png and b/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.png deleted file mode 100644 index cdf7961..0000000 Binary files a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.png deleted file mode 100644 index 53ac672..0000000 Binary files a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.png and /dev/null differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.png new file mode 100644 index 0000000..b19269e Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.png new file mode 100644 index 0000000..72bedea Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.png new file mode 100644 index 0000000..6120949 Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.png new file mode 100644 index 0000000..721a21c Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.png b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.png new file mode 100644 index 0000000..2a81b5e Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.png differ -- cgit v1.2.3