diff options
13 files changed, 18 insertions, 98 deletions
diff --git a/tradeshow/iot-sensortag/resources/base/RotationPage.qml b/tradeshow/iot-sensortag/resources/base/RotationPage.qml index 60b2d09..6f42058 100644 --- a/tradeshow/iot-sensortag/resources/base/RotationPage.qml +++ b/tradeshow/iot-sensortag/resources/base/RotationPage.qml @@ -54,24 +54,18 @@ import QtQuick.Particles 2.0 Item { id: dialerRoot property var sensor: null - anchors.fill: parent focus: true Image { - id: outerRing - anchors.fill: parent - fillMode: Image.PreserveAspectFit - source: pathPrefix + "Gyro/ring_outer.png" - z: parent.z + 1 + id: ring + anchors.centerIn: parent + source: pathPrefix + "Gyro/gyro_outer.png" } Image { - id: largeRing + id: outerRing anchors.centerIn: parent - width: outerRing.width * 0.8 - fillMode: Image.PreserveAspectFit - source: pathPrefix + "Gyro/ring_large.png" + source: pathPrefix + "Gyro/gyro_ring3.png" rotation: sensor.rotationX - z: parent.z + 2 Behavior on rotation { RotationAnimation { easing.type: Easing.Linear @@ -81,13 +75,10 @@ Item { } } Image { - id: mediumRing + id: largeRing anchors.centerIn: parent - width: outerRing.width * 0.6 - fillMode: Image.PreserveAspectFit - source: pathPrefix + "Gyro/ring_medium.png" + source: pathPrefix + "Gyro/gyro_ring2.png" rotation: sensor.rotationY - z: parent.z + 3 Behavior on rotation { RotationAnimation { easing.type: Easing.Linear @@ -97,13 +88,10 @@ Item { } } Image { - id: centerRing + id: mediumRing anchors.centerIn: parent - width: outerRing.width * 0.4 - fillMode: Image.PreserveAspectFit - source: pathPrefix + "Gyro/ring_small.png" + source: pathPrefix + "Gyro/gyro_ring1.png" rotation: sensor.rotationZ - z: parent.z + 4 Behavior on rotation { RotationAnimation { easing.type: Easing.Linear @@ -112,77 +100,9 @@ Item { } } } - ParticleSystem { - id: particles - anchors.fill: parent - z: parent.z + 5 - ImageParticle { - source: pathPrefix + "Gyro/particle.png" - alpha: 0 - colorVariation: 0.2 - } - Emitter { - property int rateToEmit: Math.abs(sensor.gyroscopeZ_degPerSec) * 4 - id: centerEmitter - x: centerRing.x - y: centerRing.y - width: centerRing.width - height: centerRing.height - emitRate: rateToEmit > 400 ? rateToEmit : 0 - lifeSpan: 1000 - enabled: true - shape: EllipseShape { - fill: false - } - velocity: AngleDirection{ - magnitude: 100 - angleVariation: 0 - angle: 90 - } - size: particles.width / 200 - sizeVariation: 3 - } - Emitter { - property int rateToEmit: Math.abs(sensor.gyroscopeY_degPerSec) * 4 - id: midEmitter - x: mediumRing.x - y: mediumRing.y - width: mediumRing.width - height: mediumRing.height - emitRate: rateToEmit > 400 ? rateToEmit : 0 - lifeSpan: 1000 - enabled: true - shape: EllipseShape { - fill: false - } - velocity: AngleDirection{ - magnitude: 100 - angleVariation: 0 - angle: 90 - } - size: particles.width / 200 - sizeVariation: 3 - } - Emitter { - property int rateToEmit: Math.abs(sensor.gyroscopeX_degPerSec) * 4 - id: largeEmitter - x: largeRing.x - y: largeRing.y - width: largeRing.width - height: largeRing.height - emitRate: rateToEmit > 400 ? rateToEmit : 0 - lifeSpan: 1000 - enabled: true - shape: EllipseShape { - fill: false - } - velocity: AngleDirection{ - magnitude: 100 - angleVariation: 0 - angle: 90 - } - size: particles.width / 200 - sizeVariation: 3 - } + Image { + id: centerRing + anchors.centerIn: parent + source: pathPrefix + "Gyro/gyro_center.png" } } diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_center.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_center.png Binary files differnew file mode 100644 index 0000000..39b923c --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_center.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_outer.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_outer.png Binary files differnew file mode 100644 index 0000000..95a14f6 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_outer.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring1.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring1.png Binary files differnew file mode 100644 index 0000000..d1edff1 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring1.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring2.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring2.png Binary files differnew file mode 100644 index 0000000..37c9882 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring2.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring3.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring3.png Binary files differnew file mode 100644 index 0000000..0e6c829 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/small/images/Gyro/gyro_ring3.png diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/particle.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/particle.png Binary files differdeleted file mode 100644 index d86fc96..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Gyro/particle.png +++ /dev/null diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_large.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_large.png Binary files differdeleted file mode 100644 index fcd1cdc..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_large.png +++ /dev/null diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_medium.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_medium.png Binary files differdeleted file mode 100644 index 14924cc..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_medium.png +++ /dev/null diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_outer.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_outer.png Binary files differdeleted file mode 100644 index 4d4d803..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_outer.png +++ /dev/null diff --git a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_small.png b/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_small.png Binary files differdeleted file mode 100644 index d281f93..0000000 --- a/tradeshow/iot-sensortag/resources/small/images/Gyro/ring_small.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 3ae8cfb..c537f42 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/uismall.qrc b/tradeshow/iot-sensortag/uismall.qrc index 5ca0a62..56dd9d7 100644 --- a/tradeshow/iot-sensortag/uismall.qrc +++ b/tradeshow/iot-sensortag/uismall.qrc @@ -11,11 +11,6 @@ <file>resources/small/images/Toolbar/icon_topbar_cloud.png</file> <file>resources/small/images/Accelometer/inner_ring.png</file> <file>resources/small/images/Accelometer/outer_ring.png</file> - <file>resources/small/images/Gyro/ring_large.png</file> - <file>resources/small/images/Gyro/ring_medium.png</file> - <file>resources/small/images/Gyro/ring_outer.png</file> - <file>resources/small/images/Gyro/ring_small.png</file> - <file>resources/small/images/Gyro/particle.png</file> <file>resources/small/images/AmbientTemperature/temp_ring.png</file> <file>resources/small/images/AmbientTemperature/temp_sensor.png</file> <file>resources/small/images/Magnetometer/grid.png</file> @@ -30,5 +25,10 @@ <file>resources/small/images/Altitude/Height_bar.png</file> <file>resources/small/images/Altitude/Altitude_base_gauge.png</file> <file>resources/small/images/Altitude/Altitude_base_gauge_outer.png</file> + <file>resources/small/images/Gyro/gyro_center.png</file> + <file>resources/small/images/Gyro/gyro_ring1.png</file> + <file>resources/small/images/Gyro/gyro_ring2.png</file> + <file>resources/small/images/Gyro/gyro_ring3.png</file> + <file>resources/small/images/Gyro/gyro_outer.png</file> </qresource> </RCC> |
