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 e936417..fe86baf 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -19,12 +19,16 @@
    USA.
 */
 
-#include <math.h>
+#include <cmath>
 
 #include <QDebug>
 #include <QMouseEvent>
 
-#ifdef Q_WS_MAEMO_51
+#ifndef Q_WS_MAEMO_5
+    #include <QGLWidget>
+#endif // Q_WS_MAEMO_5
+
+#ifdef Q_WS_MAEMO_5
     #include <QAbstractKineticScroller>
 #endif // Q_WS_MAEMO_5
 
@@ -33,56 +37,89 @@
 
 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 *>();
-
+/**
+  * 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
+
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
 void MapView::setZoomLevel(int zoomLevel)
 {
-    double scaleFactor = pow(2, zoomLevel - MAX_ZOOM_LEVEL);
-    QTransform transform;
-    transform.scale(scaleFactor, scaleFactor);
-    setTransform(transform);
+    m_zoomTargetScale = pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL);
+    m_zoomScaleDelta = (m_zoomTargetScale - currentScale()) / (ZOOM_FPS * ZOOM_TIME);
+
+    startTimer(1000/ZOOM_FPS);
 }
 
-void MapView::mouseMoveEvent(QMouseEvent *event)
+void MapView::timerEvent(QTimerEvent *event)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos());
+    qreal scaleFactor = currentScale();
+
+//    qDebug() << __PRETTY_FUNCTION__
+//             << "abs(m_zoomTargetScale - scaleFactor)" << fabs(m_zoomTargetScale - scaleFactor)
+//             << "abs(m_zoomScaleDelta)" << fabs(m_zoomScaleDelta);
 
-    emit viewScrolled(m_scenePosition);
+    if (fabs(m_zoomTargetScale - scaleFactor) <= fabs(m_zoomScaleDelta)) {
+        scaleFactor = m_zoomTargetScale;
+        killTimer(event->timerId());
+    }
+    else {
+        scaleFactor += m_zoomScaleDelta;
+    }
 
-    /// @todo REMOVE AFTER UPDATING ENGINE
-    centerToSceneCoordinates(m_scenePosition);
+//    qDebug() << __PRETTY_FUNCTION__ << "currentScale:" << currentScale()
+//                                    << "m_zoomScaleDelta" << m_zoomScaleDelta
+//                                    << "scaleFactor:" << scaleFactor;
 
-    m_mousePosition = mapToScene(event->pos());
+    QTransform transform;
+    transform.scale(scaleFactor, scaleFactor);
+    setTransform(transform);
 }
 
-void MapView::mousePressEvent(QMouseEvent *event)
+qreal MapView::currentScale()
 {
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
+    QTransform currentTransform = transform();
+    return currentTransform.m11();
 }
 
+void MapView::scrollContentsBy (int dx, int dy)
+{
+//    qDebug() << __PRETTY_FUNCTION__;
+
+    QGraphicsView::scrollContentsBy(dx, dy);
+
+    QPoint centerInScene = mapToScene(frameRect().center()).toPoint();
+//    qDebug() << __PRETTY_FUNCTION__ << "centerInScene:" << centerInScene;
+    emit viewScrolled(centerInScene);
+}
 
-void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
+//    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
     centerOn(sceneCoordinate);
 }
 
-//bool MapView::event(QEvent *event)
-//{
-//    qDebug() << __PRETTY_FUNCTION__ << "event type:" << event->type();
-//    event->ignore();
-//    QObject::event(event);
-//    return false;
-//}
+void MapView::resizeEvent(QResizeEvent *event)
+{
+    //qDebug() << "Resize event: " << event->size();
+    emit viewResized(event->size());
+}