Merge branch 'crosshair2'

[situare] / src / ui / mapviewscreen.cpp

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
index 3fdcca9..2a0cc16 100644 (file)
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@ -25,8 +25,7 @@
 #include "panelsidebar.h"
 
 MapViewScreen::MapViewScreen(QWidget *parent)
-   : QWidget(parent),
-     m_autoCenteringEnabled(false)
+   : QWidget(parent)
 {
     MapView *mapView = new MapView(this);
     m_mapEngine = new MapEngine(this);
@@ -38,13 +37,9 @@ MapViewScreen::MapViewScreen(QWidget *parent)
     PanelSideBar *friendsListPanelSidebar = new PanelSideBar(this, RIGHT);
 
     m_zoomButtonPanel = new ZoomButtonPanel(this, ZOOM_BUTTON_PANEL_POSITION_X,
-                                            ZOOM_BUTTON_PANEL_POSITION_Y);
+                                            ZOOM_BUTTON_PANEL_POSITION_Y);   
 
-    ownLocationCrosshair = new QLabel(this);
-    QPixmap crosshairImage(":/res/images/sight.png");
-    ownLocationCrosshair->setPixmap(crosshairImage);
-    ownLocationCrosshair->setFixedSize(crosshairImage.size());
-    ownLocationCrosshair->hide();
+    m_ownLocationCrosshair = 0;
 
     connect(mapView, SIGNAL(viewScrolled(QPoint)),
             m_mapEngine, SLOT(setLocation(QPoint)));
@@ -54,8 +49,6 @@ MapViewScreen::MapViewScreen(QWidget *parent)
             mapView, SLOT(setZoomLevel(int)));
     connect(mapView, SIGNAL(viewResized(QSize)),
             m_mapEngine, SLOT(viewResized(QSize)));
-//    connect(mapView, SIGNAL(viewContentChanged(QRect)),
-//            m_mapEngine, SLOT(alignImmovableItems(QRect)));
     connect(mapView, SIGNAL(updateViewContent(QRect)),
             m_mapEngine, SLOT(receiveViewSceneRect(QRect)));
     connect(mapView, SIGNAL(viewZoomFinished()),
@@ -75,10 +68,16 @@ MapViewScreen::MapViewScreen(QWidget *parent)
     connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
             friendsListPanelSidebar, SLOT(reDrawSidebar(int, int)));
 
-    connect(m_zoomButtonPanel->m_zoomInBtn, SIGNAL(clicked()),
+    connect(m_zoomButtonPanel->m_zoomInButton, SIGNAL(clicked()),
             m_mapEngine, SLOT(zoomIn()));
-    connect(m_zoomButtonPanel->m_zoomOutBtn, SIGNAL(clicked()),
+    connect(m_zoomButtonPanel->m_zoomOutButton, SIGNAL(clicked()),
             m_mapEngine, SLOT(zoomOut()));
+    connect(m_mapEngine, SIGNAL(zoomLevelChanged(int)),
+            m_zoomButtonPanel, SLOT(resetButtons()));
+    connect(m_mapEngine, SIGNAL(maxZoomLevelReached()),
+            m_zoomButtonPanel, SLOT(disableZoomInButton()));
+    connect(m_mapEngine, SIGNAL(minZoomLevelReached()),
+            m_zoomButtonPanel, SLOT(disableZoomOutButton()));
 
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
             m_friendsListPanel, SLOT(friendInfoReceived(QList<User*>&)));
@@ -90,8 +89,15 @@ MapViewScreen::MapViewScreen(QWidget *parent)
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
             m_mapEngine, SIGNAL(friendsLocationsReady(QList<User*>&)));
 
-    connect(m_mapEngine, SIGNAL(mapScrolled()),
-            this, SLOT(locationChanged()));
+    connect(m_mapEngine, SIGNAL(mapScrolledManually()),
+            this, SIGNAL(mapLocationChanged()));
+
+    connect(this, SIGNAL(positionReceived(QPointF,qreal)),
+            m_mapEngine, SLOT(gpsPositionUpdate(QPointF,qreal)));
+    connect(this, SIGNAL(enableAutoCentering(bool)),
+            m_mapEngine, SLOT(setAutoCentering(bool)));
+    connect(this, SIGNAL(gpsEnabled(bool)),
+            m_mapEngine, SLOT(gpsEnabled(bool)));
 
     connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
             this, SLOT(drawOwnLocationCrosshair(int, int)));
@@ -101,7 +107,7 @@ MapViewScreen::MapViewScreen(QWidget *parent)
 
     connect(m_mapEngine, SIGNAL(requestToGetViewPortContents()),
             mapView, SLOT(viewportContent()));
-    connect(mapView, SIGNAL(viewContentChanged(QRect)),
+    connect(mapView, SIGNAL(updateViewContent(QRect)),
             m_mapEngine, SLOT(receiveViewSceneRect(QRect)));
     connect(this, SIGNAL(requestOwnLocation()),
             m_mapEngine, SLOT(ownLocation()));
@@ -142,55 +148,35 @@ void MapViewScreen::drawOsmLicense(int width, int height)
                         height - m_osmLicense->fontMetrics().height());
 }
 
-void MapViewScreen::locationChanged()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    if (m_autoCenteringEnabled)
-        emit mapLocationChanged();
-}
-
-void MapViewScreen::positionReceived(QPointF position, qreal accuracy)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    if (m_autoCenteringEnabled)
-        m_mapEngine->setViewLocation(position);
-}
-
-void MapViewScreen::enableAutoCentering(bool enabled)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_autoCenteringEnabled = enabled;
-    m_mapEngine->setAutoCentering(enabled);
-}
 
 void MapViewScreen::drawOwnLocationCrosshair(int width, int height)
 {
-    qWarning() << __PRETTY_FUNCTION__;
-    qWarning() << "widht: " << width << "height: " << height;
+    qDebug() << __PRETTY_FUNCTION__;
 
     if (m_drawOwnLocationCrosshair) {
-        ownLocationCrosshair->move(width/2 - ownLocationCrosshair->pixmap()->width()/2,
-                            height/2 - ownLocationCrosshair->pixmap()->height()/2);
+        m_ownLocationCrosshair->move(width/2 - m_ownLocationCrosshair->pixmap()->width()/2,
+                            height/2 - m_ownLocationCrosshair->pixmap()->height()/2);
     }
-
-    qWarning() << "ownLocation test: " << m_mapEngine->ownLocation().x()
-            << m_mapEngine->ownLocation().y();
-
 }
 
 void MapViewScreen::setOwnLocationCrosshairVisibility(bool visibility)
 {   
     if (visibility == false) {
-        ownLocationCrosshair->show();
+
+        if (m_ownLocationCrosshair == 0) {
+            m_ownLocationCrosshair = new QLabel(this);
+            QPixmap crosshairImage(":/res/images/sight.png");
+            m_ownLocationCrosshair->setPixmap(crosshairImage);
+            m_ownLocationCrosshair->setFixedSize(crosshairImage.size());
+        }
+
+        m_ownLocationCrosshair->show();
         m_drawOwnLocationCrosshair = true;
         drawOwnLocationCrosshair(m_viewPortWidth, m_viewPortHeight);
     }
 
     else {
-        ownLocationCrosshair->hide();
+        m_ownLocationCrosshair->hide();
         m_drawOwnLocationCrosshair = false;
     }
 }