Integrated map view to ui, some modifications to map classes

[situare] / src / map / mapengine.cpp

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index 5b2c036..e545c59 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -28,6 +28,7 @@
 
 MapEngine::MapEngine()
 {
+
 }
 
 MapEngine::MapEngine(MapView *mapView)
@@ -35,23 +36,24 @@ MapEngine::MapEngine(MapView *mapView)
     m_mapView = mapView;
     m_mapScene = new MapScene();
     mapView->setScene(m_mapScene);
+    m_zoomLevel = 14;
 }
 
 void MapEngine::setViewLocation(QPointF latLonCoordinate)
 {
+    m_mapView->setZoomLevel(m_zoomLevel);
+
     /*
      * Add some dummy map tiles for demo purposes
      */
 
-    for (int x=4261; x<=4264; x++) {
-        for (int y=9352; y<=9353; y++) {
+    for (int x=9351; x<=9354; x++) {
+        for (int y=4261; y<=4264; y++) {
             MapTile *mapTile = new MapTile();
-            mapTile->setZoomLevel(14);
+            mapTile->setZoomLevel(m_zoomLevel);
             mapTile->setTileNumber(QPoint(x, y));
-            QString fileName = QString("../../../res/images/test_map_tiles/%1_%2_%3.png").arg(mapTile->zoomLevel()).arg(y).arg(x);
-            //QString fileName = QString("/home/ramosam-local/situare/res/images/test_map_tiles/%1_%2_%3.png").arg(mapTile->zoomLevel()).arg(y).arg(x);
-            //QString fileName = QString("/home/ramosam-local/situare/res/images/test_map_tiles/14_9352_4261.png");
-            qDebug() << __PRETTY_FUNCTION__ << "fileName:" << fileName;
+            QString fileName = QString("res/images/test_map_tiles/%1_%2_%3.png").arg(mapTile->zoomLevel()).arg(x).arg(y);
+//            qDebug() << __PRETTY_FUNCTION__ << "fileName:" << fileName;
             mapTile->setPixmap(QPixmap(fileName));
             m_mapScene->addMapTile(mapTile);
         }