Map double click zoom reviewed.

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index c142f88..4bde6c3 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -40,7 +40,8 @@ const int KINETIC_SCROLL_TIME_MS = 750;
 const qreal KINETIC_SPEED_TO_DISTANCE_FACTOR = 0.15 * sqrt(KINETIC_SCROLL_TIME_MS / MS_PER_S);
 
 MapView::MapView(QWidget *parent)
-    : QGraphicsView(parent)
+    : QGraphicsView(parent),
+      m_doubleTapZoomRunning(false)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -50,14 +51,15 @@ MapView::MapView(QWidget *parent)
     m_zoomAnimation = new QPropertyAnimation(this, "viewScale", this);
     connect(m_zoomAnimation, SIGNAL(finished()),
         this, SIGNAL(viewZoomFinished()));
-
     setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing);
 
     m_scroller = &MapScroller::getInstance();
 
-    m_groupAnimation = new QParallelAnimationGroup(this);
-    m_groupAnimation->addAnimation(m_scroller);
-    m_groupAnimation->addAnimation(m_zoomAnimation);
+    m_scrollAndZoomAnimation = new QParallelAnimationGroup();
+    m_scrollAndZoomAnimation->addAnimation(m_scroller);
+    m_scrollAndZoomAnimation->addAnimation(m_zoomAnimation);
+    connect(m_scrollAndZoomAnimation, SIGNAL(finished()),
+            this, SLOT(doubleTapZoomFinished()));
 }
 
 void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
@@ -67,35 +69,48 @@ void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
     centerOn(sceneCoordinate);
 }
 
+void MapView::doubleTapZoomFinished()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_doubleTapZoomRunning = false;
+    emit zoomIn();
+}
+
 void MapView::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    QPoint pressPos = mapToScene(event->pos()).toPoint();
-    QPoint centerPos = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
-    QPoint zoomPoint = centerPos - ((centerPos - pressPos) / 2);
+    qDebug() << __PRETTY_FUNCTION__;
 
-    m_groupAnimation->stop();
+    if (m_zoomLevel + 1 <= MAX_MAP_ZOOM_LEVEL) {
+        QPoint pressPosition = mapToScene(event->pos()).toPoint();
+        QPoint viewCenterPosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+        QPoint zoomPosition = viewCenterPosition - ((viewCenterPosition - pressPosition) / 2);
 
-    m_scroller->setEasingCurve(QEasingCurve::OutCirc);
-    m_scroller->setDuration(KINETIC_SCROLL_TIME_MS);
-    m_scroller->setStartValue(m_scenePosition);
-    m_scroller->setEndValue(zoomPoint);
+        m_scrollAndZoomAnimation->stop();
+        m_doubleTapZoomRunning = true;
 
-    m_zoomAnimation->setEasingCurve(QEasingCurve::OutCirc);
-    m_zoomAnimation->setDuration(KINETIC_SCROLL_TIME_MS);
-    m_zoomAnimation->setStartValue(viewScale());
-    m_zoomAnimation->setEndValue(pow(2, ++m_zoomLevel - MAX_MAP_ZOOM_LEVEL));
+        m_scroller->setEasingCurve(QEasingCurve::Linear);
+        m_scroller->setDuration(ZOOM_TIME);
+        m_scroller->setStartValue(m_scenePosition);
+        m_scroller->setEndValue(zoomPosition);
 
+        m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
+        m_zoomAnimation->setDuration(ZOOM_TIME);
+        m_zoomAnimation->setStartValue(viewScale());
+        m_zoomAnimation->setEndValue(pow(2, m_zoomLevel+1 - MAX_MAP_ZOOM_LEVEL));
 
-    m_groupAnimation->start();
+        m_scrollAndZoomAnimation->start();
+    }
 }
 
 void MapView::mouseMoveEvent(QMouseEvent *event)
 {
-    m_scenePosition += m_mouseLastScenePosition - mapToScene(event->pos()).toPoint();
+    qDebug() << __PRETTY_FUNCTION__;
 
-    qWarning() << __PRETTY_FUNCTION__;
+    if (m_doubleTapZoomRunning)
+        return;
 
-    qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
+    m_scenePosition += m_mouseLastScenePosition - mapToScene(event->pos()).toPoint();
 
     if (m_index >= VALUES)
         m_index = 0;
@@ -113,9 +128,11 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
 
 void MapView::mousePressEvent(QMouseEvent *event)
 {
-    qWarning() << __PRETTY_FUNCTION__;
     qDebug() << __PRETTY_FUNCTION__;
 
+    if (m_doubleTapZoomRunning)
+        return;
+
     m_time.start();
 
     m_scroller->stop();
@@ -137,6 +154,9 @@ void MapView::mouseReleaseEvent(QMouseEvent *event)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    if (m_doubleTapZoomRunning)
+        return;
+
     int elapsed = m_time.elapsed();
 
     QGraphicsView::mouseReleaseEvent(event);
@@ -191,8 +211,9 @@ void MapView::setZoomLevel(int zoomLevel)
 
     m_zoomLevel = zoomLevel;
 
-    if (m_zoomAnimation && (m_zoomAnimation->state() == QAbstractAnimation::Stopped)) {
+    if (m_zoomAnimation) {
         m_zoomAnimation->stop();
+        m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
         m_zoomAnimation->setDuration(ZOOM_TIME);
         m_zoomAnimation->setStartValue(viewScale());
         m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
@@ -207,3 +228,11 @@ qreal MapView::viewScale()
 
     return transform().m11();
 }
+
+MapView::~MapView()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_scrollAndZoomAnimation->removeAnimation(m_scroller);
+    delete m_scrollAndZoomAnimation;
+}