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

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 9071e85..baaafe1 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -3,6 +3,7 @@
    Copyright (C) 2010  Ixonos Plc. Authors:
 
        Sami Rämö - sami.ramo@ixonos.com
+       Pekka Nissinen - pekka.nissinen@ixonos.com
 
    Situare is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -29,8 +30,9 @@
 
 MapView::MapView(QWidget *parent)
     : QGraphicsView(parent)
-    , m_timerID(NULL)
 {
+    qDebug() << __PRETTY_FUNCTION__;
+
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
@@ -40,69 +42,29 @@ MapView::MapView(QWidget *parent)
 
 void MapView::setZoomLevel(int zoomLevel)
 {
-//    m_zoomTargetScale = pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL);
-//    m_zoomScaleDelta = (m_zoomTargetScale - currentScale()) / (ZOOM_FPS * (ZOOM_TIME / 1000));
-//
-//    if (m_timerID)
-//        killTimer(m_timerID);
-//
-//    m_timerID = startTimer(1000/ZOOM_FPS);
-
-    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();
-}
+    qDebug() << __PRETTY_FUNCTION__;
 
-void MapView::timerEvent(QTimerEvent *event)
-{
-    if (event->timerId() == m_timerID) {
-        bool finished = false;
-        qreal scaleFactor = currentScale();
-
-//        qDebug() << __PRETTY_FUNCTION__
-//                 << "abs(m_zoomTargetScale - scaleFactor)" << fabs(m_zoomTargetScale - scaleFactor)
-//                 << "abs(m_zoomScaleDelta)" << fabs(m_zoomScaleDelta);
-
-        if (fabs(m_zoomTargetScale - scaleFactor) <= fabs(m_zoomScaleDelta)) {
-            scaleFactor = m_zoomTargetScale;
-            killTimer(event->timerId());
-            finished = true;
-        }
-        else {
-            scaleFactor += m_zoomScaleDelta;
-        }
-
-//        qDebug() << __PRETTY_FUNCTION__ << "currentScale:" << currentScale()
-//                                        << "m_zoomScaleDelta" << m_zoomScaleDelta
-//                                        << "scaleFactor:" << scaleFactor;
-
-        QTransform transform;
-        transform.scale(scaleFactor, scaleFactor);
-        setTransform(transform);
-       emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
-
-        if (finished && m_zoomScaleDelta > 0)
-            emit viewZoomFinished();
-    }
-}
+    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));
 
-qreal MapView::currentScale()
-{
-    QTransform currentTransform = transform();
-    return currentTransform.m11();
+        m_zoomAnimation->start();
+    }
 }
 
 qreal MapView::viewScale()
 {
-    QTransform currentTransform = transform();
-    return currentTransform.m11();
+    qDebug() << __PRETTY_FUNCTION__;
+
+    return transform().m11();
 }
 
 void MapView::setViewScale(qreal viewScale)
 {
+    qDebug() << __PRETTY_FUNCTION__;
+
     QTransform transform;
     transform.scale(viewScale, viewScale);
     setTransform(transform);
@@ -113,8 +75,9 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
 {
     m_scenePosition += m_mousePosition - mapToScene(event->pos()).toPoint();
 
+    qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
+
     emit viewScrolled(m_scenePosition);
-//    qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
 
     m_mousePosition = mapToScene(event->pos()).toPoint();
     emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
@@ -122,7 +85,9 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
 
 void MapView::mousePressEvent(QMouseEvent *event)
 {
-    QGraphicsView::mousePressEvent(event);
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QGraphicsView::mousePressEvent(event); // Temporary solution
 
     m_mousePosition = mapToScene(event->pos()).toPoint();
     m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
@@ -130,13 +95,24 @@ void MapView::mousePressEvent(QMouseEvent *event)
 
 void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-//    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+
     centerOn(sceneCoordinate);
 }
 
 void MapView::resizeEvent(QResizeEvent *event)
 {
-//    qDebug() << "Resize event: " << event->size();
+    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)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QGraphicsView::showEvent(event);
     emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }