Merge branch 'map' of https://vcs.maemo.org/git/situare into map

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 489ef4c..fe86baf 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -101,38 +101,25 @@ qreal MapView::currentScale()
     return currentTransform.m11();
 }
 
-//void MapView::scrollContentsBy (int dx, int dy)
-//{
-//    qDebug() << __PRETTY_FUNCTION__ << "dx:" << dx << "dy:" << dy;
-//
-//    QGraphicsView::scrollContentsBy(dx, dy);
-//}
-
-void MapView::mouseMoveEvent(QMouseEvent *event)
+void MapView::scrollContentsBy (int dx, int dy)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos());
+//    qDebug() << __PRETTY_FUNCTION__;
 
-    emit viewScrolled(m_scenePosition);
-    //qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition" << m_scenePosition;
+    QGraphicsView::scrollContentsBy(dx, dy);
 
-    m_mousePosition = mapToScene(event->pos());
+    QPoint centerInScene = mapToScene(frameRect().center()).toPoint();
+//    qDebug() << __PRETTY_FUNCTION__ << "centerInScene:" << centerInScene;
+    emit viewScrolled(centerInScene);
 }
 
-void MapView::mousePressEvent(QMouseEvent *event)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
-}
-
-
-void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)
-{
-    //qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+//    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
     centerOn(sceneCoordinate);
 }
 
 void MapView::resizeEvent(QResizeEvent *event)
 {
-    qDebug() << "Resize event: " << event->size();
+    //qDebug() << "Resize event: " << event->size();
     emit viewResized(event->size());
 }