*/
#include "mapviewscreen.h"
-#include "../map/mapview.h"
-#include "../map/mapengine.h"
-#include "friendlistpanel.h"
-#include "userpanel.h"
+#include "map/mapview.h"
#include "panelcommon.h"
-
#include "panelsidebar.h"
MapViewScreen::MapViewScreen(QWidget *parent)
- : QWidget(parent)
+ : QWidget(parent),
+ m_autoCenteringEnabled(false)
{
MapView *mapView = new MapView(this);
- mapEngine = new MapEngine(this);
- mapView->setScene(mapEngine->scene());
+ m_mapEngine = new MapEngine(this);
+ mapView->setScene(m_mapEngine->scene());
- FriendListPanel *friendsListPanel = new FriendListPanel(this);
- UserInfoPanel *userPanel = new UserInfoPanel(this);
+ m_friendsListPanel = new FriendListPanel(this);
+ m_userPanel = new UserInfoPanel(this);
PanelSideBar *userPanelSidebar = new PanelSideBar(this, LEFT);
PanelSideBar *friendsListPanelSidebar = new PanelSideBar(this, RIGHT);
+ m_zoomButtonPanel = new ZoomButtonPanel(this, ZOOM_BUTTON_PANEL_POSITION_X,
+ ZOOM_BUTTON_PANEL_POSITION_Y);
+
connect(mapView, SIGNAL(viewScrolled(QPoint)),
- mapEngine, SLOT(setLocation(QPoint)));
- connect(mapEngine, SIGNAL(locationChanged(QPoint)),
+ m_mapEngine, SLOT(setLocation(QPoint)));
+ connect(m_mapEngine, SIGNAL(locationChanged(QPoint)),
mapView, SLOT(centerToSceneCoordinates(QPoint)));
- connect(mapEngine, SIGNAL(zoomLevelChanged(int)),
+ connect(m_mapEngine, SIGNAL(zoomLevelChanged(int)),
mapView, SLOT(setZoomLevel(int)));
connect(mapView, SIGNAL(viewResized(QSize)),
- mapEngine, SLOT(viewResized(QSize)));
+ m_mapEngine, SLOT(viewResized(QSize)));
connect(mapView, SIGNAL(viewContentChanged(QPoint)),
- mapEngine, SLOT(alignImmovableItems(QPoint)));
+ m_mapEngine, SLOT(alignImmovableItems(QPoint)));
connect(mapView, SIGNAL(viewZoomFinished()),
- mapEngine, SLOT(viewZoomFinished()));
+ m_mapEngine, SLOT(viewZoomFinished()));
- connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
- this, SLOT(drawOsmLicense(int, int)));
+ connect(this, SIGNAL(zoomInKeyPressed()),
+ m_mapEngine, SLOT(zoomIn()));
+ connect(this, SIGNAL(zoomOutKeyPressed()),
+ m_mapEngine, SLOT(zoomOut()));
- connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
- friendsListPanel, SLOT(reDrawFriendsPanel(int,int)));
- connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
- userPanel, SLOT(reDrawUserPanel(int,int)));
- connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
- friendsListPanelSidebar, SLOT(reDrawSidebar(int,int)));
+ connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+ this, SLOT(drawOsmLicense(int, int)));
+ connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+ m_friendsListPanel, SLOT(reDrawFriendsPanel(int, int)));
+ connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+ m_userPanel, SLOT(reDrawUserPanel(int, int)));
+ connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+ friendsListPanelSidebar, SLOT(reDrawSidebar(int, int)));
+
+ connect(m_zoomButtonPanel->m_zoomInBtn, SIGNAL(clicked()),
+ m_mapEngine, SLOT(zoomIn()));
+ connect(m_zoomButtonPanel->m_zoomOutBtn, SIGNAL(clicked()),
+ m_mapEngine, SLOT(zoomOut()));
connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
- friendsListPanel, SLOT(friendInfoReceived(QList<User*>&)));
+ m_friendsListPanel, SLOT(friendInfoReceived(QList<User*>&)));
+ connect(m_friendsListPanel, SIGNAL(findFriend(QPointF)),
+ m_mapEngine, SLOT(setViewLocation(QPointF)));
-// connect(this, SIGNAL(userLocationReady(User*)),
-// mapEngine, SLOT(receiveOwnLocation(User*)));
connect(this, SIGNAL(userLocationReady(User*)),
- this, SLOT(receiveUserData(User*)));
+ m_mapEngine, SLOT(receiveOwnLocation(User*)));
+ connect(this, SIGNAL(userLocationReady(User*)),
+ m_mapEngine, SLOT(receiveOwnLocation(User*)));
connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
- mapEngine, SIGNAL(friendsLocationsReady(QList<User*>&)));
+ m_mapEngine, SIGNAL(friendsLocationsReady(QList<User*>&)));
- QHBoxLayout *mapViewLayout = new QHBoxLayout;
+ connect(m_mapEngine, SIGNAL(mapScrolled()),
+ this, SLOT(locationChanged()));
+
+ connect(this, SIGNAL(userLocationReady(User*)),
+ m_userPanel, SLOT(userDataReceived(User*)));
+
+ connect(m_userPanel, SIGNAL(requestReverseGeo()),
+ this, SIGNAL(requestReverseGeo()));
+
+ connect(this, SIGNAL(reverseGeoReady(QString)),
+ m_userPanel, SIGNAL(reverseGeoReady(QString)));
+
+ connect(m_userPanel, SIGNAL(statusUpdate(QString,bool)),
+ this, SIGNAL(statusUpdate(QString,bool)));
- osmLicense = new QLabel(this);
- osmLicense->setAttribute(Qt::WA_TranslucentBackground, true);
- osmLicense->setAttribute(Qt::WA_TransparentForMouseEvents, true);
- osmLicense->setText("<font color='black'>"+OSM_LICENSE+"</font>");
- osmLicense->setFont(QFont("Nokia Sans", 9));
- osmLicense->resize(osmLicense->fontMetrics().width(OSM_LICENSE),
- osmLicense->fontMetrics().height());
+ connect(m_userPanel, SIGNAL(refreshUserData()),
+ this, SIGNAL(refreshUserData()));
- friendsListPanel->stackUnder(friendsListPanelSidebar);
- userPanelSidebar->stackUnder(friendsListPanel);
- userPanel->stackUnder(userPanelSidebar);
- osmLicense->stackUnder(userPanel);
- mapView->stackUnder(osmLicense);
+ QHBoxLayout *mapViewLayout = new QHBoxLayout;
+
+ m_osmLicense = new QLabel(this);
+ m_osmLicense->setAttribute(Qt::WA_TranslucentBackground, true);
+ m_osmLicense->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+ m_osmLicense->setText("<font color='black'>" + OSM_LICENSE + "</font>");
+ m_osmLicense->setFont(QFont("Nokia Sans", 9));
+ m_osmLicense->resize(m_osmLicense->fontMetrics().width(OSM_LICENSE),
+ m_osmLicense->fontMetrics().height());
+
+ m_friendsListPanel->stackUnder(friendsListPanelSidebar);
+ userPanelSidebar->stackUnder(m_friendsListPanel);
+ m_userPanel->stackUnder(userPanelSidebar);
+ m_zoomButtonPanel->stackUnder(m_userPanel);
+ m_osmLicense->stackUnder(m_zoomButtonPanel);
+ mapView->stackUnder(m_osmLicense);
mapViewLayout->addWidget(mapView);
setLayout(mapViewLayout);
mapViewLayout->setMargin(0);
- mapEngine->init();
+ m_mapEngine->init();
setObjectName("Map view");
}
void MapViewScreen::drawOsmLicense(int width, int height)
{
qDebug() << __PRETTY_FUNCTION__ << width << "x" << height;
- osmLicense->move(width - osmLicense->fontMetrics().width(OSM_LICENSE) - PANEL_PEEK_AMOUNT,
- height - osmLicense->fontMetrics().height());
+ m_osmLicense->move(width - m_osmLicense->fontMetrics().width(OSM_LICENSE) - PANEL_PEEK_AMOUNT,
+ height - m_osmLicense->fontMetrics().height());
+}
+
+void MapViewScreen::locationChanged()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ if (m_autoCenteringEnabled)
+ emit mapLocationChanged();
}
-void MapViewScreen::receiveUserData(User *user)
+void MapViewScreen::positionReceived(QPointF position, qreal accuracy)
{
- mapEngine->receiveOwnLocation(user);
- userPanel->userDataReceived(user);
+ 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);
}
projects / situare / blobdiff