diff options
author | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-01 10:24:44 +0200 |
---|---|---|
committer | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-02-01 08:56:21 +0000 |
commit | 7cfb17d7db0ffc79210fe6c24e8c358eaf535e65 (patch) | |
tree | c3b630c3bc5745000937488fd08096b68999c1db /tradeshow/iot-sensortag/resources/small | |
parent | 518c73c59a71911b65ae5d3240b22ea9f5878961 (diff) |
iot-sensortag: Add Accelometer chart
Added new accelometer chart. Updated the ui-layout and images.
Change-Id: Id8474e533f39f5c8178b487fc9bc03d7ea956772
Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/resources/small')
-rw-r--r-- | tradeshow/iot-sensortag/resources/small/MainSmall.qml | 14 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/small/images/Accelometer/inner_ring.png | bin | 0 -> 4657 bytes | |||
-rw-r--r-- | tradeshow/iot-sensortag/resources/small/images/Accelometer/outer_ring.png | bin | 0 -> 9239 bytes | |||
-rw-r--r-- | tradeshow/iot-sensortag/resources/small/images/General/icon_sensor.png | bin | 489 -> 407 bytes | |||
-rw-r--r-- | tradeshow/iot-sensortag/resources/small/images/Toolbar/topbar_all.png | bin | 1840 -> 8895 bytes |
5 files changed, 11 insertions, 3 deletions
diff --git a/tradeshow/iot-sensortag/resources/small/MainSmall.qml b/tradeshow/iot-sensortag/resources/small/MainSmall.qml index 4044b32..1f46093 100644 --- a/tradeshow/iot-sensortag/resources/small/MainSmall.qml +++ b/tradeshow/iot-sensortag/resources/small/MainSmall.qml @@ -70,6 +70,7 @@ Item { light.sensor = dataProviderPool.getProvider(SensorTagData.Light); magnetometer.sensor = dataProviderPool.getProvider(SensorTagData.Magnetometer); rotation.sensor = dataProviderPool.getProvider(SensorTagData.Rotation); + accelometer.sensor = dataProviderPool.getProvider(SensorTagData.Accelometer); } } @@ -136,21 +137,21 @@ Item { id: light width: rightPane.width - height: leftPane.height / 4 + height: rightPane.height / 4 } MagnetometerChart { id: magnetometer width: rightPane.width - height: leftPane.height * 0.3 + height: rightPane.height * 0.3 - 30 } GyroChart { id: rotation width: rightPane.width - height: leftPane.height * 0.3 + height: rightPane.height * 0.3 - 60 onClicked: { //mainContainer.source = "../base/GyroPage.qml"; gyroConnection.enabled = true; @@ -169,6 +170,13 @@ Item { } } } + + AccelChart { + id: accelometer + + width: rightPane.width + height: rightPane.height - light.height - magnetometer.height - rotation.height - 3 * rightPane.spacing + } } Loader { diff --git a/tradeshow/iot-sensortag/resources/small/images/Accelometer/inner_ring.png b/tradeshow/iot-sensortag/resources/small/images/Accelometer/inner_ring.png Binary files differnew file mode 100644 index 0000000..aeaa36a --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Accelometer/inner_ring.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Accelometer/outer_ring.png b/tradeshow/iot-sensortag/resources/small/images/Accelometer/outer_ring.png Binary files differnew file mode 100644 index 0000000..80cd670 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Accelometer/outer_ring.png diff --git a/tradeshow/iot-sensortag/resources/small/images/General/icon_sensor.png b/tradeshow/iot-sensortag/resources/small/images/General/icon_sensor.png Binary files differindex e7aed60..a1286e8 100644 --- a/tradeshow/iot-sensortag/resources/small/images/General/icon_sensor.png +++ b/tradeshow/iot-sensortag/resources/small/images/General/icon_sensor.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Toolbar/topbar_all.png b/tradeshow/iot-sensortag/resources/small/images/Toolbar/topbar_all.png Binary files differindex 85d85dc..992318b 100644 --- a/tradeshow/iot-sensortag/resources/small/images/Toolbar/topbar_all.png +++ b/tradeshow/iot-sensortag/resources/small/images/Toolbar/topbar_all.png |