OP-37 GCS/MapPlugin cleaning and bug hunting

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@704 ebee16cc-31ac-478f-84a7-5cbb03baadba

ground/src/experimental/OPMapWidget/internals/core.cpp

@@ -27,29 +27,31 @@
 */
 #include "core.h"
 
+#ifdef DEBUG_CORE
 qlonglong internals::Core::debugcounter=0;
+#endif
 
 using namespace projections;
 
 namespace internals {
-Core::Core():currentPosition(0,0),currentPositionPixel(0,0),LastLocationInBounds(-1,-1),sizeOfMapArea(0,0)
+    Core::Core():currentPosition(0,0),currentPositionPixel(0,0),LastLocationInBounds(-1,-1),sizeOfMapArea(0,0)
             ,minOfTiles(0,0),maxOfTiles(0,0),isDragging(false),started(false),MouseWheelZooming(false),TooltipTextPadding(10,10),zoom(0),loaderLimit(5)
-{
+    {
         mousewheelzoomtype=MouseWheelZoomType::MousePositionAndCenter;
         SetProjection(new MercatorProjection());
         this->setAutoDelete(false);
+        ProcessLoadTaskCallback.setMaxThreadCount(10);
         renderOffset=Point(0,0);
         dragPoint=Point(0,0);
         CanDragMap=true;
-}
+    }
-void Core::run()
+    void Core::run()
-{
+    {
+#ifdef DEBUG_CORE
         qlonglong debug;
         Mdebug.lock();
         debug=++debugcounter;
         Mdebug.unlock();
-
-#ifdef DEBUG_CORE
         qDebug()<<"core:run"<<" ID="<<debug;
 #endif //DEBUG_CORE
         bool last = false;
@@ -106,10 +108,12 @@ void Core::run()
                                 }
                                 else // ok
                                 {
+#ifdef DEBUG_CORE
                                     qDebug()<<"start getting image"<<" ID="<<debug;
+#endif //DEBUG_CORE
                                     img = OPMaps::Instance()->GetImageFrom(tl, task.Pos, task.Zoom);
 #ifdef DEBUG_CORE
-                                qDebug()<<"Core::run:gotimage size:"<<img.count()<<" ID="<<debug;
+                                    qDebug()<<"Core::run:gotimage size:"<<img.count()<<" ID="<<debug<<" time="<<t.elapsed();
 #endif //DEBUG_CORE
                                 }
 
@@ -189,12 +193,14 @@ void Core::run()
 
 
             }
+#ifdef DEBUG_CORE
             qDebug()<<"loaderLimit release:"+loaderLimit.available()<<" ID="<<debug;
+#endif
             loaderLimit.release();
         }
-}
+    }
-void Core::SetZoom(const int &value)
+    void Core::SetZoom(const int &value)
-{
+    {
         if (zoom!=value && !isDragging)
         {
             zoom=value;
@@ -214,10 +220,10 @@ void Core::SetZoom(const int &value)
                 emit OnNeedInvalidation();
             }
         }
-}
+    }
 
-void Core::SetCurrentPosition(const PointLatLng &value)
+    void Core::SetCurrentPosition(const PointLatLng &value)
-{
+    {
         if(!IsDragging())
         {
             currentPosition = value;
@@ -239,9 +245,9 @@ void Core::SetCurrentPosition(const PointLatLng &value)
                 emit OnCurrentPositionChanged(currentPosition);
             }
         }
-}
+    }
-void Core::SetMapType(const MapType::Types &value)
+    void Core::SetMapType(const MapType::Types &value)
-{
+    {
 
         if(value != GetMapType())
         {
@@ -318,9 +324,9 @@ void Core::SetMapType(const MapType::Types &value)
             }
         }
 
-}
+    }
-void Core::StartSystem()
+    void Core::StartSystem()
-{
+    {
         if(!started)
         {
             started = true;
@@ -328,17 +334,17 @@ void Core::StartSystem()
             ReloadMap();
             GoToCurrentPosition();
         }
-}
+    }
 
-void Core::UpdateCenterTileXYLocation()
+    void Core::UpdateCenterTileXYLocation()
-{
+    {
         PointLatLng center = FromLocalToLatLng(Width/2, Height/2);
         Point centerPixel = Projection()->FromLatLngToPixel(center, Zoom());
         centerTileXYLocation = Projection()->FromPixelToTileXY(centerPixel);
-}
+    }
 
-void Core::OnMapSizeChanged(int const& width, int const& height)
+    void Core::OnMapSizeChanged(int const& width, int const& height)
-{
+    {
         Width = width;
         Height = height;
 
@@ -353,9 +359,9 @@ void Core::OnMapSizeChanged(int const& width, int const& height)
 
             emit OnCurrentPositionChanged(currentPosition);
         }
-}
+    }
-void Core::OnMapClose()
+    void Core::OnMapClose()
-{
+    {
         //        if(waitOnEmptyTasks != null)
         //        {
         //           try
@@ -369,9 +375,9 @@ void Core::OnMapClose()
         //        }
 
         CancelAsyncTasks();
-}
+    }
-GeoCoderStatusCode::Types Core::SetCurrentPositionByKeywords(QString const& keys)
+    GeoCoderStatusCode::Types Core::SetCurrentPositionByKeywords(QString const& keys)
-{
+    {
         GeoCoderStatusCode::Types status = GeoCoderStatusCode::Unknow;
         PointLatLng pos = OPMaps::Instance()->GetLatLngFromGeodecoder(keys, status);
         if(pos.IsEmpty() && status == GeoCoderStatusCode::G_GEO_SUCCESS)
@@ -380,29 +386,29 @@ GeoCoderStatusCode::Types Core::SetCurrentPositionByKeywords(QString const& keys
         }
 
         return status;
-}
+    }
-RectLatLng Core::CurrentViewArea()
+    RectLatLng Core::CurrentViewArea()
-{
+    {
         PointLatLng p = Projection()->FromPixelToLatLng(-renderOffset.X(), -renderOffset.Y(), Zoom());
         double rlng = Projection()->FromPixelToLatLng(-renderOffset.X() + Width, -renderOffset.Y(), Zoom()).Lng();
         double blat = Projection()->FromPixelToLatLng(-renderOffset.X(), -renderOffset.Y() + Height, Zoom()).Lat();
         return RectLatLng::FromLTRB(p.Lng(), p.Lat(), rlng, blat);
 
-}
+    }
-PointLatLng Core::FromLocalToLatLng(int const& x, int const& y)
+    PointLatLng Core::FromLocalToLatLng(int const& x, int const& y)
-{
+    {
         return Projection()->FromPixelToLatLng(Point(x - renderOffset.X(), y - renderOffset.Y()), Zoom());
-}
+    }
 
 
-Point Core::FromLatLngToLocal(PointLatLng const& latlng)
+    Point Core::FromLatLngToLocal(PointLatLng const& latlng)
-{
+    {
         Point pLocal = Projection()->FromLatLngToPixel(latlng, Zoom());
         pLocal.Offset(renderOffset);
         return pLocal;
-}
+    }
-int Core::GetMaxZoomToFitRect(RectLatLng const& rect)
+    int Core::GetMaxZoomToFitRect(RectLatLng const& rect)
-{
+    {
         int zoom = 0;
 
         for(int i = 1; i <= OPMaps::Instance()->MaxZoom; i++)
@@ -421,21 +427,21 @@ int Core::GetMaxZoomToFitRect(RectLatLng const& rect)
         }
 
         return zoom;
-}
+    }
-void Core::BeginDrag(Point const& pt)
+    void Core::BeginDrag(Point const& pt)
-{
+    {
         dragPoint.SetX(pt.X() - renderOffset.X());
         dragPoint.SetY(pt.Y() - renderOffset.Y());
         isDragging = true;
-}
+    }
-void Core::EndDrag()
+    void Core::EndDrag()
-{
+    {
         isDragging = false;
         emit OnNeedInvalidation();
 
-}
+    }
-void Core::ReloadMap()
+    void Core::ReloadMap()
-{
+    {
         if(started)
         {
 #ifdef DEBUG_CORE
@@ -452,9 +458,9 @@ void Core::ReloadMap()
             emit OnNeedInvalidation();
 
         }
-}
+    }
-void Core::GoToCurrentPosition()
+    void Core::GoToCurrentPosition()
-{
+    {
         // reset stuff
         renderOffset = Point::Empty;
         centerTileXYLocationLast = Point::Empty;
@@ -462,9 +468,9 @@ void Core::GoToCurrentPosition()
 
         // goto location
         Drag(Point(-(GetcurrentPositionGPixel().X() - Width/2), -(GetcurrentPositionGPixel().Y() - Height/2)));
-}
+    }
-void Core::GoToCurrentPositionOnZoom()
+    void Core::GoToCurrentPositionOnZoom()
-{
+    {
         // reset stuff
         renderOffset = Point::Empty;
         centerTileXYLocationLast = Point::Empty;
@@ -496,9 +502,9 @@ void Core::GoToCurrentPositionOnZoom()
         }
 
         UpdateCenterTileXYLocation();
-}
+    }
-void Core::DragOffset(Point const& offset)
+    void Core::DragOffset(Point const& offset)
-{
+    {
         renderOffset.Offset(offset);
 
         UpdateCenterTileXYLocation();
@@ -516,9 +522,9 @@ void Core::DragOffset(Point const& offset)
 
         emit OnNeedInvalidation();
         emit OnMapDrag();
-}
+    }
-void Core::Drag(Point const& pt)
+    void Core::Drag(Point const& pt)
-{
+    {
         renderOffset.SetX(pt.X() - dragPoint.X());
         renderOffset.SetY(pt.Y() - dragPoint.Y());
 
@@ -541,9 +547,9 @@ void Core::Drag(Point const& pt)
 
         emit OnMapDrag();
 
-}
+    }
-void Core::CancelAsyncTasks()
+    void Core::CancelAsyncTasks()
-{
+    {
         if(started)
         {
             ProcessLoadTaskCallback.waitForDone();
@@ -554,9 +560,9 @@ void Core::CancelAsyncTasks()
             MtileLoadQueue.unlock();
             //  ProcessLoadTaskCallback.waitForDone();
         }
-}
+    }
-void Core::UpdateBounds()
+    void Core::UpdateBounds()
-{
+    {
         MtileDrawingList.lock();
         {
             FindTilesAround(tileDrawingList);
@@ -590,8 +596,8 @@ void Core::UpdateBounds()
         }
         MtileDrawingList.unlock();
         UpdateGroundResolution();
-}
+    }
-void Core::FindTilesAround(QList<Point> &list)
+    void Core::FindTilesAround(QList<Point> &list)
     {
         list.clear();;
         for(int i = -sizeOfMapArea.Width(); i <= sizeOfMapArea.Width(); i++)
@@ -624,8 +630,8 @@ void Core::FindTilesAround(QList<Point> &list)
 
 
     }
-void Core::UpdateGroundResolution()
+    void Core::UpdateGroundResolution()
-{
+    {
         double rez = Projection()->GetGroundResolution(Zoom(), CurrentPosition().Lat());
         pxRes100m =   (int) (100.0 / rez); // 100 meters
         pxRes1000m =  (int) (1000.0 / rez); // 1km
@@ -633,5 +639,5 @@ void Core::UpdateGroundResolution()
         pxRes100km =  (int) (100000.0 / rez); // 100km
         pxRes1000km = (int) (1000000.0 / rez); // 1000km
         pxRes5000km = (int) (5000000.0 / rez); // 5000km
-}
+    }
 }

ground/src/experimental/OPMapWidget/internals/core.h

@@ -28,9 +28,7 @@
 #ifndef CORE_H
 #define CORE_H
 
-#define DEBUG_CORE
+#include "debugheader.h"
-//#define DEBUG_TILE
-//#define DEBUG_TILEMATRIX
 
 #include "../internals/PointLatlng.h"
 #include "mousewheelzoomtype.h"
@@ -56,11 +54,16 @@
 
 //#include <QObject>
 
+namespace mapcontrol
+{
+    class OPMapControl;
+}
  
 namespace internals {
 class Core:public QObject,public QRunnable
 {
     Q_OBJECT
+    friend class mapcontrol::OPMapControl;
 public:
     Core();
     void run();
@@ -179,12 +182,7 @@ public:
 
     TileMatrix Matrix;
 
-    Rectangle tileRect;
+
-    Point mouseDown;
-    bool CanDragMap;
-    Point mouseCurrent;
-    PointLatLng LastLocationInBounds;
-    Point mouseLastZoom;
 signals:
     void OnCurrentPositionChanged(PointLatLng point);
     void OnTileLoadComplete();
@@ -197,14 +195,19 @@ signals:
 
 private:
 
-    static qlonglong debugcounter;
+
     PointLatLng currentPosition;
     Point currentPositionPixel;
     Point renderOffset;
     Point centerTileXYLocation;
     Point centerTileXYLocationLast;
     Point dragPoint;
-
+    Rectangle tileRect;
+    Point mouseDown;
+    bool CanDragMap;
+    Point mouseCurrent;
+    PointLatLng LastLocationInBounds;
+    Point mouseLastZoom;
 
     MouseWheelZoomType::Types mousewheelzoomtype;
 
@@ -233,9 +236,10 @@ private:
     QMutex Moverlays;
 
     QMutex MtileDrawingList;
-
+#ifdef DEBUG_CORE
     QMutex Mdebug;
-
+    static qlonglong debugcounter;
+#endif
     Size TooltipTextPadding;
 
     MapType::Types mapType;

ground/src/experimental/OPMapWidget/internals/debugheader.h

@@ -0,0 +1,8 @@
+#ifndef DEBUGHEADER_H
+#define DEBUGHEADER_H
+
+//#define DEBUG_CORE
+//#define DEBUG_TILE
+//#define DEBUG_TILEMATRIX
+
+#endif // DEBUGHEADER_H

ground/src/experimental/OPMapWidget/internals/internals.pro

@@ -9,7 +9,8 @@ HEADERS += core.h \
     pureprojection.h \
     pointlatlng.h \
     rectlatlng.h \
-    sizelatlng.h
+    sizelatlng.h \
+    debugheader.h
 SOURCES += core.cpp \
     rectangle.cpp \
     tile.cpp \
@@ -19,7 +20,7 @@ SOURCES += core.cpp \
     sizelatlng.cpp \
     pointlatlng.cpp \
     loadtask.cpp \
-    MouseWheelZoomType.cpp
+    mousewheelzoomtype.cpp
 HEADERS += ./projections/lks94projection.h \
     ./projections/mercatorprojection.h \
     ./projections/mercatorprojectionyandex.h \

ground/src/experimental/OPMapWidget/internals/tile.h

@@ -33,6 +33,7 @@
 #include "../core/point.h"
 #include <QMutex>
 #include <QDebug>
+#include "debugheader.h"
 using namespace core;
 namespace internals
 {

ground/src/experimental/OPMapWidget/internals/tilematrix.h

@@ -32,7 +32,7 @@
 #include "tile.h"
 #include <QList>
 #include "../core/point.h"
- 
+#include "debugheader.h"
 namespace internals {
 class TileMatrix
 {