From c8c03ee6b2a4d7de1ca13cb5848589c8a6134d4d Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 22 May 2012 10:10:28 +1000 Subject: make hover gesture work better make hover work when the ir prox is calibrated. Also make sure that a hand moving up after doing a cover does not trigger a hover signal. Change-Id: I8925c4d7dd53302b9d9950989e37ad991216f621 Reviewed-by: Lincoln Ramsay --- .../mock_data/sensordata_nothover.dat | 234 +++++++++++++++++++++ .../tst_sensorgestures_gestures.cpp | 24 +++ 2 files changed, 258 insertions(+) create mode 100644 tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat (limited to 'tests/auto/qsensorgestures_gestures') diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat new file mode 100644 index 00000000..f49d5a22 --- /dev/null +++ b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat @@ -0,0 +1,234 @@ +orientation:11043900509,5 +accelerometer: 11100730588,-0.114978,0.536563,9.04492 +accelerometer: 11100750912,0.0766519,-0.249119,9.42818 +accelerometer: 11100770962,0.0958148,0,9.75395 +irProximity:11100791116,0.286275 +accelerometer: 11100790951,-0.249119,0.172467,9.23655 +proximity:11100797891,0 +accelerometer: 11100810940,0.0766519,-0.0574889,9.65814 +accelerometer: 11100830929,0.0766519,-0.114978,9.524 +accelerometer: 11100850918,-0.249119,-0.019163,9.42818 +accelerometer: 11100870968,0.19163,-0.229956,9.75395 +accelerometer: 11100890744,-0.153304,-0.019163,9.58148 +accelerometer: 11100910946,-0.0574889,0.0766519,9.48567 +accelerometer: 11100930966,-0.134141,4.75242,9.6773 +accelerometer: 11100950924,0.0958148,-0.172467,9.63897 +accelerometer: 11100970944,0.019163,-0.0574889,9.46651 +accelerometer: 11100990689,0.229956,-0.229956,9.71563 +accelerometer: 11101010922,0.0574889,0,9.6773 +accelerometer: 11101030758,-0.0958148,-0.0574889,9.77311 +accelerometer: 11101051663,-0.210793,-0.134141,9.73479 +accelerometer: 11101071133,-0.0766519,0.0766519,9.79228 +accelerometer: 11101090878,0.0383259,0.0766519,9.86893 +accelerometer: 11101111203,-0.019163,0.0574889,9.46651 +accelerometer: 11101130642,-0.0383259,-0.0574889,9.6773 +accelerometer: 11101150967,-0.0958148,-0.0766519,9.54316 +accelerometer: 11101170956,0.019163,-0.134141,9.71563 +accelerometer: 11101190823,-0.0574889,0.0958148,9.6773 +accelerometer: 11101210934,0.0383259,-0.0766519,9.48567 +accelerometer: 11101230984,-0.0958148,-0.249119,9.6773 +accelerometer: 11101250973,0.114978,-4.88656,9.44734 +accelerometer: 11101270962,-0.19163,-0.0574889,9.73479 +accelerometer: 11101290799,-0.0574889,-0.0958148,9.61981 +irProximity:11101296243,0.415686 +accelerometer: 11101310971,-0.0766519,0.019163,9.63897 +accelerometer: 11101330960,0.0574889,-0.153304,9.6773 +accelerometer: 11101350979,-0.153304,4.80991,9.60065 +accelerometer: 11101370968,0.287445,0.0383259,9.8306 +proximity:11101385922,1 +accelerometer: 11101390774,0.0574889,-0.0766519,9.48567 +irProximity:11101397225,0.517647 +accelerometer: 11101410946,-0.0766519,-0.0766519,9.63897 +accelerometer: 11101430966,0.268282,0.0383259,9.6773 +accelerometer: 11101450955,-0.0958148,-4.82907,9.40902 +accelerometer: 11101470944,0.287445,-0.0383259,9.69646 +accelerometer: 11101490902,0.153304,-0.0383259,9.61981 +accelerometer: 11101510830,-0.019163,-0.0574889,9.46651 +accelerometer: 11101530942,1.09229,0.0574889,10.5205 +accelerometer: 11101550778,-0.32577,0.172467,10.3672 +accelerometer: 11101570981,-0.306608,0.0766519,9.48567 +accelerometer: 11101590848,0.5174,-0.229956,10.2905 +irProximity:11101598153,0.6 +accelerometer: 11101611050,-0.153304,0,9.44734 +accelerometer: 11101630948,-0.19163,-0.229956,9.46651 +accelerometer: 11101650540,-0.019163,0.0958148,9.33237 +accelerometer: 11101670682,-0.19163,-0.0766519,9.40902 +accelerometer: 11101690793,-0.0574889,0,9.63897 +accelerometer: 11101710812,-0.0766519,0.0383259,9.69646 +accelerometer: 11101730801,0.019163,-0.229956,9.60065 +accelerometer: 11101750821,-0.114978,-0.0383259,9.71563 +accelerometer: 11101770779,-0.019163,-0.0574889,9.58148 +accelerometer: 11101790768,-0.249119,-0.153304,9.65814 +irProximity:11101798623,0.690196 +accelerometer: 11101810788,0.0383259,-0.249119,9.54316 +accelerometer: 11101830807,-0.0383259,0.0766519,9.524 +accelerometer: 11101850888,0,-0.19163,9.60065 +accelerometer: 11101870938,-0.0766519,-0.0766519,9.46651 +accelerometer: 11101890896,-0.19163,-0.019163,9.56232 +accelerometer: 11101910946,-0.134141,-0.134141,9.46651 +accelerometer: 11101930996,-0.114978,-0.0574889,9.63897 +accelerometer: 11101950924,-0.0958148,-0.287445,9.65814 +accelerometer: 11101970913,-0.229956,0.0383259,9.81144 +accelerometer: 11101990780,0,-0.0766519,9.63897 +irProximity:11101999398,0.682353 +accelerometer: 11102010739,0,-0.0766519,9.61981 +accelerometer: 11102030911,-0.019163,-0.114978,9.61981 +accelerometer: 11102051632,0,-0.134141,9.37069 +accelerometer: 11102072079,-0.114978,0.134141,9.79228 +accelerometer: 11102092007,-0.0958148,0.0766519,9.61981 +accelerometer: 11102113003,-0.19163,-4.88656,9.60065 +accelerometer: 11102131100,-0.268282,-0.19163,9.56232 +accelerometer: 11102150998,0.019163,-0.134141,9.524 +accelerometer: 11102171017,0.0766519,-0.0766519,9.63897 +accelerometer: 11102190854,-0.114978,0.0383259,9.69646 +irProximity:11102200356,0.678431 +accelerometer: 11102210843,-0.19163,-0.229956,9.44734 +accelerometer: 11102230801,-0.0958148,-0.019163,9.54316 +accelerometer: 11102251034,-0.229956,4.88656,9.65814 +accelerometer: 11102271054,-0.0383259,-0.134141,9.44734 +accelerometer: 11102291012,-0.0574889,-0.114978,9.58148 +accelerometer: 11102311001,-0.0958148,-0.0383259,9.61981 +accelerometer: 11102330990,-0.114978,-0.114978,9.54316 +accelerometer: 11102350979,-0.0574889,-0.0766519,9.61981 +accelerometer: 11102370999,-0.0766519,4.82907,9.61981 +accelerometer: 11102390866,-0.134141,-0.0574889,9.58148 +accelerometer: 11102410550,-0.0383259,0.153304,9.63897 +accelerometer: 11102430508,-0.229956,-0.229956,9.46651 +accelerometer: 11102450711,0.0383259,0.0574889,9.54316 +accelerometer: 11102470822,-0.153304,-0.172467,9.63897 +accelerometer: 11102490811,-0.172467,-0.0766519,9.75395 +accelerometer: 11102510800,-0.229956,0.19163,9.73479 +accelerometer: 11102530850,-0.0958148,-0.172467,9.56232 +accelerometer: 11102550808,-0.172467,-0.134141,9.71563 +accelerometer: 11102570767,-0.0383259,-4.75242,9.58148 +accelerometer: 11102590787,-0.0383259,-0.114978,9.73479 +accelerometer: 11102610837,-0.268282,0.153304,9.61981 +accelerometer: 11102630795,-0.0574889,-0.229956,9.61981 +accelerometer: 11102650845,-0.172467,-0.019163,9.63897 +accelerometer: 11102670926,0.019163,-0.153304,9.63897 +accelerometer: 11102690976,0.114978,-0.0383259,9.58148 +accelerometer: 11102710965,-0.134141,-0.0766519,9.6773 +accelerometer: 11102730984,-0.134141,0.0574889,9.524 +accelerometer: 11102751004,0.0574889,0.0766519,9.75395 +accelerometer: 11102771054,-0.0383259,-0.019163,9.60065 +accelerometer: 11102790890,-0.114978,-0.114978,9.63897 +irProximity:11102803261,0.67451 +accelerometer: 11102810940,-0.0958148,0,9.73479 +accelerometer: 11102830960,-0.0383259,-0.134141,9.6773 +accelerometer: 11102850949,-0.114978,4.75242,9.69646 +accelerometer: 11102871029,-0.134141,-0.0383259,9.63897 +accelerometer: 11102890988,-0.0958148,0.019163,9.75395 +accelerometer: 11102910946,-0.019163,-0.0574889,9.48567 +accelerometer: 11102930874,0.0766519,0.134141,9.79228 +accelerometer: 11102950833,-0.019163,-0.114978,9.40902 +accelerometer: 11102970578,-0.153304,0.114978,9.71563 +accelerometer: 11102990567,-0.172467,0.0574889,9.94558 +irProximity:11103004037,0.678431 +accelerometer: 11103010830,-0.268282,0,9.37069 +accelerometer: 11103030972,-0.0958148,0.249119,9.73479 +accelerometer: 11103050900,-0.268282,-0.0574889,7.39691 +accelerometer: 11103070523,0.555726,-0.19163,9.98391 +accelerometer: 11103091122,-0.134141,-0.172467,9.17906 +accelerometer: 11103111020,-0.306608,0.172467,10.6163 +accelerometer: 11103130978,0.19163,0.0574889,10.0222 +accelerometer: 11103150906,-0.364096,-0.0383259,8.6425 +accelerometer: 11103170956,0.19163,0.0958148,10.0222 +accelerometer: 11103190762,0.0766519,-0.229956,9.524 +proximity:11103201321,0 +irProximity:11103204537,0.439216 +accelerometer: 11103210995,-0.0383259,-0.0766519,9.54316 +accelerometer: 11103230923,0.0766519,-4.86739,9.8306 +accelerometer: 11103250943,-0.172467,-0.249119,9.35153 +accelerometer: 11103270962,-0.0574889,-0.0383259,9.6773 +accelerometer: 11103290951,-0.19163,-0.0958148,9.54316 +accelerometer: 11103310940,-0.0766519,-0.0574889,9.73479 +accelerometer: 11103330960,-0.0958148,-0.0383259,9.79228 +accelerometer: 11103350949,-0.114978,0.019163,9.61981 +accelerometer: 11103370968,-0.172467,-0.019163,9.6773 +accelerometer: 11103390927,-0.019163,0.0574889,9.524 +irProximity:11103406136,0.286275 +accelerometer: 11103410916,0.0766519,-0.134141,9.37069 +accelerometer: 11103430935,-0.114978,-0.0383259,9.46651 +accelerometer: 11103450955,-0.019163,-0.172467,9.73479 +accelerometer: 11103470975,-0.172467,0.0766519,9.524 +accelerometer: 11103490933,0.019163,0,9.71563 +accelerometer: 11103510739,-0.0958148,-0.153304,9.524 +accelerometer: 11103530911,-0.0574889,-0.19163,9.60065 +accelerometer: 11103550808,-0.153304,-0.0958148,9.73479 +accelerometer: 11103570981,-0.287445,0.114978,9.56232 +accelerometer: 11103591000,0,-0.114978,9.56232 +accelerometer: 11103610928,-0.172467,0.019163,9.58148 +accelerometer: 11103630948,0.019163,-0.0383259,9.38986 +accelerometer: 11103650937,-0.0574889,0.0766519,9.58148 +accelerometer: 11103670956,-0.134141,0.0383259,9.60065 +accelerometer: 11103690945,-0.249119,-0.019163,9.56232 +accelerometer: 11103710934,-0.019163,4.73325,9.61981 +accelerometer: 11103730740,-0.0383259,-0.0574889,9.54316 +accelerometer: 11103750912,0.0574889,0.0574889,9.65814 +accelerometer: 11103770962,-0.134141,-0.172467,9.71563 +accelerometer: 11103790951,0.0574889,0.268282,9.60065 +accelerometer: 11103811001,-0.268282,-0.268282,9.63897 +accelerometer: 11103830990,-0.0958148,-0.0766519,9.65814 +accelerometer: 11103850949,-0.210793,-0.0766519,9.38986 +accelerometer: 11103870968,-0.0574889,-0.114978,9.6773 +accelerometer: 11103890927,0.019163,-0.019163,9.65814 +accelerometer: 11103910885,-4.90572,-0.0766519,9.65814 +accelerometer: 11103930935,0.019163,4.82907,9.69646 +accelerometer: 11103950924,-0.210793,-0.019163,9.50483 +accelerometer: 11103970944,-0.019163,-0.134141,9.61981 +accelerometer: 11103990811,-0.210793,0.0766519,9.54316 +accelerometer: 11104010922,-0.19163,-0.114978,9.44734 +accelerometer: 11104030819,-0.114978,-0.0383259,9.54316 +accelerometer: 11104050992,-0.0383259,-0.019163,9.58148 +accelerometer: 11104070981,-0.19163,-0.0383259,9.44734 +accelerometer: 11104091031,-0.287445,4.77158,9.54316 +accelerometer: 11104111416,-0.134141,-4.82907,9.42818 +accelerometer: 11104130551,-0.019163,-0.019163,9.65814 +accelerometer: 11104150967,0.0958148,-0.268282,9.63897 +accelerometer: 11104170926,0.0574889,0,9.60065 +accelerometer: 11104190976,-0.32577,-0.172467,9.524 +accelerometer: 11104210995,0,0,9.6773 +accelerometer: 11104230954,0.0958148,-0.0958148,9.58148 +accelerometer: 11104250973,-0.114978,-0.383259,9.60065 +accelerometer: 11104270962,0.0574889,0,9.61981 +accelerometer: 11104290951,-0.134141,-0.0383259,9.60065 +accelerometer: 11104310635,-0.134141,0,9.60065 +accelerometer: 11104330960,-0.0766519,-0.0766519,9.54316 +accelerometer: 11104350949,-0.0958148,-0.114978,9.60065 +accelerometer: 11104370968,0.019163,-0.153304,9.58148 +accelerometer: 11104390927,-0.287445,0.0958148,9.61981 +accelerometer: 11104410733,-0.0383259,0.134141,9.65814 +accelerometer: 11104430905,-0.153304,-0.19163,9.54316 +accelerometer: 11104450894,-0.210793,-0.019163,9.6773 +accelerometer: 11104470913,0.153304,-0.229956,9.65814 +accelerometer: 11104490964,0.134141,-0.0383259,9.63897 +accelerometer: 11104510800,0.153304,-0.0766519,9.63897 +accelerometer: 11104530942,0,-0.210793,9.6773 +accelerometer: 11104550961,-0.019163,-0.019163,9.65814 +accelerometer: 11104570950,0.172467,-0.0574889,9.73479 +accelerometer: 11104590939,-0.0958148,-0.0574889,9.81144 +accelerometer: 11104610806,-0.19163,0.019163,9.8306 +accelerometer: 11104630917,-0.0766519,4.80991,9.48567 +accelerometer: 11104650937,-0.134141,0.0958148,9.524 +accelerometer: 11104670926,0.0574889,-0.019163,9.63897 +accelerometer: 11104690976,-0.134141,-0.019163,9.48567 +accelerometer: 11104710812,-0.0383259,-0.0383259,9.61981 +accelerometer: 11104730862,-0.0766519,-0.249119,9.73479 +accelerometer: 11104750973,0.0766519,-0.0958148,9.8306 +accelerometer: 11104770962,-0.0766519,-0.19163,9.56232 +accelerometer: 11104790951,-0.632378,0.344933,9.44734 +accelerometer: 11104810818,0.306608,-0.172467,9.71563 +accelerometer: 11104830929,-0.0574889,4.84823,9.75395 +accelerometer: 11104850949,-0.632378,0.210793,9.54316 +accelerometer: 11104870938,-0.32577,-0.0383259,9.38986 +accelerometer: 11104890927,-0.268282,-0.0958148,9.29404 +accelerometer: 11104910763,-0.344933,-0.019163,9.21739 +accelerometer: 11104931241,-0.210793,-0.019163,9.54316 +accelerometer: 11104950528,-0.0574889,-0.114978,9.46651 +accelerometer: 11104970822,-0.0574889,-0.0574889,9.524 +accelerometer: 11104990811,-0.114978,0.0383259,9.524 +accelerometer: 11105010800,0.0766519,-0.0958148,9.69646 +accelerometer: 11105030789,-0.114978,-0.0958148,9.58148 +accelerometer: 11105050808,-0.210793,-4.79074,9.35153 +accelerometer: 11105070798,0.114978,0.134141,10.233 + diff --git a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp index e739149c..3c07ceec 100644 --- a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp +++ b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp @@ -57,6 +57,8 @@ public: private Q_SLOTS: void initTestCase(); + void testNotHover(); + void testSingleGestures(); void testSingleGestures_data(); @@ -320,6 +322,28 @@ void tst_sensorgestures_gestures::testAllGestures() QCOMPARE(arguments.at(0).toString(), QString(gestureSignal)); } +void tst_sensorgestures_gestures::testNotHover() +{ + QString name = "mock_data/sensordata_nothover.dat"; + + QSensorGestureManager manager; + QStringList idList = manager.gestureIds(); + + QStringList gestStringList; + + gestStringList << "QtSensors.hover"; + QScopedPointer gesture(new QSensorGesture(gestStringList)); + + QCOMPARE(gesture->invalidIds().count(),0); + QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); + + QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); + gesture.data()->startDetection(); + QCOMPARE(gesture->isActive(),true); + + QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),0, 2000); + +} QTEST_MAIN(tst_sensorgestures_gestures) -- cgit v1.2.3