Changed deceleration curve and adjusted scroll distance calculation

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 1d92dd9..32e3554 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -26,8 +26,11 @@
 #include <QMouseEvent>
 
 #include "mapcommon.h"
+#include "mapscroller.h"
 #include "mapview.h"
 
+const int KINETIC_SCROLL_TIME_MS = 1000;
+
 MapView::MapView(QWidget *parent)
     : QGraphicsView(parent)
 {
@@ -37,67 +40,97 @@ MapView::MapView(QWidget *parent)
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     m_zoomAnimation = new QPropertyAnimation(this, "viewScale", this);
-    connect(m_zoomAnimation, SIGNAL(finished()), this, SIGNAL(viewZoomFinished()));
-}
-
-void MapView::setZoomLevel(int zoomLevel)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    if (m_zoomAnimation) {
-        m_zoomAnimation->stop();
-        m_zoomAnimation->setDuration(ZOOM_TIME);
-        m_zoomAnimation->setStartValue(viewScale());
-        m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
-
-        m_zoomAnimation->start();
-    }
-}
+    connect(m_zoomAnimation, SIGNAL(finished()),
+        this, SIGNAL(viewZoomFinished()));
 
-qreal MapView::viewScale()
-{
-    qDebug() << __PRETTY_FUNCTION__;
+    setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing);
 
-    return transform().m11();
+    m_scroller = &MapScroller::getInstance();
 }
 
-void MapView::setViewScale(qreal viewScale)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
 
-    QTransform transform;
-    transform.scale(viewScale, viewScale);
-    setTransform(transform);
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+    centerOn(sceneCoordinate);
 }
 
 void MapView::mouseMoveEvent(QMouseEvent *event)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos()).toPoint();
+    m_scenePosition += m_mouseLastScenePosition - mapToScene(event->pos()).toPoint();
 
     qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
 
+    if (m_index >= VALUES)
+        m_index = 0;
+
+    m_dragMovement[m_index] = m_mouseLastViewPosition - event->pos();
+    m_dragTime[m_index] = time.elapsed();
+    time.start();
+
+//    qWarning() << __PRETTY_FUNCTION__ << m_index << m_dragMovement[m_index].x() << m_dragMovement[m_index].y() << m_dragTime[m_index];
+
+    m_index++;
+
+//    qWarning() << __PRETTY_FUNCTION__ << m_dragViewSpeed.x() << m_dragViewSpeed.y();
+//    qWarning() << __PRETTY_FUNCTION__  << "elapsed:" << time.elapsed() << "ms";
+
     emit viewScrolled(m_scenePosition);
 
-    m_mousePosition = mapToScene(event->pos()).toPoint();
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+    m_mouseLastScenePosition = mapToScene(event->pos()).toPoint();
+    m_mouseLastViewPosition = event->pos();
 }
 
 void MapView::mousePressEvent(QMouseEvent *event)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QGraphicsView::mousePressEvent(event); // Temporary solution
+    time.start();
+
+    m_scroller->stop();
 
-    m_mousePosition = mapToScene(event->pos()).toPoint();
+    QGraphicsView::mousePressEvent(event);
+
+    m_mouseLastScenePosition = mapToScene(event->pos()).toPoint();
+    m_mouseLastViewPosition = event->pos();
     m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+
+    for (int i = 0; i < VALUES; i++) {
+        m_dragMovement[i] = QPoint();
+        m_dragTime[i] = 0;
+    }
+    m_index = 0;
 }
 
-void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
+void MapView::mouseReleaseEvent(QMouseEvent *event)
 {
-    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+//    qWarning() << __PRETTY_FUNCTION__;
 
-    centerOn(sceneCoordinate);
+    const qreal MS_PER_S = 1000;
+    const qreal SPEED_TO_DISTANCE_FACTOR = KINETIC_SCROLL_TIME_MS / MS_PER_S * 0.10;
+
+    QGraphicsView::mouseReleaseEvent(event);
+
+    QPointF dragViewSpeed;
+    int values = 0;
+    for (int i = 0; i < VALUES; i++) {
+        if (m_dragTime > 0) {
+            dragViewSpeed += m_dragMovement[i] / (m_dragTime[i] / MS_PER_S);
+            values++;
+        }
+//        qWarning() << __PRETTY_FUNCTION__ << m_dragMovement[i].x() << m_dragMovement[i].y() << m_dragTime[i];
+    }
+    dragViewSpeed /= values;
+    dragViewSpeed *= SPEED_TO_DISTANCE_FACTOR;
+
+//    qWarning() << __PRETTY_FUNCTION__ << dragViewSpeed.x() << dragViewSpeed.y();
+
+    QPointF dragSceneSpeed = dragViewSpeed * (1 << (MAX_MAP_ZOOM_LEVEL - m_zoomLevel));
+
+    m_scroller->setDuration(KINETIC_SCROLL_TIME_MS);
+    m_scroller->setStartValue(m_scenePosition);
+    m_scroller->setEndValue(m_scenePosition + dragSceneSpeed.toPoint());
+    m_scroller->start();
 }
 
 void MapView::resizeEvent(QResizeEvent *event)
@@ -105,33 +138,36 @@ void MapView::resizeEvent(QResizeEvent *event)
     qDebug() << __PRETTY_FUNCTION__ << "Resize:" << event->size();
 
     emit viewResized(event->size());
-    emit viewResizedNewSize(viewport()->width(), viewport()->height());
-    //emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
-void MapView::showEvent(QShowEvent *event)
+void MapView::setViewScale(qreal viewScale)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QGraphicsView::showEvent(event);
-    //emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+    QTransform transform;
+    transform.scale(viewScale, viewScale);
+    setTransform(transform);
 }
 
-void MapView::updateViewPortContent()
+void MapView::setZoomLevel(int zoomLevel)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QPoint topLeft = mapToScene(viewport()->contentsRect().topLeft()).toPoint();
-    QPoint bottomRight = mapToScene(viewport()->contentsRect().bottomRight()).toPoint();
-    //emit viewContentChanged(QRect(topLeft, bottomRight));
+    m_zoomLevel = zoomLevel;
+
+    if (m_zoomAnimation) {
+        m_zoomAnimation->stop();
+        m_zoomAnimation->setDuration(ZOOM_TIME);
+        m_zoomAnimation->setStartValue(viewScale());
+        m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
+
+        m_zoomAnimation->start();
+    }
 }
 
-QRect MapView::viewportContent()
+qreal MapView::viewScale()
 {
-    QPoint topLeft = mapToScene(viewport()->contentsRect().topLeft()).toPoint();
-    QPoint bottomRight = mapToScene(viewport()->contentsRect().bottomRight()).toPoint();
-    //viewContentChanged(QRect(topLeft, bottomRight));
-    //emit viewContentChanged(QRect(topLeft, bottomRight));
+    qDebug() << __PRETTY_FUNCTION__;
 
-    return QRect(topLeft, bottomRight);
+    return transform().m11();
 }