rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

OP37/GCS Some optimizations

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@958 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-06-30 22:31:15 +00:00 committed by zedamota
parent 423b94d414
commit 8fd41c4854
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/src/libs/opmapcontrol/src/internals/core.cpp
View File

@ -148,7 +148,7 @@ namespace internals {
QWaitCondition wait; QWaitCondition wait;
QMutex m; QMutex m;
m.lock(); m.lock();
wait.wait(&m,1111); wait.wait(&m,500);
} }
} }
} }
@ -171,6 +171,7 @@ namespace internals {
delete t; delete t;
t = 0; t = 0;
emit OnNeedInvalidation();
} }
// layers = null; // layers = null;

2
ground/src/libs/opmapcontrol/src/internals/core.h
View File

@ -189,7 +189,7 @@ public:
signals: signals:
void OnCurrentPositionChanged(PointLatLng point); void OnCurrentPositionChanged(internals::PointLatLng point);
void OnTileLoadComplete(); void OnTileLoadComplete();
void OnTilesStillToLoad(int number); void OnTilesStillToLoad(int number);
void OnTileLoadStart(); void OnTileLoadStart();

4
ground/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp
View File

@ -62,8 +62,8 @@ internals::PointLatLng MercatorProjectionYandex::FromPixelToLatLng(const int &x,
{ {
Size s = GetTileMatrixSizePixel(zoom); Size s = GetTileMatrixSizePixel(zoom);
double mapSizeX = s.Width(); //double mapSizeX = s.Width();
double mapSizeY = s.Height(); //double mapSizeY = s.Height();
double a = 6378137; double a = 6378137;
double c1 = 0.00335655146887969; double c1 = 0.00335655146887969;

4
ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp
View File

@ -43,7 +43,7 @@ Point PlateCarreeProjection::FromLatLngToPixel(double lat, double lng, const int
Size s = GetTileMatrixSizePixel(zoom); Size s = GetTileMatrixSizePixel(zoom);
double mapSizeX = s.Width(); double mapSizeX = s.Width();
double mapSizeY = s.Height(); //double mapSizeY = s.Height();
double scale = 360.0 / mapSizeX; double scale = 360.0 / mapSizeX;
@ -59,7 +59,7 @@ internals::PointLatLng PlateCarreeProjection::FromPixelToLatLng(const int &x, co
Size s = GetTileMatrixSizePixel(zoom); Size s = GetTileMatrixSizePixel(zoom);
double mapSizeX = s.Width(); double mapSizeX = s.Width();
double mapSizeY = s.Height(); //double mapSizeY = s.Height();
double scale = 360.0 / mapSizeX; double scale = 360.0 / mapSizeX;

4
ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp
View File

@ -42,7 +42,7 @@ Point PlateCarreeProjectionPergo::FromLatLngToPixel(double lat, double lng, cons
Size s = GetTileMatrixSizePixel(zoom); Size s = GetTileMatrixSizePixel(zoom);
double mapSizeX = s.Width(); double mapSizeX = s.Width();
double mapSizeY = s.Height(); //double mapSizeY = s.Height();
double scale = 360.0 / mapSizeX; double scale = 360.0 / mapSizeX;
@ -57,7 +57,7 @@ internals::PointLatLng PlateCarreeProjectionPergo::FromPixelToLatLng(const int &
Size s = GetTileMatrixSizePixel(zoom); Size s = GetTileMatrixSizePixel(zoom);
double mapSizeX = s.Width(); double mapSizeX = s.Width();
double mapSizeY = s.Height(); //double mapSizeY = s.Height();
double scale = 360.0 / mapSizeX; double scale = 360.0 / mapSizeX;