Merged with master

[situare] / src / ui / mapviewscreen.cpp

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
index e05de43..b3ebc2c 100644 (file)
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@ -20,12 +20,16 @@
 */
 
 #include "mapviewscreen.h"
+#include "../map/mapview.h"
+#include "../map/mapengine.h"
 
 MapViewScreen::MapViewScreen(QWidget *parent)
    : QWidget(parent)
 {
-   QPushButton *mapViewButton = new QPushButton(tr("This is MAPVIEW"));
    QHBoxLayout *mapViewLayout = new QHBoxLayout;
-   mapViewLayout->addWidget(mapViewButton);
+   MapView *mapView = new MapView(this);
+   mapViewLayout->addWidget(mapView);
    setLayout(mapViewLayout);
+   MapEngine *mapEngine = new MapEngine(mapView, this);
+   mapEngine->setViewLocation(QPointF(25.5000, 65.0000));
 }