diff options
author | Kari Hautamäki <kari.hautamaki@qt.io> | 2017-02-06 17:39:54 +0200 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-08 10:16:14 +0000 |
commit | eaec031cc108dd37d9506eb1eda45c42b639c982 (patch) | |
tree | 98acdcc192b9a4ac54cf38956ac78c7810443896 /tradeshow/iot-sensortag/resources/small | |
parent | 0ad8e201e428f237a5e25d63a70b28041653a3b8 (diff) |
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 <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/resources/small')
18 files changed, 2 insertions, 11 deletions
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 Binary files differdeleted file mode 100644 index 16b819b..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.png +++ /dev/null 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 Binary files differnew file mode 100644 index 0000000..296079f --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.png 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 Binary files differnew file mode 100644 index 0000000..b47b140 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png b/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png Binary files differnew file mode 100644 index 0000000..aa2cab6 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png 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 Binary files differnew file mode 100644 index 0000000..b58297b --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.png 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 Binary files differdeleted file mode 100644 index 3ecd62d..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8bff102..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 416e376..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.png +++ /dev/null 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 Binary files differindex 8bc33a9..3ae8cfb 100644 --- a/tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.png +++ b/tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png b/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png Binary files differindex e47ce5f..710be6c 100644 --- a/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png +++ b/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png 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 Binary files differdeleted file mode 100644 index cdf7961..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 53ac672..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.png +++ /dev/null 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 Binary files differnew file mode 100644 index 0000000..b19269e --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.png 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 Binary files differnew file mode 100644 index 0000000..72bedea --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.png 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 Binary files differnew file mode 100644 index 0000000..6120949 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.png 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 Binary files differnew file mode 100644 index 0000000..721a21c --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.png 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 Binary files differnew file mode 100644 index 0000000..2a81b5e --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.png |