1ecc4df · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

DirectionalDragArea: add touchSceneX, touchSceneY, and sceneDistance properties.

1ecc4dfDaniel d'Andrada13 years ago

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+48−2

compare with xenial

unifiedsplit

@@ -155,6 +155,15 @@ qreal DirectionalDragArea::distance() const

155 }

156}

157

158+qreal DirectionalDragArea::sceneDistance() const

159+{

160+ if (Direction::isHorizontal(m_direction)) {

161+ return m_previousScenePos.x() - m_startScenePos.x();

162+ } else {

163+ return m_previousScenePos.y() - m_startScenePos.y();

164+ }

165+}

166+

158qreal DirectionalDragArea::touchX() const

167qreal DirectionalDragArea::touchX() const

159{

168{

160 return m_previousPos.x();

169 return m_previousPos.x();

@@ -165,6 +174,16 @@ qreal DirectionalDragArea::touchY() const

165 return m_previousPos.y();

174 return m_previousPos.y();

166}

175}

167

176

177+qreal DirectionalDragArea::touchSceneX() const

178+{

179+ return m_previousScenePos.x();

180+}

181+

182+qreal DirectionalDragArea::touchSceneY() const

183+{

184+ return m_previousScenePos.y();

185+}

186+

168void DirectionalDragArea::touchEvent(QTouchEvent *event)

187void DirectionalDragArea::touchEvent(QTouchEvent *event)

169{

188{

170 if (!isEnabled() || !isVisible()) {

189 if (!isEnabled() || !isVisible()) {

@@ -192,14 +211,17 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)

192{

211{

193 if ((event->touchPointStates() && (Qt::TouchPointPressed || Qt::TouchPointMoved))

212 if ((event->touchPointStates() && (Qt::TouchPointPressed || Qt::TouchPointMoved))

194 && event->touchPoints().count() == 1) {

213 && event->touchPoints().count() == 1) {

214+ const QTouchEvent::TouchPoint &touchPoint = event->touchPoints()[0];

195− m_startPos = event->touchPoints()[0].pos();

215+ m_startPos = touchPoint.pos();

216+ m_startScenePos = touchPoint.scenePos();

196− m_touchId = event->touchPoints()[0].id();

217+ m_touchId = touchPoint.id();

197 m_dampedPos.reset(m_startPos);

218 m_dampedPos.reset(m_startPos);

198 updateVelocityCalculator(m_startPos);

219 updateVelocityCalculator(m_startPos);

199 m_velocityCalculator->reset();

220 m_velocityCalculator->reset();

200 m_numSamplesOnLastSpeedCheck = 0;

221 m_numSamplesOnLastSpeedCheck = 0;

201 m_silenceTime = 0;

222 m_silenceTime = 0;

202 setPreviousPos(m_startPos);

223 setPreviousPos(m_startPos);

224+ setPreviousScenePos(m_startScenePos);

203

225

204 if (m_distanceThreshold > 0)

226 if (m_distanceThreshold > 0)

205 setStatus(Undecided);

227 setStatus(Undecided);

@@ -242,6 +264,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)

242 }

264 }

243

265

244 setPreviousPos(touchPos);

266 setPreviousPos(touchPos);

267+ setPreviousScenePos(touchPoint->scenePos());

245

268

246 if (movedFarEnough(touchPos)) {

269 if (movedFarEnough(touchPos)) {

247 setStatus(Recognized);

270 setStatus(Recognized);

@@ -253,6 +276,7 @@ void DirectionalDragArea::touchEvent_recognized(QTouchEvent *event)

253 const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);

276 const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);

254

277

255 setPreviousPos(touchPoint->pos());

278 setPreviousPos(touchPoint->pos());

279+ setPreviousScenePos(touchPoint->scenePos());

256

280

257 if (touchPoint->state() == Qt::TouchPointReleased) {

281 if (touchPoint->state() == Qt::TouchPointReleased) {

258 setStatus(WaitingForTouch);

282 setStatus(WaitingForTouch);

@@ -398,6 +422,28 @@ void DirectionalDragArea::setPreviousPos(QPointF point)

398 }

422 }

399}

423}

400

424

425+void DirectionalDragArea::setPreviousScenePos(QPointF point)

426+{

427+ Q_ASSERT(m_status != Rejected);

428+

429+ bool xChanged = m_previousScenePos.x() != point.x();

430+ bool yChanged = m_previousScenePos.y() != point.y();

431+

432+ m_previousScenePos = point;

433+

434+ if (xChanged) {

435+ Q_EMIT touchSceneXChanged(point.x());

436+ if (Direction::isHorizontal(m_direction))

437+ Q_EMIT sceneDistanceChanged(sceneDistance());

438+ }

439+

440+ if (yChanged) {

441+ Q_EMIT touchSceneYChanged(point.y());

442+ if (Direction::isVertical(m_direction))

443+ Q_EMIT sceneDistanceChanged(sceneDistance());

444+ }

445+}

446+

401void DirectionalDragArea::updateVelocityCalculator(QPointF point)

447void DirectionalDragArea::updateVelocityCalculator(QPointF point)

402{

448{

403 if (Direction::isHorizontal(m_direction)) {

449 if (Direction::isHorizontal(m_direction)) {

plugins/Ubuntu/Gestures/DirectionalDragArea.h+19−1

@@ -60,10 +60,18 @@ class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {

60 // DirectionalDragArea's direction.

61 Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged)

63+ // The distance travelled by the finger along the axis specified by

64+ // DirectionalDragArea's direction in scene coordinates

65+ Q_PROPERTY(qreal sceneDistance READ sceneDistance NOTIFY sceneDistanceChanged)

66+

63− // Position of the touch point performing the drag.

67+ // Position of the touch point performing the drag relative to this item.

64 Q_PROPERTY(qreal touchX READ touchX NOTIFY touchXChanged)

68 Q_PROPERTY(qreal touchX READ touchX NOTIFY touchXChanged)

65 Q_PROPERTY(qreal touchY READ touchY NOTIFY touchYChanged)

69 Q_PROPERTY(qreal touchY READ touchY NOTIFY touchYChanged)

71+ // Position of the touch point performing the drag, in scene's coordinate system

72+ Q_PROPERTY(qreal touchSceneX READ touchSceneX NOTIFY touchSceneXChanged)

73+ Q_PROPERTY(qreal touchSceneY READ touchSceneY NOTIFY touchSceneYChanged)

74+

67 // The current status of the directional drag gesture area.

75 // The current status of the directional drag gesture area.

68 Q_PROPERTY(Status status READ status NOTIFY statusChanged)

76 Q_PROPERTY(Status status READ status NOTIFY statusChanged)

@@ -146,10 +154,14 @@ public:

146 Status status() const { return m_status; }

154 Status status() const { return m_status; }

147

155

148 qreal distance() const;

156 qreal distance() const;

157+ qreal sceneDistance() const;

149

158

150 qreal touchX() const;

159 qreal touchX() const;

151 qreal touchY() const;

160 qreal touchY() const;

152

161

162+ qreal touchSceneX() const;

163+ qreal touchSceneY() const;

164+

153 bool dragging() const { return (m_status == Undecided) || (m_status == Recognized); }

165 bool dragging() const { return (m_status == Undecided) || (m_status == Recognized); }

154

166

155 qreal maxDeviation() const { return m_dampedPos.maxDelta(); }

167 qreal maxDeviation() const { return m_dampedPos.maxDelta(); }

@@ -180,6 +192,7 @@ Q_SIGNALS:

180 void statusChanged(Status value);

192 void statusChanged(Status value);

181 void draggingChanged(bool value);

193 void draggingChanged(bool value);

182 void distanceChanged(qreal value);

194 void distanceChanged(qreal value);

195+ void sceneDistanceChanged(qreal value);

183 void maxDeviationChanged(qreal value);

196 void maxDeviationChanged(qreal value);

184 void wideningAngleChanged(qreal value);

197 void wideningAngleChanged(qreal value);

185 void distanceThresholdChanged(qreal value);

198 void distanceThresholdChanged(qreal value);

@@ -187,6 +200,8 @@ Q_SIGNALS:

187 void maxSilenceTimeChanged(int value);

200 void maxSilenceTimeChanged(int value);

188 void touchXChanged(qreal value);

201 void touchXChanged(qreal value);

189 void touchYChanged(qreal value);

202 void touchYChanged(qreal value);

203+ void touchSceneXChanged(qreal value);

204+ void touchSceneYChanged(qreal value);

190

205

191protected:

206protected:

192 virtual void touchEvent(QTouchEvent *event);

207 virtual void touchEvent(QTouchEvent *event);

@@ -205,12 +220,15 @@ private:

205 const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);

220 const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);

206 void setStatus(Status newStatus);

221 void setStatus(Status newStatus);

207 void setPreviousPos(QPointF point);

222 void setPreviousPos(QPointF point);

223+ void setPreviousScenePos(QPointF point);

208 void updateVelocityCalculator(QPointF point);

224 void updateVelocityCalculator(QPointF point);

209

225

210 Status m_status;

226 Status m_status;

211

227

212 QPointF m_startPos;

228 QPointF m_startPos;

229+ QPointF m_startScenePos;

213 QPointF m_previousPos;

230 QPointF m_previousPos;

231+ QPointF m_previousScenePos;

214 int m_touchId;

232 int m_touchId;

215

233

216 // A movement damper is used in some of the gesture recognition calculations

234 // A movement damper is used in some of the gesture recognition calculations

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+60

@@ -65,6 +65,8 @@ private Q_SLOTS:

65 void minSpeed_data();

66 void recognitionTimerUsage();

67 void maxSilenceTime();

68+ void sceneXAndX();

69+ void sceneYAndY();

69private:

71private:

70 QQuickView *createView();

72 QQuickView *createView();

@@ -454,6 +456,64 @@ void tst_DirectionalDragArea::maxSilenceTime()

454 QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Rejected);

456 QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Rejected);

455}

457}

456

458

459+/*

460+ Checks that it informs the X coordinate of the touch point in local and scene coordinates

461+ correctly.

462+ */

463+void tst_DirectionalDragArea::sceneXAndX()

464+{

465+ DirectionalDragArea *edgeDragArea =

466+ view->rootObject()->findChild<DirectionalDragArea*>("hnDragArea");

467+ QVERIFY(edgeDragArea != 0);

468+ edgeDragArea->setRecognitionTimer(fakeTimer);

469+ edgeDragArea->setTimeSource(fakeTimeSource);

470+

471+ QPointF touchScenePos(view->width() - (edgeDragArea->width()/2.0f), view->height()/2.0f);

472+

473+ fakeTimeSource->m_msecsSinceReference = 0;

474+ QTest::touchEvent(view, device).press(0, touchScenePos.toPoint());

475+

476+ QSignalSpy touchXSpy(edgeDragArea, SIGNAL(touchXChanged(qreal)));

477+ QSignalSpy touchSceneXSpy(edgeDragArea, SIGNAL(touchSceneXChanged(qreal)));

478+

479+ touchScenePos.rx() = view->width() / 2;

480+ QTest::touchEvent(view, device).move(0, touchScenePos.toPoint());

481+

482+ QCOMPARE(touchXSpy.count(), 1);

483+ QCOMPARE(touchSceneXSpy.count(), 1);

484+ QCOMPARE(edgeDragArea->touchX(), touchScenePos.x() - edgeDragArea->x());

485+ QCOMPARE(edgeDragArea->touchSceneX(), touchScenePos.x());

486+}

487+

488+/*

489+ Checks that it informs the Y coordinate of the touch point in local and scene coordinates

490+ correctly.

491+ */

492+void tst_DirectionalDragArea::sceneYAndY()

493+{

494+ DirectionalDragArea *edgeDragArea =

495+ view->rootObject()->findChild<DirectionalDragArea*>("vnDragArea");

496+ QVERIFY(edgeDragArea != 0);

497+ edgeDragArea->setRecognitionTimer(fakeTimer);

498+ edgeDragArea->setTimeSource(fakeTimeSource);

499+

500+ QPointF touchScenePos(view->width()/2.0f, view->height() - (edgeDragArea->height()/2.0f));

501+

502+ fakeTimeSource->m_msecsSinceReference = 0;

503+ QTest::touchEvent(view, device).press(0, touchScenePos.toPoint());

504+

505+ QSignalSpy touchYSpy(edgeDragArea, SIGNAL(touchYChanged(qreal)));

506+ QSignalSpy touchSceneYSpy(edgeDragArea, SIGNAL(touchSceneYChanged(qreal)));

507+

508+ touchScenePos.ry() = view->height() / 2;

509+ QTest::touchEvent(view, device).move(0, touchScenePos.toPoint());

510+

511+ QCOMPARE(touchYSpy.count(), 1);

512+ QCOMPARE(touchSceneYSpy.count(), 1);

513+ QCOMPARE(edgeDragArea->touchY(), touchScenePos.y() - edgeDragArea->y());

514+ QCOMPARE(edgeDragArea->touchSceneY(), touchScenePos.y());

515+}

516+

457QTEST_MAIN(tst_DirectionalDragArea)

517QTEST_MAIN(tst_DirectionalDragArea)

458

518

459#include "tst_DirectionalDragArea.moc"

519#include "tst_DirectionalDragArea.moc"