FCL/sf/mw/hb: comparison src/hbcore/gestures/hbpangesturelogic

equal deleted inserted replaced

-:b7da29130b0e
+:80e4d18b72f5
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbpangesture.h"
+#include "hbpangesturelogic_p.h"
+#include "hbgestures_p.h"
+#include "hbnamespace_p.h"
+#include <hbdeviceprofile.h>
 #include <QEvent>
 #include <QGestureRecognizer>
 #include <QGraphicsView>
 #include <QMouseEvent>
 #include <QGraphicsScene>
-#include <hbdeviceprofile.h>
-#include "hbpangesture.h"
-#include "hbpangesture_p.h"
-#include "hbpangesturelogic_p.h"
-#include "hbnamespace_p.h"
 #define followedTouchPoint(te, gesture) te->touchPoints().at(followedTouchPointIndex(te, gesture))
 /*!
 @hbcore
 \return
 */
 HbPanGestureLogic::HbPanGestureLogic()
 {
-mCurrentTime = QTime();
 }
 HbPanGestureLogic::~HbPanGestureLogic() {}
 /*!
 gesture->d_ptr->mDeltaSinceLastTimeStamp      = QPointF(0,0);
 gesture->d_ptr->mSceneStartPos                = QPointF(0,0);
 gesture->d_ptr->mSceneLastOffset              = QPointF(0,0);
 gesture->d_ptr->mSceneOffset                  = QPointF(0,0);
 gesture->d_ptr->mSceneDeltaSinceLastTimeStamp = QPointF(0,0);
-gesture->d_ptr->mAxisX.clear();
+gesture->d_ptr->mAxisX.resetRecorder();
-gesture->d_ptr->mAxisY.clear();
+gesture->d_ptr->mAxisY.resetRecorder();
-gesture->d_ptr->mSceneAxisX.clear();
+gesture->d_ptr->mSceneAxisX.resetRecorder();
-gesture->d_ptr->mSceneAxisY.clear();
+gesture->d_ptr->mSceneAxisY.resetRecorder();
 gesture->setLastOffset(QPointF());
 gesture->setOffset(QPointF(0,0));
 gesture->setAcceleration(0);
 gesture->setStartPos(QPointF());
 */
 QGestureRecognizer::Result HbPanGestureLogic::handleMousePress(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
-QMouseEvent *me )
+QMouseEvent *me,
+qint64 currentTime )
 {
 // Just ignore situations that are not interesting at all.
 if ( !( gestureState == Qt::NoGesture && me->button() == Qt::LeftButton ) )
 {
 return QGestureRecognizer::Ignore;
 gesture->setLastOffset( QPointF( 0,0 ) );
 QPointF scenePos = HbGestureUtils::mapToScene(watched, me->globalPos());
 gesture->d_ptr->mSceneStartPos       = scenePos;
 gesture->d_ptr->mSceneOffset         = HbGestureUtils::mapToScene(watched, QPointF(0,0));
 gesture->d_ptr->mSceneLastOffset     = HbGestureUtils::mapToScene(watched, QPointF(0,0));
-gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+gesture->d_ptr->mLastTimeStamp = currentTime;
 gesture->d_ptr->mThresholdSquare = HbDefaultPanThreshold * HbDeviceProfile::current().ppmValue();
 gesture->d_ptr->mThresholdSquare = gesture->d_ptr->mThresholdSquare * gesture->d_ptr->mThresholdSquare;
 gesture->d_ptr->mAxisX.resetRecorder(velocityThreshold);
 gesture->d_ptr->mAxisY.resetRecorder(velocityThreshold);
 gesture->d_ptr->mSceneAxisX.resetRecorder(velocityThreshold);
 gesture->d_ptr->mSceneAxisY.resetRecorder(velocityThreshold);
-gesture->d_ptr->mAxisX.record( me->globalPos().x(), mCurrentTime );
+gesture->d_ptr->mAxisX.record( me->globalPos().x(), currentTime );
-gesture->d_ptr->mAxisY.record( me->globalPos().y(), mCurrentTime );
+gesture->d_ptr->mAxisY.record( me->globalPos().y(), currentTime );
-gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime );
+gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime );
-gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime );
+gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime );
 return QGestureRecognizer::MayBeGesture;
 }
 /*!
 */
 QGestureRecognizer::Result HbPanGestureLogic::handleMouseMove(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
-QMouseEvent *me )
+QMouseEvent *me,
+qint64 currentTime )
 {
 if ( !me->buttons().testFlag(Qt::LeftButton))
 {
 return QGestureRecognizer::Ignore;
 }
 gesture->setLastOffset( gesture->offset().toPoint() );
 gesture->setOffset( offset );
 gesture->d_ptr->mSceneLastOffset = gesture->d_ptr->mSceneOffset;
 gesture->d_ptr->mSceneOffset =
 HbGestureUtils::mapToScene(watched, me->globalPos()) - gesture->d_ptr->mSceneStartPos;
-gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+gesture->d_ptr->mLastTimeStamp = currentTime;
 QPointF scenePos = HbGestureUtils::mapToScene(watched, me->globalPos());
-gesture->d_ptr->mAxisX.record( me->globalPos().x(), mCurrentTime );
+gesture->d_ptr->mAxisX.record( me->globalPos().x(), currentTime );
-gesture->d_ptr->mAxisY.record( me->globalPos().y(), mCurrentTime );
+gesture->d_ptr->mAxisY.record( me->globalPos().y(), currentTime );
-gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime );
+gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime );
-gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime );
+gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime );
 QGraphicsView* view = qobject_cast<QGraphicsView*>(watched->parent());
 if (view) {
 QGraphicsScene* scene = view->scene();
 */
 QGestureRecognizer::Result HbPanGestureLogic::handleMouseRelease(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
-QMouseEvent *me )
+QMouseEvent *me,
+qint64 currentTime)
 {
 Q_UNUSED(me);
 Q_UNUSED(gesture);
 Q_UNUSED(watched);
-gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+gesture->d_ptr->mLastTimeStamp = currentTime;
 if ( gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated )
 {
 return QGestureRecognizer::FinishGesture;
 }
 */
 QGestureRecognizer::Result HbPanGestureLogic::handleTouchBegin(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
-QTouchEvent *te )
+QTouchEvent *te,
+qint64 currentTime)
 {
 gesture->d_ptr->mFollowedTouchPointId = getNextId(te);
 if(gesture->d_ptr->mFollowedTouchPointId == -1 && gestureState != Qt::NoGesture) {
 return QGestureRecognizer::FinishGesture; // if all touchpoints are released
 gesture->setLastOffset( QPointF( 0,0 ) );
 gesture->d_ptr->mSceneStartPos       = scenePos;
 gesture->d_ptr->mSceneOffset         = QPointF(0,0);
 gesture->d_ptr->mSceneLastOffset     = QPointF(0,0);
-gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+gesture->d_ptr->mLastTimeStamp = currentTime;
 qreal defaultThreshold = HbDefaultPanThreshold * HbDeviceProfile::current().ppmValue();
 gesture->d_ptr->mThresholdSquare = defaultThreshold * defaultThreshold;
 gesture->d_ptr->mAxisX.resetRecorder(defaultThreshold);
 gesture->d_ptr->mAxisY.resetRecorder(defaultThreshold);
 gesture->d_ptr->mSceneAxisX.resetRecorder(defaultThreshold);
 gesture->d_ptr->mSceneAxisY.resetRecorder(defaultThreshold);
-gesture->d_ptr->mAxisY.record( tp.screenPos().y(), mCurrentTime );
+gesture->d_ptr->mAxisY.record( tp.screenPos().y(), currentTime );
-gesture->d_ptr->mAxisX.record( tp.screenPos().x(), mCurrentTime );
+gesture->d_ptr->mAxisX.record( tp.screenPos().x(), currentTime );
-gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime );
+gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime );
-gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime );
+gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime );
 if (gestureState != Qt::NoGesture) {
 return QGestureRecognizer::Ignore;
 } else {
 return QGestureRecognizer::MayBeGesture;
 */
 QGestureRecognizer::Result HbPanGestureLogic::handleTouchMove(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
-QTouchEvent *te)
+QTouchEvent *te,
+qint64 currentTime)
 {
 QTouchEvent::TouchPoint tp = followedTouchPoint(te, gesture);
 // touch event handling has already started
 // need to update position and offset
 gesture->setLastOffset( gesture->offset().toPoint() );
 gesture->setOffset( offset );
 gesture->d_ptr->mSceneLastOffset = gesture->d_ptr->mSceneOffset;
 gesture->d_ptr->mSceneOffset =
 HbGestureUtils::mapToScene(watched, tp.screenPos()) - gesture->d_ptr->mSceneStartPos;
-gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+gesture->d_ptr->mLastTimeStamp = currentTime;
-gesture->d_ptr->mAxisX.record( tp.screenPos().x(), mCurrentTime );
+gesture->d_ptr->mAxisX.record( tp.screenPos().x(), currentTime );
-gesture->d_ptr->mAxisY.record( tp.screenPos().y(), mCurrentTime );
+gesture->d_ptr->mAxisY.record( tp.screenPos().y(), currentTime );
 QPointF scenePos = HbGestureUtils::mapToScene(watched, tp.screenPos());
-gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime );
+gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime );
-gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime );
+gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime );
 QGraphicsView* view = qobject_cast<QGraphicsView*>(watched->parent());
 if (view) {
 QGraphicsScene* scene = view->scene();
 if (scene && scene->property(HbPrivate::OverridingGesture.latin1()).isValid() &&
 */
 QGestureRecognizer::Result HbPanGestureLogic::handleTouchEnd(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
-QTouchEvent *te )
+QTouchEvent *te,
+qint64 currentTime)
 {
 Q_UNUSED(te);
 Q_UNUSED(gesture);
 Q_UNUSED(watched);
-gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+gesture->d_ptr->mLastTimeStamp = currentTime;
 if ( gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated )
 {
 return QGestureRecognizer::FinishGesture;
 }
 QGestureRecognizer::Result HbPanGestureLogic::recognize(
 Qt::GestureState gestureState,
 HbPanGesture *gesture,
 QObject *watched,
 QEvent *event,
-QTime currentTime)
+qint64 currentTime)
 {
-// Record the time right away.
-mCurrentTime = currentTime;
 if ( isMouseEvent(event->type()) )
 {
 if (gesture->d_ptr->mIgnoreMouseEvents) {
 return QGestureRecognizer::Ignore;
 }
 QMouseEvent* me = static_cast<QMouseEvent*>(event);
 switch(event->type())
 {
 case QEvent::MouseButtonDblClick:
 case QEvent::MouseButtonPress:
-return handleMousePress(gestureState, gesture, watched, me);
+return handleMousePress(gestureState, gesture, watched, me, currentTime);
 case QEvent::MouseMove:
-return handleMouseMove(gestureState, gesture, watched, me);
+return handleMouseMove(gestureState, gesture, watched, me, currentTime);
 case QEvent::MouseButtonRelease:
-return handleMouseRelease(gestureState, gesture, watched, me);
+return handleMouseRelease(gestureState, gesture, watched, me, currentTime);
 default: break;
 }
 }
 if (isTouchEvent(event->type()) && watched->isWidgetType() ) {
 QTouchEvent *te = static_cast<QTouchEvent *>(event);
 switch(event->type())
 {
 case QEvent::TouchBegin:
-return handleTouchBegin(gestureState, gesture, watched, te);
+return handleTouchBegin(gestureState, gesture, watched, te, currentTime);
-break;
 case QEvent::TouchUpdate: {
 gesture->d_ptr->mIgnoreMouseEvents = true;
 if (followedTouchPoint(te, gesture).state() == Qt::TouchPointReleased) {
 //qDebug() << "---- Finger changed ----";
-return handleTouchBegin(gestureState, gesture, watched, te);
+return handleTouchBegin(gestureState, gesture, watched, te, currentTime);
 }
 if (followedTouchPoint(te, gesture).state() == Qt::TouchPointMoved) {
-return handleTouchMove(gestureState, gesture, watched, te);
+return handleTouchMove(gestureState, gesture, watched, te, currentTime);
 }
 break;
 }
 case QEvent::TouchEnd:
 //qDebug() << "===== TOUCHEND ======" ;
 gesture->d_ptr->mIgnoreMouseEvents = false;
-return handleTouchEnd(gestureState, gesture, watched, te);
+return handleTouchEnd(gestureState, gesture, watched, te, currentTime);
 default:
 break;
 }
 }
 return QGestureRecognizer::Ignore;

changeset 30	80e4d18b72f5
parent 28	b7da29130b0e