X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmap%2Fmapview.cpp;h=37f8b81ebaa4ac5c7675c104ed0f06a8013c2188;hb=bc4bf2aeb597f39955ed8cbe3a3fdcd5914d7ec8;hp=489ef4ce481f3668ed07884104b3da88162e8a03;hpb=1cd0f6c0acbd4ed05ec952af0924adfe9ff14510;p=situare

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 489ef4c..37f8b81 100644
--- 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
@@ -24,115 +25,84 @@
 #include <QDebug>
 #include <QMouseEvent>
 
-#ifndef Q_WS_MAEMO_5
-    #include <QGLWidget>
-#endif // Q_WS_MAEMO_5
-
-#ifdef Q_WS_MAEMO_5
-    #include <QAbstractKineticScroller>
-#endif // Q_WS_MAEMO_5
-
-#include "common.h"
+#include "mapcommon.h"
 #include "mapview.h"
 
-MapView::MapView(QWidget *parent) : QGraphicsView(parent)
+MapView::MapView(QWidget *parent)
+    : QGraphicsView(parent)
 {
-/**
-  * Use OpenGL for desktop to gain some performance in map view.
-  * OpenGL can't be used in scratchbox.
-  */
-#ifndef Q_WS_MAEMO_5
-    setViewport(new QGLWidget);
-#endif // !Q_WS_MAEMO_5
-
-/**
-  * Use kinetic scrolling for Maemo5 and QGraphicsViews drag mode
-  * ScrollHandDrag for other environments
-  */
-#ifdef Q_WS_MAEMO_5
-    QAbstractKineticScroller *scroller = property("kineticScroller")
-                                         .value<QAbstractKineticScroller *>();
-    if (scroller)
-        scroller->setEnabled(true);
-#else
-    setDragMode(QGraphicsView::ScrollHandDrag);
-#endif // Q_WS_MAEMO_5
+    qDebug() << __PRETTY_FUNCTION__;
 
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+    m_zoomAnimation = new QPropertyAnimation(this, "viewScale", this);
+    connect(m_zoomAnimation, SIGNAL(finished()),
+        this, SIGNAL(viewZoomFinished()));
 }
 
-void MapView::setZoomLevel(int zoomLevel)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    m_zoomTargetScale = pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL);
-    m_zoomScaleDelta = (m_zoomTargetScale - currentScale()) / (ZOOM_FPS * ZOOM_TIME);
+    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
 
-    startTimer(1000/ZOOM_FPS);
+    centerOn(sceneCoordinate);
 }
 
-void MapView::timerEvent(QTimerEvent *event)
+void MapView::mouseMoveEvent(QMouseEvent *event)
 {
-    qreal scaleFactor = currentScale();
-
-//    qDebug() << __PRETTY_FUNCTION__
-//             << "abs(m_zoomTargetScale - scaleFactor)" << fabs(m_zoomTargetScale - scaleFactor)
-//             << "abs(m_zoomScaleDelta)" << fabs(m_zoomScaleDelta);
+    m_scenePosition += m_mousePosition - mapToScene(event->pos()).toPoint();
 
-    if (fabs(m_zoomTargetScale - scaleFactor) <= fabs(m_zoomScaleDelta)) {
-        scaleFactor = m_zoomTargetScale;
-        killTimer(event->timerId());
-    }
-    else {
-        scaleFactor += m_zoomScaleDelta;
-    }
+    qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
 
-//    qDebug() << __PRETTY_FUNCTION__ << "currentScale:" << currentScale()
-//                                    << "m_zoomScaleDelta" << m_zoomScaleDelta
-//                                    << "scaleFactor:" << scaleFactor;
+    emit viewScrolled(m_scenePosition);
 
-    QTransform transform;
-    transform.scale(scaleFactor, scaleFactor);
-    setTransform(transform);
+    m_mousePosition = mapToScene(event->pos()).toPoint();
 }
 
-qreal MapView::currentScale()
+void MapView::mousePressEvent(QMouseEvent *event)
 {
-    QTransform currentTransform = transform();
-    return currentTransform.m11();
-}
+    qDebug() << __PRETTY_FUNCTION__;
 
-//void MapView::scrollContentsBy (int dx, int dy)
-//{
-//    qDebug() << __PRETTY_FUNCTION__ << "dx:" << dx << "dy:" << dy;
-//
-//    QGraphicsView::scrollContentsBy(dx, dy);
-//}
+    QGraphicsView::mousePressEvent(event); // Temporary solution
 
-void MapView::mouseMoveEvent(QMouseEvent *event)
-{
-    m_scenePosition += m_mousePosition - mapToScene(event->pos());
+    m_mousePosition = mapToScene(event->pos()).toPoint();
+    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+}
 
-    emit viewScrolled(m_scenePosition);
-    //qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition" << m_scenePosition;
+void MapView::resizeEvent(QResizeEvent *event)
+{
+    qDebug() << __PRETTY_FUNCTION__ << "Resize:" << event->size();
 
-    m_mousePosition = mapToScene(event->pos());
+    emit viewResized(event->size());
+    emit viewResizedNewSize(viewport()->width(), viewport()->height());
 }
 
-void MapView::mousePressEvent(QMouseEvent *event)
+void MapView::setViewScale(qreal viewScale)
 {
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
-}
+    qDebug() << __PRETTY_FUNCTION__;
 
+    QTransform transform;
+    transform.scale(viewScale, viewScale);
+    setTransform(transform);
+}
 
-void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)
+void MapView::setZoomLevel(int zoomLevel)
 {
-    //qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
-    centerOn(sceneCoordinate);
+    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();
+    }
 }
 
-void MapView::resizeEvent(QResizeEvent *event)
+qreal MapView::viewScale()
 {
-    qDebug() << "Resize event: " << event->size();
-    emit viewResized(event->size());
+    qDebug() << __PRETTY_FUNCTION__;
+
+    return transform().m11();
 }