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 7fc59eb..fe86baf 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -24,7 +24,11 @@
 #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,23 +37,34 @@
 
 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)
 {
-    m_zoomTargetScale = pow(2, zoomLevel - MAX_ZOOM_LEVEL);
+    m_zoomTargetScale = pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL);
     m_zoomScaleDelta = (m_zoomTargetScale - currentScale()) / (ZOOM_FPS * ZOOM_TIME);
 
     startTimer(1000/ZOOM_FPS);
@@ -86,31 +101,25 @@ qreal MapView::currentScale()
     return currentTransform.m11();
 }
 
-void MapView::mouseMoveEvent(QMouseEvent *event)
+void MapView::scrollContentsBy (int dx, int dy)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos());
+//    qDebug() << __PRETTY_FUNCTION__;
 
-    emit viewScrolled(m_scenePosition);
-    //qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition" << m_scenePosition;
+    QGraphicsView::scrollContentsBy(dx, dy);
 
-    m_mousePosition = mapToScene(event->pos());
+    QPoint centerInScene = mapToScene(frameRect().center()).toPoint();
+//    qDebug() << __PRETTY_FUNCTION__ << "centerInScene:" << centerInScene;
+    emit viewScrolled(centerInScene);
 }
 
-void MapView::mousePressEvent(QMouseEvent *event)
-{
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
-}
-
-
-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() << "Resize event: " << event->size();
+    //qDebug() << "Resize event: " << event->size();
     emit viewResized(event->size());
 }