FCL/sf/app/browserui: comparison qstmgesturelib/recognisers/qstmpinchgesturerecogniser.cpp

equal deleted inserted replaced

-:6aeb7a756187
+:3c88a81ff781
 float newd = calculateDistance() ;
 // check if the difference is too big and adjust accordingly
 // the method also updates the m_ddistance
 difference = adjustPinchMove(m_ddistance, newd) ;
 // Now we have a pinch gesture with size as details
-qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend);
+qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend, puie->timestamp());
 pgest.setLogging(m_loggingenabled);
 pgest.setDetails(&difference) ;
 pgest.setTarget(puie->target());
 // inform the listener
 m_listener->gestureEnter(pgest);
 m_pinchend = tp1;
 calculateZoomingLine();
 m_ddistance = calculateDistance();
 state = ELockToThisGesture ;    // NOTE: once pinch is started, it will stay until release
 // create the first pich gesture which does not yet resize anything
-qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend);
+qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend, tstamp);
 pgest.setTarget(puie->target());
 pgest.setLogging(m_loggingenabled);
 pgest.setDetails(0) ;
 // inform the listener
 m_listener->gestureEnter(pgest);
 if (m_loggingenabled) {
 QPoint p1 = puie1->currentXY() ;
 QPoint p2 = puie2->currentXY() ;
 LOGARG("QStm_PinchGestureRecogniser: two streams: %s at [%d,%d], %s at [%d,%d]",
 qstmUiEventEngine::event_name(eventCode1), p1.x(), p1.y(),
-qstmUiEventEngine::event_name(eventCode1), p2.x(), p2.y()
+qstmUiEventEngine::event_name(eventCode2), p2.x(), p2.y()
 ) ;
 }
 eventCode2 == qstmUiEventEngine::EMove  ||
 eventCode2 == qstmUiEventEngine::EHold))   {
 // This is valid pinching start
 m_pinching = true ;
+m_isReleased[0] = false;
+m_isReleased[1] = false;
 // get the start and end position for the picnhing vector
 m_pinchstart = puie1->currentXY() ;
 m_pinchend = puie2->currentXY() ;
 calculateZoomingLine();
 m_ddistance = calculateDistance();
 LOGARG("QStm_PinchGestureRecogniser: pinch start: [%d,%d][%d,%d]",
 m_pinchstart.x(), m_pinchstart.y(), m_pinchend.x(), m_pinchend.y()) ;
 }
 // create the first pich gesture which does not yet resize anything
-qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend);
+qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend, puie2->timestamp());
 pgest.setLogging(m_loggingenabled);
 pgest.setDetails(0) ;
-pgest.setTarget(puie->target());
+pgest.setTarget(puie1->target());
 // inform the listener
 m_listener->gestureEnter(pgest);
 }
 else  {
 	// Not a valid pinching start, do nothing (maybe it were easier to just check if one of the events is ERelease)
 }
 }
 else  {
-// We have entered pinching state, lets move one of the points unless it is a release
-if (eventCode1 == qstmUiEventEngine::ERelease || eventCode2 == qstmUiEventEngine::ERelease) {
+// Keep track of the state of both fingers
+if (eventCode1 == qstmUiEventEngine::ERelease)
+m_isReleased[0] = true;
+else if (eventCode1 == qstmUiEventEngine::ETouch)
+m_isReleased[0] = false;
+if (eventCode2 == qstmUiEventEngine::ERelease)
+m_isReleased[1] = true;
+else if (eventCode2 == qstmUiEventEngine::ETouch)
+m_isReleased[1] = false;
+LOGARG("QStm_PinchGestureRecogniser: Checking for released[] %d %d", m_isReleased[0], m_isReleased[1]);
+// Only if both fingers are "released" are we done pinching
+if (m_isReleased[0] && m_isReleased[1]) {
+release(pge);
 m_pinching = false ;
 }
 else  {
 state = ELockToThisGesture ;
 LOGARG("QStm_PinchGestureRecogniser: pinch: [%d,%d][%d,%d], diff %d",
 m_pinchstart.x(), m_pinchstart.y(), m_pinchend.x(), m_pinchend.y(), difference) ;
 }
-qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend);
+qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend, puie2->timestamp());
 pgest.setLogging(m_loggingenabled);
-pgest.setDetails(difference) ;
+pgest.setDetails(&difference) ;
-pgest.setTarget(puie->target());
+pgest.setTarget(puie1->target());
 // inform the listener
 m_listener->gestureEnter(pgest);
 }
 }
+}
+else if (numOfActiveStreams == 1) {
+const qstmUiEventEngine::QStm_UiEventIf* puie1 = pge->getUiEvents(0);
+qstmUiEventEngine::QStm_UiEventCode eventCode1 = puie1->code() ;
+if (m_pinching && eventCode1 == qstmUiEventEngine::ERelease) {
+release(pge);
+}
 }
 #endif
 if (state == ENotMyGesture) {
 if (m_loggingenabled) {
 LOGARG("QStm_PinchGestureRecogniser: NotMyGesture %d %d %d ", m_pinching, m_holdseen, numOfActiveStreams) ;
 }
 // if it was not our gesture, then the state can not be pinching...
 m_pinching = false ;
+m_isReleased[0] = true;
+m_isReleased[1] = true;
 }
 m_state = state;
 return state;
 }
 void QStm_PinchGestureRecogniser::release(QStm_GestureEngineIf* pge)
 {
+if (m_loggingenabled) {
+LOGARG("QStm_PinchGestureRecogniser: release. m_pinchstart[%d, %d], m_pinchend[%d, %d]",
+m_pinchstart.x(), m_pinchstart.y(), m_pinchend.x(), m_pinchend.y());
+}
 m_pinching = false ;
 const qstmUiEventEngine::QStm_UiEventIf* puie = pge->getUiEvents(0);
-qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend);
+qstmGesture::QStm_TwoPointGesture pgest(KUid, m_pinchstart, m_pinchend, puie->timestamp());
 pgest.setDetails(0) ;
 pgest.setTarget(puie->target());
 m_listener->gestureExit(pgest) ;
 m_state = ENotMyGesture;
 }
 /*!
 * Now that we know the two points where the zooming started, we move those points only along
 if (changePercentage > 10.f) {
 // change more than 10%, make at most 10%
 float newdiff = previousDistance*0.1f ;
 if (previousDistance > newDistance) newdiff = -newdiff ;
 if (m_loggingenabled) {
-LOGARG("QStm_PinchGestureRecogniser: adjustPinchMove from %f to %f : was, now %f %f",
+LOGARG("QStm_PinchGestureRecogniser: adjustPinchMove from %f to %f : was %f, now %f, changePercentage %f",
-double(logdiff), double(newdiff), double(previousDistance), double(newDistance));
+double(logdiff), double(newdiff), double(previousDistance), double(newDistance), double(changePercentage));
 }
 previousDistance = previousDistance + newdiff ;
 diff = newdiff ;
 }
 else {
 if (m_loggingenabled) {
-LOGARG("QStm_PinchGestureRecogniser: adjustPinchMove from %f to %f : was, now %f %f",
+LOGARG("QStm_PinchGestureRecogniser: adjustPinchMove from %f to %f : was %f, now %f, changePercentage %f",
-double(logdiff), double(diff), double(previousDistance), double(newDistance));
+double(logdiff), double(diff), double(previousDistance), double(newDistance), double(changePercentage));
 }
 previousDistance = newDistance ;  // accept the new value and update the new length
 diff = logdiff ;    // put the original back (this is why the logdiff can not be ABS(diff)!
 }
 return (int)diff ;

changeset 16	3c88a81ff781
parent 3	0954f5dd2cd0