Re-factored the source to use the new coordinate classes

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 9e45304..b93c34d 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -65,11 +65,11 @@ MapView::MapView(QWidget *parent)
             this, SLOT(doubleTapZoomFinished()));
 }
 
-void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
+void MapView::centerToSceneCoordinates(const SceneCoordinate &sceneCoordinate)
 {
     qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
 
-    centerOn(sceneCoordinate);
+    centerOn(sceneCoordinate.toPointF());
 }
 
 void MapView::doubleTapZoomFinished()
@@ -94,8 +94,8 @@ void MapView::mouseDoubleClickEvent(QMouseEvent *event)
 
         m_scroller->setEasingCurve(QEasingCurve::Linear);
         m_scroller->setDuration(ZOOM_TIME_MS);
-        m_scroller->setStartValue(m_scenePosition);
-        m_scroller->setEndValue(zoomPosition);
+        m_scroller->setStartValue(QPointF(m_scenePosition));
+        m_scroller->setEndValue(QPointF(zoomPosition));
 
         m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
         m_zoomAnimation->setDuration(ZOOM_TIME_MS);
@@ -123,7 +123,7 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
     m_time.start();
     m_index++;
 
-    emit viewScrolled(m_scenePosition);
+    emit viewScrolled(SceneCoordinate(m_scenePosition.x(), m_scenePosition.y()));
 
     m_mouseLastScenePosition = mapToScene(event->pos()).toPoint();
     m_mouseLastViewPosition = event->pos();
@@ -191,8 +191,8 @@ void MapView::mouseReleaseEvent(QMouseEvent *event)
 
             m_scroller->setEasingCurve(QEasingCurve::OutCirc);
             m_scroller->setDuration(KINETIC_SCROLL_TIME_MS);
-            m_scroller->setStartValue(m_scenePosition);
-            m_scroller->setEndValue(m_scenePosition + effectSceneDistance.toPoint());
+            m_scroller->setStartValue(QPointF(m_scenePosition));
+            m_scroller->setEndValue(QPointF(m_scenePosition) + effectSceneDistance);
             m_scroller->start();
         }
     }