Merge branch 'master' into settings_auto_update

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 3af9c6d..37f8b81 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -41,35 +41,11 @@ MapView::MapView(QWidget *parent)
         this, SIGNAL(viewZoomFinished()));
 }
 
-void MapView::setZoomLevel(int zoomLevel)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    if (m_zoomAnimation) {
-        m_zoomAnimation->stop();
-        m_zoomAnimation->setDuration(ZOOM_TIME);
-        m_zoomAnimation->setStartValue(viewScale());
-        m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
-
-        m_zoomAnimation->start();
-    }
-}
-
-qreal MapView::viewScale()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    return transform().m11();
-}
-
-void MapView::setViewScale(qreal viewScale)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
 
-    QTransform transform;
-    transform.scale(viewScale, viewScale);
-    setTransform(transform);
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+    centerOn(sceneCoordinate);
 }
 
 void MapView::mouseMoveEvent(QMouseEvent *event)
@@ -81,7 +57,6 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
     emit viewScrolled(m_scenePosition);
 
     m_mousePosition = mapToScene(event->pos()).toPoint();
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
 void MapView::mousePressEvent(QMouseEvent *event)
@@ -94,26 +69,40 @@ void MapView::mousePressEvent(QMouseEvent *event)
     m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
 }
 
-void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
-{
-    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
-
-    centerOn(sceneCoordinate);
-}
-
 void MapView::resizeEvent(QResizeEvent *event)
 {
     qDebug() << __PRETTY_FUNCTION__ << "Resize:" << event->size();
 
     emit viewResized(event->size());
     emit viewResizedNewSize(viewport()->width(), viewport()->height());
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
-void MapView::showEvent(QShowEvent *event)
+void MapView::setViewScale(qreal viewScale)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QTransform transform;
+    transform.scale(viewScale, viewScale);
+    setTransform(transform);
+}
+
+void MapView::setZoomLevel(int zoomLevel)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    if (m_zoomAnimation) {
+        m_zoomAnimation->stop();
+        m_zoomAnimation->setDuration(ZOOM_TIME);
+        m_zoomAnimation->setStartValue(viewScale());
+        m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
+
+        m_zoomAnimation->start();
+    }
+}
+
+qreal MapView::viewScale()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QGraphicsView::showEvent(event);
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
+    return transform().m11();
 }