1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00

Compare commits

..

No commits in common. "73fa197c25e9dc43eb2381d5706b5350926b508e" and "c4b85ef49351f05083ac4aad50dbf83083ca8c6e" have entirely different histories.

4 changed files with 11 additions and 15 deletions

View File

@ -1,4 +1,4 @@
version: 13.21.{build} version: 13.20.{build}
configuration: configuration:
- Release - Release

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 13.21 VERSION = 13.20
QT += core \ QT += core \

View File

@ -37,7 +37,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "13.21" !define VERSION "13.20"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -269,22 +269,18 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
double IMGMap::elevation(const Coordinates &c) double IMGMap::elevation(const Coordinates &c)
{ {
QList<MapData::Elevation> tiles;
DEM::DEMTRee tree;
MapData *d = _data.first(); MapData *d = _data.first();
double ele = NAN;
if (d->hasDEM()) { d->elevations(RectC(Coordinates(c), Coordinates(c)), d->zooms().max(),
QList<MapData::Elevation> tiles; &tiles);
DEM::DEMTRee tree;
double ele = NAN;
d->elevations(RectC(Coordinates(c), Coordinates(c)), d->zooms().max(), DEM::buildTree(tiles, tree);
&tiles); DEM::searchTree(tree, c, ele);
DEM::buildTree(tiles, tree); return ele;
DEM::searchTree(tree, c, ele);
return ele;
} else
return Map::elevation(c);
} }
Map* IMGMap::createIMG(const QString &path, const Projection &proj, bool *isDir) Map* IMGMap::createIMG(const QString &path, const Projection &proj, bool *isDir)