summaryrefslogtreecommitdiffstats
path: root/tradeshow/iot-sensortag/resources/small
diff options
context:
space:
mode:
authorKari Hautamäki <kari.hautamaki@qt.io>2017-02-06 17:39:54 +0200
committerTitta Heikkala <titta.heikkala@qt.io>2017-02-08 10:16:14 +0000
commiteaec031cc108dd37d9506eb1eda45c42b639c982 (patch)
tree98acdcc192b9a4ac54cf38956ac78c7810443896 /tradeshow/iot-sensortag/resources/small
parent0ad8e201e428f237a5e25d63a70b28041653a3b8 (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')
-rw-r--r--tradeshow/iot-sensortag/resources/small/MainSmall.qml13
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.pngbin15022 -> 0 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.pngbin0 -> 27454 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.pngbin0 -> 22387 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.pngbin0 -> 1190 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.pngbin0 -> 89797 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.pngbin18601 -> 0 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.pngbin880 -> 0 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.pngbin940 -> 0 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Light/light_base_gauge.pngbin9677 -> 22364 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.pngbin5375 -> 21975 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.pngbin21226 -> 0 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.pngbin11591 -> 0 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.pngbin0 -> 32531 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.pngbin0 -> 26613 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.pngbin0 -> 28249 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.pngbin0 -> 28994 bytes
-rw-r--r--tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.pngbin0 -> 40868 bytes
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
deleted file mode 100644
index 16b819b..0000000
--- a/tradeshow/iot-sensortag/resources/small/images/AirPressure/AirPre_base_gauge.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/Altitude/Altitude_base_gauge_outer.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/Altitude/Height_bar.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/Humidity/Hum_combined_all.png
Binary files 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
--- a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_base_gauge.png
+++ /dev/null
Binary files 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
--- a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_max_hum.png
+++ /dev/null
Binary files 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
--- a/tradeshow/iot-sensortag/resources/small/images/Humidity/humidity_min_hum.png
+++ /dev/null
Binary files 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
--- 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 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
--- a/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png
+++ b/tradeshow/iot-sensortag/resources/small/images/Light/light_brightness.png
Binary files 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
--- a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_base_circle.png
+++ /dev/null
Binary files 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
--- a/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_blue.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_green.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_orange.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_display_obj_red.png
Binary files 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
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/small/images/ObjectTemperature/objTemp_outer_inner_ring.png
Binary files differ