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 1638e7e..47770c1 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -24,87 +24,77 @@
 #include <QDebug>
 #include <QMouseEvent>
 
-#ifdef Q_WS_MAEMO_51
-    #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)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-#ifdef Q_WS_MAEMO_51
-    qDebug() << __PRETTY_FUNCTION__ << "QAbstractKineticScroller built in";
-
-    QAbstractKineticScroller *scroller = this->property("kineticScroller")
-                                             .value<QAbstractKineticScroller *>();
-
-    if (scroller)
-        scroller->setEnabled(true);
-#endif // Q_WS_MAEMO_5
+    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_ZOOM_LEVEL);
-    m_zoomScaleDelta = (m_zoomTargetScale - currentScale()) / (ZOOM_FPS * ZOOM_TIME);
+    m_zoomAnimation->stop();
+    m_zoomAnimation->setDuration(ZOOM_TIME);
+    m_zoomAnimation->setStartValue(viewScale());
+    m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
 
-    startTimer(1000/ZOOM_FPS);
+    m_zoomAnimation->start();
 }
 
-void MapView::timerEvent(QTimerEvent *event)
+qreal MapView::currentScale()
 {
-    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());
-    }
-    else {
-        scaleFactor += m_zoomScaleDelta;
-    }
-
-//    qDebug() << __PRETTY_FUNCTION__ << "currentScale:" << currentScale()
-//                                    << "m_zoomScaleDelta" << m_zoomScaleDelta
-//                                    << "scaleFactor:" << scaleFactor;
-
-    QTransform transform;
-    transform.scale(scaleFactor, scaleFactor);
-    setTransform(transform);
+    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());
+    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());
+    m_mousePosition = mapToScene(event->pos()).toPoint();
+    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
 void MapView::mousePressEvent(QMouseEvent *event)
 {
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
-}
+    QGraphicsView::mousePressEvent(event);
 
+    m_mousePosition = mapToScene(event->pos()).toPoint();
+    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+}
 
-void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    //qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
     centerOn(sceneCoordinate);
 }
+
+void MapView::resizeEvent(QResizeEvent *event)
+{
+    qDebug() << __PRETTY_FUNCTION__ << event->size();
+    emit viewResized(event->size());
+    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+}