Fixed (yet) another merge screw-up *sigh*

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 9f6ba4c..47770c1 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -24,85 +24,55 @@
 #include <QDebug>
 #include <QMouseEvent>
 
-#ifndef Q_WS_MAEMO_5
-//   #include <QGLWidget>
-#endif // Q_WS_MAEMO_5
-
 #include "mapcommon.h"
 #include "mapview.h"
 
 MapView::MapView(QWidget *parent)
     : QGraphicsView(parent)
-    , m_timerID(NULL)
 {
-/**
-  * 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(QGLFormat(QGL::DoubleBuffer)));
-#endif // !Q_WS_MAEMO_5
-
     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)
 {
-    m_zoomTargetScale = pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL);
-    m_zoomScaleDelta = (m_zoomTargetScale - currentScale()) / (ZOOM_FPS * (ZOOM_TIME / 1000));
+    m_zoomAnimation->stop();
+    m_zoomAnimation->setDuration(ZOOM_TIME);
+    m_zoomAnimation->setStartValue(viewScale());
+    m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
 
-    if (m_timerID)
-        killTimer(m_timerID);
-
-    m_timerID = startTimer(1000/ZOOM_FPS);
+    m_zoomAnimation->start();
 }
 
-void MapView::timerEvent(QTimerEvent *event)
+qreal MapView::currentScale()
 {
-    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 viewZoomInFinished();
-    }
+    QTransform currentTransform = transform();
+    return currentTransform.m11();
 }
 
-qreal MapView::currentScale()
+qreal MapView::viewScale()
 {
     QTransform currentTransform = transform();
     return currentTransform.m11();
 }
 
+void MapView::setViewScale(qreal viewScale)
+{
+    QTransform transform;
+    transform.scale(viewScale, viewScale);
+    setTransform(transform);
+    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+}
+
 void MapView::mouseMoveEvent(QMouseEvent *event)
 {
     m_scenePosition += m_mousePosition - mapToScene(event->pos()).toPoint();
 
     emit viewScrolled(m_scenePosition);
-//    qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
+    qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
 
     m_mousePosition = mapToScene(event->pos()).toPoint();
     emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
@@ -118,13 +88,13 @@ 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__ << event->size();
     emit viewResized(event->size());
     emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }