From f57241666fd4b7074cbe33567827293e2a0a9ad5 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sun, 18 Nov 2012 18:11:39 +1000 Subject: add a way to collect sensor dump in the format the autotests can use. Change-Id: Iec9be6e858aabd579ea61e48fd5b9d884c980fc3 Reviewed-by: Thomas McGuire --- tests/manual/sensorclerk/collector.cpp | 190 +++++++++++++++++++++++++++++++ tests/manual/sensorclerk/collector.h | 89 +++++++++++++++ tests/manual/sensorclerk/main.cpp | 63 ++++++++++ tests/manual/sensorclerk/qml/Button.qml | 129 +++++++++++++++++++++ tests/manual/sensorclerk/qml/main.qml | 76 +++++++++++++ tests/manual/sensorclerk/sensorclerk.pro | 11 ++ 6 files changed, 558 insertions(+) create mode 100644 tests/manual/sensorclerk/collector.cpp create mode 100644 tests/manual/sensorclerk/collector.h create mode 100644 tests/manual/sensorclerk/main.cpp create mode 100644 tests/manual/sensorclerk/qml/Button.qml create mode 100644 tests/manual/sensorclerk/qml/main.qml create mode 100644 tests/manual/sensorclerk/sensorclerk.pro diff --git a/tests/manual/sensorclerk/collector.cpp b/tests/manual/sensorclerk/collector.cpp new file mode 100644 index 00000000..afe195fc --- /dev/null +++ b/tests/manual/sensorclerk/collector.cpp @@ -0,0 +1,190 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Lorn Potter. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "collector.h" + +Collector::Collector(QObject *parent) + : QObject(parent), + accel(0), + orientation(0), + proximity(0), + irProx(0), + tapSensor(0), + dataFile(QDir::tempPath()+"/sensordump_0.dat") + , isActive(0), + fileCounter(0) +{ + accel = new QAccelerometer(this); + accel->connectToBackend(); + accel->setDataRate(100); + connect(accel,SIGNAL(readingChanged()),this,SLOT(accelChanged())); + + orientation = new QOrientationSensor(this); + orientation->connectToBackend(); + orientation->setDataRate(100); + connect(orientation,SIGNAL(readingChanged()),this,SLOT(orientationChanged())); + + proximity = new QProximitySensor(this); + proximity->connectToBackend(); + connect(proximity,SIGNAL(readingChanged()),this,SLOT(proximityChanged())); + + irProx = new QIRProximitySensor(this); + irProx->connectToBackend(); + irProx->setDataRate(50); + connect(irProx,SIGNAL(readingChanged()),this,SLOT(irProximityChanged())); + + tapSensor = new QTapSensor(this); + tapSensor->connectToBackend(); + connect(tapSensor,SIGNAL(readingChanged()),this,SLOT(tapChanged())); +} + +Collector::~Collector() +{ +} + +void Collector::accelChanged() +{ + const qreal x = accel->reading()->x(); + const qreal y = accel->reading()->y(); + const qreal z = accel->reading()->z(); + const quint64 ts = accel->reading()->timestamp(); + + QTextStream out(&dataFile); + out << QString("accelerometer: %1,%2,%3,%4").arg(ts).arg(x).arg(y).arg(z) << "\n"; +} + +void Collector::orientationChanged() +{ + const QOrientationReading *orientationReading = orientation->reading(); + QOrientationReading::Orientation o = orientationReading->orientation(); + const quint64 ts = orientationReading->timestamp(); + + QTextStream out(&dataFile); + out << QString("orientation: %1,%2").arg(ts).arg(o) << "\n"; +} + +void Collector::proximityChanged() +{ + const QProximityReading *proximityReading = proximity->reading(); + const quint64 ts = proximityReading->timestamp(); + const bool prox = proximityReading->close(); + + QTextStream out(&dataFile); + out << QString("proximity: %1,%2").arg(ts).arg(prox) << "\n"; +} + +void Collector::irProximityChanged() +{ + const QIRProximityReading *irProximityReading = irProx->reading(); + const quint64 ts = irProximityReading->timestamp(); + const qreal ref = irProximityReading->reflectance(); + + QTextStream out(&dataFile); + out << QString("irProximity: %1,%2").arg(ts).arg(ref) << "\n"; +} + +void Collector::tapChanged() +{ + const QTapReading *tapReading = tapSensor->reading(); + const quint64 ts = tapReading->timestamp(); + const bool dTap = tapReading->isDoubleTap(); + + QTextStream out(&dataFile); + out << QString("tap: %1,%2").arg(ts).arg(dTap) << "\n"; +} + +void Collector::startCollecting() +{ + if (dataFile.exists()) { + fileCounter++; + for (int i = 0; i < fileCounter; i++) { + if (!QFileInfo(QString(QDir::tempPath()+"/sensordump_%1.dat").arg(fileCounter)).exists()) + dataFile.setFileName(QString(QDir::tempPath()+"/sensordump_%1.dat").arg(fileCounter)); + break; + fileCounter++; + } + } + if (!dataFile.exists()) { + if (dataFile.open(QIODevice::WriteOnly | QIODevice::Text)) { + accel->start(); + orientation->start(); + proximity->start(); + irProx->start(); + tapSensor->start(); + + isActive = true; + } else { + qDebug() << "dump file not opened"; + } + } else { + startCollecting(); + } +} + +void Collector::stopCollecting() +{ + if (isActive) { + accel->stop(); + orientation->stop(); + proximity->stop(); + irProx->stop(); + tapSensor->stop(); + isActive = !isActive; + } + if (dataFile.isOpen()) + dataFile.close(); +} + + +QML_DECLARE_TYPE(Collector) + diff --git a/tests/manual/sensorclerk/collector.h b/tests/manual/sensorclerk/collector.h new file mode 100644 index 00000000..15854bf0 --- /dev/null +++ b/tests/manual/sensorclerk/collector.h @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Lorn Potter. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef COLLECTOR_H +#define COLLECTOR_H + +#include +#include +#include + +class QAccelerometer; +class QOrientationSensor; +class QProximitySensor; +class QIRProximitySensor; +class QTapSensor; + +class Collector : public QObject +{ + Q_OBJECT + +public: + explicit Collector(QObject *parent = 0); + ~Collector(); + +public slots: + void startCollecting(); + void stopCollecting(); + +private Q_SLOTS: + void accelChanged(); + void orientationChanged(); + void proximityChanged(); + void irProximityChanged(); + void tapChanged(); + +private: + + QAccelerometer *accel; + QOrientationSensor *orientation; + QProximitySensor *proximity; + QIRProximitySensor *irProx; + QTapSensor *tapSensor; + QFile dataFile; + + bool isActive; + int fileCounter; + + Q_DISABLE_COPY(Collector) +}; + +#endif // COLLECTOR_H + diff --git a/tests/manual/sensorclerk/main.cpp b/tests/manual/sensorclerk/main.cpp new file mode 100644 index 00000000..d56c1f73 --- /dev/null +++ b/tests/manual/sensorclerk/main.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Lorn Potter. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include + + +#include "collector.h" + +int main( int argc, char** argv ) +{ + QGuiApplication app( argc, argv ); + qmlRegisterType("Collector", 1, 0, "Collector"); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); +#if defined(Q_OS_QNX) + view.setSource( QUrl( "app/native/qml/main.qml" ) ); +#else + view.setSource( QUrl( "qml/main.qml" ) ); +#endif + view.show(); + return app.exec(); +} + diff --git a/tests/manual/sensorclerk/qml/Button.qml b/tests/manual/sensorclerk/qml/Button.qml new file mode 100644 index 00000000..3565a5b9 --- /dev/null +++ b/tests/manual/sensorclerk/qml/Button.qml @@ -0,0 +1,129 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Import the declarative plugins +import QtQuick 2.0 + +//Implementation of the Button control. +Item { + id: button + width: 250 + height: 150 + property alias text: innerText.text; + property color color: "white" + property color hoverColor: "#aaaaaa" + property color pressColor: "slategray" + property int fontSize: 10 + property int borderWidth: 1 + property int borderRadius: 2 + scale: state === "Pressed" ? 0.96 : 1.0 + onEnabledChanged: state = "" + signal clicked + + //define a scale animation + Behavior on scale { + NumberAnimation { + duration: 100 + easing.type: Easing.InOutQuad + } + } + + //Rectangle to draw the button + Rectangle { + id: rectangleButton + anchors.fill: parent + radius: borderRadius + color: button.enabled ? button.color : "grey" + border.width: borderWidth + border.color: "black" + + Text { + id: innerText + font.pointSize: fontSize + anchors.centerIn: parent + } + } + + //change the color of the button in differen button states + states: [ + State { + name: "Hovering" + PropertyChanges { + target: rectangleButton + color: hoverColor + } + }, + State { + name: "Pressed" + PropertyChanges { + target: rectangleButton + color: pressColor + } + } + ] + + //define transmission for the states + transitions: [ + Transition { + from: ""; to: "Hovering" + ColorAnimation { duration: 200 } + }, + Transition { + from: "*"; to: "Pressed" + ColorAnimation { duration: 10 } + } + ] + + //Mouse area to react on click events + MouseArea { + hoverEnabled: true + anchors.fill: button + onEntered: { button.state='Hovering'} + onExited: { button.state=''} + onClicked: { button.clicked();} + onPressed: { button.state="Pressed" } + onReleased: { + if (containsMouse) + button.state="Hovering"; + else + button.state=""; + } + } +} diff --git a/tests/manual/sensorclerk/qml/main.qml b/tests/manual/sensorclerk/qml/main.qml new file mode 100644 index 00000000..a49f21ae --- /dev/null +++ b/tests/manual/sensorclerk/qml/main.qml @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Lorn Potter. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import Collector 1.0 +import QtSensors 5.0 + +Rectangle { + Collector { + id: writer + } + + Text { + id: label + text: "Sensor Clerk
push to start and stop
sensor dump"; + anchors.horizontalCenter: parent.horizontalCenter + } + + Button { + id: startCollectingButton + text: depressed ? "Stop" : "Start" + property bool depressed: false + anchors.top: label.bottom + enabled: true; + anchors.horizontalCenter: parent + onClicked: { + if (!depressed) { + writer.startCollecting() + depressed = true + } else { + writer.stopCollecting() + depressed = false + } + } + } + +} + + diff --git a/tests/manual/sensorclerk/sensorclerk.pro b/tests/manual/sensorclerk/sensorclerk.pro new file mode 100644 index 00000000..61eeef15 --- /dev/null +++ b/tests/manual/sensorclerk/sensorclerk.pro @@ -0,0 +1,11 @@ +TEMPLATE = app + +QT += quick sensors + +SOURCES += main.cpp \ + collector.cpp + +HEADERS += collector.h + +OTHER_FILES += qml/main.qml \ + qml/Button.qml -- cgit v1.2.3