Changed MapView using floating point coordinates internally
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 16 Jun 2010 07:47:52 +0000 (10:47 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 16 Jun 2010 07:47:52 +0000 (10:47 +0300)
 - Created method body for mouseReleaseEvent()

src/map/mapview.cpp
src/map/mapview.h

index abef941..e112bb2 100644 (file)
@@ -52,13 +52,13 @@ void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 
 void MapView::mouseMoveEvent(QMouseEvent *event)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos()).toPoint();
+    m_scenePosition += m_mousePosition - mapToScene(event->pos());
 
     qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition:" << m_scenePosition;
 
-    emit viewScrolled(m_scenePosition);
+    emit viewScrolled(m_scenePosition.toPoint());
 
-    m_mousePosition = mapToScene(event->pos()).toPoint();
+    m_mousePosition = mapToScene(event->pos());
 }
 
 void MapView::mousePressEvent(QMouseEvent *event)
@@ -67,8 +67,13 @@ void MapView::mousePressEvent(QMouseEvent *event)
 
     QGraphicsView::mousePressEvent(event);
 
-    m_mousePosition = mapToScene(event->pos()).toPoint();
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
+    m_mousePosition = mapToScene(event->pos());
+    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
+}
+
+void MapView::mouseReleaseEvent(QMouseEvent *event)
+{
+    QGraphicsView::mouseReleaseEvent(event);
 }
 
 void MapView::resizeEvent(QResizeEvent *event)
index 855a3f7..e701a5c 100644 (file)
@@ -82,6 +82,8 @@ private:
     */
     void mousePressEvent(QMouseEvent *event);
 
+    void mouseReleaseEvent(QMouseEvent *event);
+
 /*******************************************************************************
  * MEMBER FUNCTIONS AND SLOTS
  ******************************************************************************/
@@ -144,8 +146,8 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-    QPoint m_mousePosition;               ///< Previous mouse event position
-    QPoint m_scenePosition;               ///< New center position
+    QPointF m_mousePosition;               ///< Previous mouse event position
+    QPointF m_scenePosition;               ///< New center position
     QPropertyAnimation *m_zoomAnimation;  ///< Zoom animation
 };