diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:03:35 +0200 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:04:13 +0200 |
commit | b1f9ebae32c44ff0dc2315a1c1c363ad98aaf145 (patch) | |
tree | bad33c0a01cc4274dee43c8370a0bdcd08d6fc7f /basicsuite/Sensors | |
parent | 9c48ce0535c7a89e32a4b0f932dc3f61e973018a (diff) | |
parent | 0325d7b4156098ef064f04208905712c5bf0174e (diff) |
Merge branch 'stable' into release
* stable: (50 commits)
Fix deployment of QML import plugins when building in Qt Creator
Add QtWidgets dependecy to shared.pri
Update title and description for Text Input demo
Update content for About Boot to Qt demo
Fix QML GroupBox: Binding loop detected for property
[controls-touch] Deploy images
Remove Sensors demo from the Qt Creator's list of examples
Remove Sensor Explorer and Particles demos from launcher
Fix layout issues with Qt-Everywhere (touchgallery)
[qt5-launchpresentation] Don't crop the description text on nexus
[launcher settings] improve visual appearance
[qt5-everywhere] update preview image
Fix vkb import path
Fix issues in qt5-launcher presentation
Remove Raspberry Pi logo from demo
Fix Canvas2D error
Qt5-Everywhere: show network error message
fix glsl syntax in graphical effects demo
Update copyright year
Limit camera & mediaplayer demos to working devices
...
Change-Id: I1ed9233a89ea989013b398c8480e1932949fff19
Diffstat (limited to 'basicsuite/Sensors')
-rw-r--r-- | basicsuite/Sensors/1.png | bin | 33675 -> 0 bytes | |||
-rw-r--r-- | basicsuite/Sensors/2.png | bin | 27754 -> 0 bytes | |||
-rw-r--r-- | basicsuite/Sensors/3.png | bin | 27841 -> 0 bytes | |||
-rw-r--r-- | basicsuite/Sensors/Accelbubble.qml | 68 | ||||
-rw-r--r-- | basicsuite/Sensors/Light.qml | 50 | ||||
-rw-r--r-- | basicsuite/Sensors/bluebubble.png | bin | 12815 -> 0 bytes | |||
-rw-r--r-- | basicsuite/Sensors/description.txt | 4 | ||||
-rw-r--r-- | basicsuite/Sensors/main.qml | 65 | ||||
-rw-r--r-- | basicsuite/Sensors/preview_l.jpg | bin | 18384 -> 0 bytes |
9 files changed, 0 insertions, 187 deletions
diff --git a/basicsuite/Sensors/1.png b/basicsuite/Sensors/1.png Binary files differdeleted file mode 100644 index 8dd146b..0000000 --- a/basicsuite/Sensors/1.png +++ /dev/null diff --git a/basicsuite/Sensors/2.png b/basicsuite/Sensors/2.png Binary files differdeleted file mode 100644 index 362abaf..0000000 --- a/basicsuite/Sensors/2.png +++ /dev/null diff --git a/basicsuite/Sensors/3.png b/basicsuite/Sensors/3.png Binary files differdeleted file mode 100644 index c8d3f8c..0000000 --- a/basicsuite/Sensors/3.png +++ /dev/null diff --git a/basicsuite/Sensors/Accelbubble.qml b/basicsuite/Sensors/Accelbubble.qml deleted file mode 100644 index c5b75ad..0000000 --- a/basicsuite/Sensors/Accelbubble.qml +++ /dev/null @@ -1,68 +0,0 @@ -import QtQuick 2.0 -import QtSensors 5.0 - -Item { - Rectangle { - id: field - color: "lightblue" - border.width: 1 - border.color: "darkblue" - width: parent.width - height: parent.height - Accelerometer { - id: accel - active:true - onReadingChanged: { - var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * .1) - var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * .1) - - if (newX < 0) - newX = 0 - if (newY < 0) - newY = 0 - - var right = field.width - bubble.width - var bottom = field.height - bubble.height - - if (newX > right) - newX = right - if (newY > bottom) - newY = bottom - - bubble.x = newX - bubble.y = newY - } - } - - Image { - id: bubble - source: "bluebubble.png" - property real centerX: parent.width / 2 - property real centerY: parent.height / 2; - property real bubbleCenter: bubble.width / 2 - x: centerX - bubbleCenter - y: centerY - bubbleCenter - smooth: true - - Behavior on y { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 - } - } - Behavior on x { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 - } - } - } - } - - function calcPitch(x,y,z) { - return Math.atan(y / Math.sqrt(x*x + z*z)) * 57.2957795; - } - function calcRoll(x,y,z) { - return Math.atan(x / Math.sqrt(y*y + z*z)) * 57.2957795; - } -} diff --git a/basicsuite/Sensors/Light.qml b/basicsuite/Sensors/Light.qml deleted file mode 100644 index fceecb7..0000000 --- a/basicsuite/Sensors/Light.qml +++ /dev/null @@ -1,50 +0,0 @@ -import QtQuick 2.0 -import QtSensors 5.0 - -Item { - rotation: 180 - Rectangle { - id: bg - width: parent.width - height: parent.height - Text { - id: illuminanceLevel - anchors.horizontalCenter: parent.horizontalCenter - font.pointSize: 26 - anchors.top: parent.top - } - Image { - id: avatar - anchors.top: illuminanceLevel.bottom - anchors.topMargin: 30 - anchors.centerIn: parent - } - - AmbientLightSensor { - active: true - onReadingChanged: { - if (reading.lightLevel === AmbientLightReading.Dark) { - avatar.source = "3.png" - bg.color = "midnightblue" - } else if (reading.lightLevel === AmbientLightReading.Twilight - || reading.lightLevel === AmbientLightReading.Light) { - avatar.source = "2.png" - bg.color = "steelblue" - } else if (reading.lightLevel === AmbientLightReading.Bright - || reading.lightLevel === AmbientLightReading.Sunny) { - avatar.source = "1.png" - bg.color = "yellow" - } else { - avatar.text = "Unknown light level" - } - } - } - - LightSensor { - active: true - onReadingChanged: { - illuminanceLevel.text = "Illuminance: " + reading.illuminance - } - } - } -} diff --git a/basicsuite/Sensors/bluebubble.png b/basicsuite/Sensors/bluebubble.png Binary files differdeleted file mode 100644 index f96126e..0000000 --- a/basicsuite/Sensors/bluebubble.png +++ /dev/null diff --git a/basicsuite/Sensors/description.txt b/basicsuite/Sensors/description.txt deleted file mode 100644 index f6048cc..0000000 --- a/basicsuite/Sensors/description.txt +++ /dev/null @@ -1,4 +0,0 @@ -This demo utilizes the accelerometer and light sensor readings in an application. - -For the accelometer, tilting the device moves the bubble around. For the light sensor, -exposing the device to different lighting conditions changes the display. diff --git a/basicsuite/Sensors/main.qml b/basicsuite/Sensors/main.qml deleted file mode 100644 index 90d1dcd..0000000 --- a/basicsuite/Sensors/main.qml +++ /dev/null @@ -1,65 +0,0 @@ -import QtQuick 2.0 -import QtSensors 5.0 -import QtSensors 5.0 as Sensors - -Item { - id: root - width: 800 - height: 1280 - - Component { - id: sensorExample - Rectangle { - id: main - width: root.height - height: root.width - rotation: 90 - border.width: 1 - Light { - id: lys - width: main.width - height: main.height / 2 - } - - Accelbubble { - width: main.width - height: main.height / 2 - anchors.top: lys.bottom - } - } - } - - Component { - id: message - Rectangle { - width: root.width - height: root.height - Text { - font.pixelSize: 22 - anchors.centerIn: parent - text: "It appears that this device doesn't provide the required sensors!" - } - } - } - - Loader { - id: pageLoader - anchors.centerIn: parent - } - - Component.onCompleted: { - var typesList = Sensors.QmlSensors.sensorTypes(); - var count = 0 - for (var i = 0; i < typesList.length; ++i) { - if (typesList[i] == "QAccelerometer") - count++ - if (typesList[i] == "QLightSensor") - count++ - } - - if (count > 1) - pageLoader.sourceComponent = sensorExample - else - pageLoader.sourceComponent = message - } -} diff --git a/basicsuite/Sensors/preview_l.jpg b/basicsuite/Sensors/preview_l.jpg Binary files differdeleted file mode 100644 index 3682cdf..0000000 --- a/basicsuite/Sensors/preview_l.jpg +++ /dev/null |