From 440bc188c8f0f427ef979b8e9cff8d39fdaa8af7 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 7 Jun 2012 10:24:42 +1000 Subject: make twist work better when the phone is tilted. Change-Id: If4c04a6e3f9a936f55233c621d184bc0e4d99e1b Reviewed-by: Lorn Potter --- .../mock_data/sensordata_tiltedtwist.dat | 260 +++++++++++++++++++++ .../tst_sensorgestures_gestures.cpp | 26 +++ 2 files changed, 286 insertions(+) create mode 100644 tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat (limited to 'tests/auto/qsensorgestures_gestures') diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat new file mode 100644 index 00000000..f3ec2e92 --- /dev/null +++ b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat @@ -0,0 +1,260 @@ +orientation:6291210832,5 +accelerometer: 6292150682,0.402422,1.99295,9.23655 +accelerometer: 6292171190,0.0574889,2.08876,9.27488 +accelerometer: 6292190996,-0.0958148,2.12709,9.08325 +accelerometer: 6292210649,0.0383259,2.05044,9.19823 +accelerometer: 6292231401,0.0574889,2.39537,9.1599 +irProximity:6292235233,0.294118 +accelerometer: 6292250658,-0.0958148,1.85881,9.10241 +proximity:6292264896,0 +accelerometer: 6292271013,-0.287445,1.82048,9.25571 +accelerometer: 6292290971,-0.019163,1.85881,9.38986 +accelerometer: 6292310899,0.172467,1.87797,9.56232 +accelerometer: 6292330736,-0.0383259,1.7055,9.37069 +accelerometer: 6292350969,0.153304,1.7055,9.42818 +accelerometer: 6292370897,-0.019163,1.83965,9.56232 +accelerometer: 6292390886,0.0766519,1.85881,9.50483 +accelerometer: 6292411028,0.210793,1.78216,9.65814 +accelerometer: 6292430895,0,1.80132,9.54316 +accelerometer: 6292450945,0.19163,2.01211,9.63897 +accelerometer: 6292470934,0.268282,1.87797,9.8306 +accelerometer: 6292490892,0.0574889,1.95462,9.42818 +accelerometer: 6292510942,0,2.10793,9.48567 +accelerometer: 6292530779,0.172467,2.33788,9.61981 +accelerometer: 6292550890,-0.0574889,2.87445,9.42818 +accelerometer: 6292571062,0.210793,2.72114,9.98391 +accelerometer: 6292591142,0.249119,2.77863,10.0989 +accelerometer: 6292610918,0.479074,3.12356,10.578 +accelerometer: 6292630785,0.114978,3.00859,10.4821 +accelerometer: 6292650926,0.114978,3.08524,10.3672 +accelerometer: 6292670885,0.19163,3.50682,10.4055 +accelerometer: 6292690904,0.268282,4.12004,10.5205 +accelerometer: 6292710893,0.555726,4.25418,10.3863 +accelerometer: 6292731065,0.5174,4.21585,10.0797 +accelerometer: 6292751146,0.536563,4.79074,9.73479 +accelerometer: 6292770921,0.766519,5.05902,9.61981 +accelerometer: 6292790971,0.268282,4.80991,8.96827 +accelerometer: 6292810869,0.134141,5.15484,8.20175 +accelerometer: 6292830888,0.153304,5.55726,7.66519 +irProximity:6292845401,0.298039 +accelerometer: 6292851061,0.364096,5.6914,7.83765 +accelerometer: 6292871324,0.134141,5.65308,7.81849 +accelerometer: 6292891008,-0.153304,6.18964,7.10946 +accelerometer: 6292910967,0.210793,5.99801,6.74537 +accelerometer: 6292930864,0.0766519,6.30462,5.88303 +accelerometer: 6292950975,-0.172467,6.36211,6.36211 +accelerometer: 6292970934,0.306608,6.74537,6.70704 +accelerometer: 6292990740,0.210793,6.78369,6.36211 +accelerometer: 6293010912,0.344933,6.7262,5.67224 +accelerometer: 6293030901,0.114978,7.03281,5.5381 +orientation:6293030901,1 +accelerometer: 6293050951,0.019163,6.99448,5.63391 +accelerometer: 6293071184,-0.229956,7.03281,5.00153 +accelerometer: 6293090959,-0.19163,7.6077,5.15484 +accelerometer: 6293110948,0.306608,7.53105,4.88656 +accelerometer: 6293130907,0.249119,7.33942,4.73325 +accelerometer: 6293150774,0.153304,7.22444,4.56079 +accelerometer: 6293170885,-0.0958148,7.83765,4.5033 +accelerometer: 6293190935,-0.229956,7.55021,4.57995 +accelerometer: 6293210954,-0.172467,7.43523,4.88656 +accelerometer: 6293231401,0.0766519,7.66519,5.07819 +accelerometer: 6293250963,-0.019163,7.72268,4.77158 +accelerometer: 6293270860,-0.019163,7.81849,5.05902 +accelerometer: 6293290941,0.0766519,7.79933,5.51894 +accelerometer: 6293310899,-0.019163,7.87598,5.28898 +accelerometer: 6293330705,0.0574889,7.95263,5.28898 +accelerometer: 6293350786,0.019163,7.99096,5.6914 +accelerometer: 6293371111,-0.019163,7.99096,5.57642 +accelerometer: 6293391130,-0.172467,7.89514,5.48061 +accelerometer: 6293410967,0,8.37422,5.57642 +accelerometer: 6293430956,0,7.95263,5.61475 +irProximity:6293451419,0.301961 +accelerometer: 6293451433,0.287445,8.06761,5.72973 +accelerometer: 6293470934,0.019163,8.10594,5.55726 +accelerometer: 6293490892,0.153304,8.31673,5.99801 +accelerometer: 6293510912,0.114978,7.9718,5.78722 +accelerometer: 6293531114,-0.019163,7.74184,5.48061 +irProximity:6293553165,0.298039 +accelerometer: 6293552599,-0.172467,8.04845,5.59559 +accelerometer: 6293570970,0.0574889,8.24008,5.65308 +accelerometer: 6293590990,-0.019163,7.87598,5.11651 +accelerometer: 6293610918,0.0383259,7.9718,5.61475 +accelerometer: 6293630907,-0.153304,8.04845,5.72973 +accelerometer: 6293650713,0.114978,7.93347,5.80638 +irProximity:6293654789,0.301961 +accelerometer: 6293670885,0.268282,8.14426,5.6914 +accelerometer: 6293691026,4.82907,7.93347,5.51894 +accelerometer: 6293711076,0.0574889,7.91431,5.86387 +accelerometer: 6293730852,-0.134141,7.72268,5.78722 +accelerometer: 6293750688,-0.0958148,7.9718,5.19316 +accelerometer: 6293770952,-0.0574889,8.33589,5.36563 +accelerometer: 6293790971,0,8.14426,5.23149 +accelerometer: 6293810899,0.210793,7.85682,5.36563 +accelerometer: 6293830919,0.0958148,7.99096,5.21233 +accelerometer: 6293850908,0.689867,8.18259,5.174 +accelerometer: 6293871141,1.34141,7.49272,5.25065 +accelerometer: 6293890947,2.03127,7.93347,4.86739 +accelerometer: 6293910906,2.70198,7.37774,3.56431 +accelerometer: 6293930895,4.19669,7.81849,3.1044 +accelerometer: 6293950762,4.31167,7.761,2.60616 +irProximity:6293959507,0.294118 +accelerometer: 6293970964,6.32378,8.04845,1.05396 +accelerometer: 6293990740,7.33942,9.61981,2.28039 +accelerometer: 6294011064,7.01365,9.23655,1.41806 +accelerometer: 6294031145,6.55374,8.45087,-0.344933 +accelerometer: 6294050768,5.61475,7.79933,-0.574889 +accelerometer: 6294070970,5.15484,8.83413,-0.268282 +accelerometer: 6294090929,3.92841,7.89514,-1.78216 +accelerometer: 6294110887,2.37621,7.83765,-2.33788 +accelerometer: 6294130785,2.97026,8.68083,-1.68634 +accelerometer: 6294150743,2.9511,8.75748,-2.62533 +accelerometer: 6294170885,3.1044,8.43171,-3.43017 +accelerometer: 6294191362,3.73678,9.0066,-3.81343 +accelerometer: 6294210954,4.46497,9.19823,-3.89008 +accelerometer: 6294230882,4.5033,8.92994,-3.90925 +accelerometer: 6294251177,3.87092,8.69999,-4.40748 +accelerometer: 6294270860,4.34999,8.85329,-4.23502 +accelerometer: 6294290971,4.29251,8.94911,-3.56431 +accelerometer: 6294310899,4.21585,9.06409,-3.08524 +accelerometer: 6294331072,4.06255,8.50836,-3.23854 +accelerometer: 6294351152,4.00506,8.75748,-2.7403 +accelerometer: 6294370958,4.12004,8.89162,-1.5522 +accelerometer: 6294390917,4.75242,9.10241,-0.632378 +accelerometer: 6294410906,4.75242,8.89162,-0.70903 +accelerometer: 6294430895,5.25065,8.54668,0.0383259 +accelerometer: 6294450945,5.90219,8.69999,1.14978 +accelerometer: 6294470934,6.03634,8.14426,2.39537 +accelerometer: 6294491075,6.17048,7.64602,3.73678 +accelerometer: 6294511125,5.90219,7.68435,4.33083 +accelerometer: 6294530870,5.13568,7.18611,4.36916 +accelerometer: 6294550920,3.18105,7.91431,4.06255 +irProximity:6294567813,0.301961 +accelerometer: 6294570970,1.89713,8.69999,2.89361 +accelerometer: 6294590898,0.632378,7.20528,3.89008 +accelerometer: 6294610918,-0.134141,7.2436,5.03986 +accelerometer: 6294630907,-0.555726,7.39691,6.7262 +accelerometer: 6294651048,-0.632378,7.58854,7.41607 +irProximity:6294669376,0.298039 +accelerometer: 6294671129,-0.632378,7.37774,6.43876 +accelerometer: 6294690935,-0.613215,7.10946,4.69493 +accelerometer: 6294710893,-1.13062,7.22444,4.59911 +accelerometer: 6294730943,-1.07313,7.39691,6.24713 +accelerometer: 6294750902,-0.766519,7.32025,5.76805 +accelerometer: 6294771105,-0.785682,6.97532,6.26629 +accelerometer: 6294790910,-0.728193,7.2436,6.13215 +accelerometer: 6294811052,-0.536563,7.30109,5.84471 +accelerometer: 6294831163,-0.498237,7.28193,6.34294 +accelerometer: 6294851061,-0.114978,7.9718,7.12862 +accelerometer: 6294871080,-0.114978,7.26277,5.90219 +accelerometer: 6294890917,-0.421585,7.56937,5.99801 +accelerometer: 6294910906,-0.440748,7.55021,5.99801 +accelerometer: 6294930895,0.0574889,6.87951,6.03634 +accelerometer: 6294950945,-0.306608,7.4544,6.937 +accelerometer: 6294970689,-0.364096,7.37774,5.86387 +irProximity:6294974216,0.301961 +accelerometer: 6294990892,-0.498237,7.74184,6.07466 +accelerometer: 6295010973,-0.19163,7.47356,6.30462 +accelerometer: 6295030901,-0.0574889,7.53105,6.82202 +accelerometer: 6295050890,0.0766519,7.43523,6.82202 +accelerometer: 6295070726,-0.364096,7.47356,6.49625 +accelerometer: 6295090898,0.0383259,7.55021,6.74537 +accelerometer: 6295110918,0.172467,7.58854,6.82202 +accelerometer: 6295131059,0.153304,7.28193,6.5729 +accelerometer: 6295150896,0.0574889,7.12862,6.84118 +accelerometer: 6295170854,-0.383259,7.37774,6.41959 +accelerometer: 6295191026,0.0766519,7.18611,6.17048 +accelerometer: 6295210924,-0.19163,7.28193,6.51541 +accelerometer: 6295231127,-0.344933,7.32025,6.45792 +accelerometer: 6295251054,-0.459911,7.47356,6.95616 +accelerometer: 6295270921,-0.440748,7.51188,6.76453 +irProximity:6295277225,0.298039 +accelerometer: 6295291063,-0.364096,7.18611,6.13215 +accelerometer: 6295311083,-0.0958148,7.56937,6.45792 +accelerometer: 6295330705,0.114978,7.32025,6.78369 +accelerometer: 6295350939,-0.019163,7.18611,6.22797 +accelerometer: 6295370744,-0.5174,7.01365,5.92136 +irProximity:6295378910,0.301961 +accelerometer: 6295390947,-0.114978,7.01365,6.63039 +accelerometer: 6295410936,-0.134141,7.03281,6.59206 +accelerometer: 6295430895,0.0574889,7.01365,6.66871 +accelerometer: 6295451067,0.364096,7.18611,6.80285 +accelerometer: 6295470934,0.651541,6.70704,6.74537 +irProximity:6295480533,0.298039 +accelerometer: 6295490953,-0.0574889,7.37774,6.97532 +accelerometer: 6295510942,0.0574889,7.05197,6.51541 +accelerometer: 6295530901,-0.287445,7.18611,6.68788 +accelerometer: 6295550890,0.019163,6.99448,6.84118 +accelerometer: 6295570757,0.019163,7.41607,6.937 +irProximity:6295582218,0.301961 +accelerometer: 6295590898,0.0766519,7.0903,6.80285 +accelerometer: 6295611070,0.364096,7.39691,6.55374 +accelerometer: 6295631151,0.402422,7.16695,6.34294 +accelerometer: 6295650957,0.32577,7.20528,6.5729 +accelerometer: 6295670915,0.364096,6.99448,6.97532 +irProximity:6295683841,0.298039 +accelerometer: 6295690965,-0.019163,6.97532,6.55374 +accelerometer: 6295710893,-0.268282,7.26277,6.18964 +accelerometer: 6295730943,-0.440748,6.937,6.28545 +accelerometer: 6295750932,-0.19163,7.2436,6.53457 +accelerometer: 6295771074,-0.0574889,7.22444,6.61122 +accelerometer: 6295791185,0,7.30109,6.24713 +accelerometer: 6295810960,-0.0383259,7.01365,6.53457 +accelerometer: 6295830949,-0.0958148,6.97532,6.70704 +accelerometer: 6295850908,-0.0958148,7.12862,6.41959 +accelerometer: 6295870897,-0.019163,7.16695,6.78369 +accelerometer: 6295890947,0.114978,7.22444,6.74537 +accelerometer: 6295910906,0.019163,7.39691,6.53457 +accelerometer: 6295931078,-0.32577,7.12862,6.15131 +accelerometer: 6295951128,-0.364096,7.12862,5.95968 +accelerometer: 6295970964,-0.344933,7.35858,6.24713 +accelerometer: 6295990679,-0.172467,7.26277,6.64955 +accelerometer: 6296010698,-0.249119,7.22444,6.86034 +accelerometer: 6296030687,-0.0383259,6.78369,6.87951 +accelerometer: 6296050707,-0.344933,7.07114,6.937 +accelerometer: 6296070635,-0.153304,6.63039,6.61122 +accelerometer: 6296090776,-0.268282,6.89867,6.91783 +accelerometer: 6296110857,-0.440748,7.12862,6.43876 +accelerometer: 6296130907,-0.306608,7.37774,6.2088 +accelerometer: 6296150835,0.0574889,6.99448,6.87951 +accelerometer: 6296170976,-0.153304,7.43523,6.70704 +accelerometer: 6296191759,-0.114978,7.43523,6.40043 +accelerometer: 6296211595,-0.0958148,7.01365,6.40043 +accelerometer: 6296231706,-0.0958148,7.10946,6.49625 +accelerometer: 6296251787,-0.0574889,7.01365,6.78369 +accelerometer: 6296271532,0.0574889,6.68788,6.937 +accelerometer: 6296292192,0.0766519,6.84118,6.89867 +accelerometer: 6296312029,0.114978,7.58854,7.03281 +accelerometer: 6296332018,-0.632378,6.80285,5.42312 +accelerometer: 6296350664,-1.07313,6.97532,5.99801 +accelerometer: 6296370531,-0.479074,7.03281,6.91783 +accelerometer: 6296390642,-0.0383259,6.63039,7.64602 +accelerometer: 6296411058,-0.114978,6.61122,7.18611 +accelerometer: 6296431139,0.019163,6.41959,7.18611 +accelerometer: 6296450914,0.268282,6.64955,7.18611 +accelerometer: 6296470903,-0.153304,6.80285,7.07114 +accelerometer: 6296490801,0.0574889,6.84118,6.89867 +accelerometer: 6296510912,-0.172467,6.76453,6.61122 +accelerometer: 6296530901,-0.0383259,6.74537,6.84118 +accelerometer: 6296550890,-0.114978,6.49625,7.05197 +accelerometer: 6296571062,-0.421585,6.68788,6.95616 +accelerometer: 6296590990,-0.229956,6.64955,7.03281 +accelerometer: 6296610948,-0.114978,6.5729,7.18611 +accelerometer: 6296630937,-0.210793,6.55374,7.12862 +accelerometer: 6296650865,-0.32577,6.59206,7.03281 +accelerometer: 6296670885,-0.0958148,6.53457,7.18611 +accelerometer: 6296690599,-0.249119,6.64955,7.16695 +accelerometer: 6296710924,-0.172467,6.5729,7.16695 +accelerometer: 6296731065,0.0766519,6.55374,7.28193 +accelerometer: 6296751146,-0.153304,7.05197,7.32025 +accelerometer: 6296770921,0.0383259,7.03281,6.86034 +accelerometer: 6296790788,-0.689867,7.28193,6.03634 +accelerometer: 6296810930,-0.632378,6.68788,6.70704 +accelerometer: 6296832842,-0.996474,6.09382,6.63039 +accelerometer: 6296851854,-0.689867,6.89867,7.14779 +accelerometer: 6296870744,-0.5174,6.97532,7.01365 +accelerometer: 6296891527,-0.019163,6.95616,7.33942 +accelerometer: 6296911760,0.153304,6.74537,6.99448 +accelerometer: 6296930986,-0.19163,7.0903,7.22444 +accelerometer: 6296952196,-0.32577,7.20528,6.15131 +accelerometer: 6296971361,-0.670704,6.63039,5.95968 + diff --git a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp index 46795fa1..ff2d6936 100644 --- a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp +++ b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp @@ -57,6 +57,7 @@ public: private Q_SLOTS: void initTestCase(); + void testTiltedTwist(); void testNotHover2(); void testNotHover(); void testNotWhip(); @@ -397,6 +398,31 @@ void tst_sensorgestures_gestures::testNotHover2() QCOMPARE(arguments.at(0).toString(), QLatin1String("slam")); } +void tst_sensorgestures_gestures::testTiltedTwist() +{ + QString name = "mock_data/sensordata_tiltedtwist.dat"; + + QStringList gestStringList; + + gestStringList << "QtSensors.twist"; + + 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(),1, 7000); + + QList arguments = spy_gesture.takeFirst(); + QCOMPARE(arguments.at(0).toString(), QLatin1String("twistLeft")); +} + + + QTEST_MAIN(tst_sensorgestures_gestures) #include "tst_sensorgestures_gestures.moc" -- cgit v1.2.3