mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-01 21:39:15 +02:00
Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
bb10f7c0e1 | |||
8ff21b5b37 | |||
32f41e5287 | |||
c50e41dea1 | |||
e34800b8d1 | |||
6642a2f810 | |||
55458b04a6 |
@ -1,4 +1,4 @@
|
|||||||
version: 5.7.{build}
|
version: 5.8.{build}
|
||||||
configuration: Release
|
configuration: Release
|
||||||
platform: Any CPU
|
platform: Any CPU
|
||||||
environment:
|
environment:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# GPXSee
|
# GPXSee
|
||||||
GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
|
GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
|
||||||
KML, FIT, IGC and NMEA files.
|
KML, FIT, IGC, NMEA and OziExplorer files.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
* User-definable online maps (OSM/Google tiles, WMTS, WMS).
|
* User-definable online maps (OSM/Google tiles, WMTS, WMS).
|
||||||
@ -11,7 +11,7 @@ KML, FIT, IGC and NMEA files.
|
|||||||
* Print/export to PDF.
|
* Print/export to PDF.
|
||||||
* Full-screen mode.
|
* Full-screen mode.
|
||||||
* Native GUI for Windows, Mac OS X and Linux.
|
* Native GUI for Windows, Mac OS X and Linux.
|
||||||
* Opens GPX, TCX, FIT, KML, IGC, NMEA and Garmin CSV files.
|
* Opens GPX, TCX, FIT, KML, IGC, NMEA, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
TARGET = GPXSee
|
TARGET = GPXSee
|
||||||
VERSION = 5.7
|
VERSION = 5.8
|
||||||
QT += core \
|
QT += core \
|
||||||
gui \
|
gui \
|
||||||
network
|
network
|
||||||
@ -226,7 +226,8 @@ TRANSLATIONS = lang/gpxsee_cs.ts \
|
|||||||
lang/gpxsee_de.ts \
|
lang/gpxsee_de.ts \
|
||||||
lang/gpxsee_ru.ts \
|
lang/gpxsee_ru.ts \
|
||||||
lang/gpxsee_fi.ts \
|
lang/gpxsee_fi.ts \
|
||||||
lang/gpxsee_fr.ts
|
lang/gpxsee_fr.ts \
|
||||||
|
lang/gpxsee_pl.ts
|
||||||
macx {
|
macx {
|
||||||
ICON = icons/gpxsee.icns
|
ICON = icons/gpxsee.icns
|
||||||
QMAKE_INFO_PLIST = pkg/Info.plist
|
QMAKE_INFO_PLIST = pkg/Info.plist
|
||||||
@ -236,7 +237,8 @@ macx {
|
|||||||
lang/gpxsee_fi.qm \
|
lang/gpxsee_fi.qm \
|
||||||
lang/gpxsee_fr.qm \
|
lang/gpxsee_fr.qm \
|
||||||
lang/gpxsee_ru.qm \
|
lang/gpxsee_ru.qm \
|
||||||
lang/gpxsee_sv.qm
|
lang/gpxsee_sv.qm \
|
||||||
|
lang/gpxsee_pl.qm
|
||||||
CSV.path = Contents/Resources
|
CSV.path = Contents/Resources
|
||||||
CSV.files = pkg/csv
|
CSV.files = pkg/csv
|
||||||
MAPS.path = Contents/Resources
|
MAPS.path = Contents/Resources
|
||||||
|
1614
lang/gpxsee_pl.ts
Normal file
1614
lang/gpxsee_pl.ts
Normal file
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
|||||||
; The name of the installer
|
; The name of the installer
|
||||||
Name "GPXSee"
|
Name "GPXSee"
|
||||||
; Program version
|
; Program version
|
||||||
!define VERSION "5.7"
|
!define VERSION "5.8"
|
||||||
|
|
||||||
; The file to write
|
; The file to write
|
||||||
OutFile "GPXSee-${VERSION}.exe"
|
OutFile "GPXSee-${VERSION}.exe"
|
||||||
@ -230,6 +230,11 @@ SectionGroup "Localization" SEC_LOCALIZATION
|
|||||||
File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
|
File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
|
||||||
File /oname=translations\qt_de.qm translations\qt_de.qm
|
File /oname=translations\qt_de.qm translations\qt_de.qm
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
Section "Polish"
|
||||||
|
CreateDirectory "$INSTDIR\translations"
|
||||||
|
File /oname=translations\gpxsee_pl.qm translations\gpxsee_pl.qm
|
||||||
|
File /oname=translations\qt_pl.qm translations\qt_pl.qm
|
||||||
|
SectionEnd
|
||||||
Section "Russian"
|
Section "Russian"
|
||||||
CreateDirectory "$INSTDIR\translations"
|
CreateDirectory "$INSTDIR\translations"
|
||||||
File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
|
File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
; The name of the installer
|
; The name of the installer
|
||||||
Name "GPXSee"
|
Name "GPXSee"
|
||||||
; Program version
|
; Program version
|
||||||
!define VERSION "5.7"
|
!define VERSION "5.8"
|
||||||
|
|
||||||
; The file to write
|
; The file to write
|
||||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||||
@ -232,6 +232,11 @@ SectionGroup "Localization" SEC_LOCALIZATION
|
|||||||
File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
|
File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
|
||||||
File /oname=translations\qt_de.qm translations\qt_de.qm
|
File /oname=translations\qt_de.qm translations\qt_de.qm
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
Section "Polish"
|
||||||
|
CreateDirectory "$INSTDIR\translations"
|
||||||
|
File /oname=translations\gpxsee_pl.qm translations\gpxsee_pl.qm
|
||||||
|
File /oname=translations\qt_pl.qm translations\qt_pl.qm
|
||||||
|
SectionEnd
|
||||||
Section "Russian"
|
Section "Russian"
|
||||||
CreateDirectory "$INSTDIR\translations"
|
CreateDirectory "$INSTDIR\translations"
|
||||||
File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
|
File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
|
||||||
@ -312,4 +317,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
|
|||||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
|
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
|
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
|
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
|
||||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<map xmlns="http://www.gpxsee.org/map/1">
|
<map xmlns="http://www.gpxsee.org/map/1">
|
||||||
<name>USGS Imagery</name>
|
<name>USGS Imagery</name>
|
||||||
<url>https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y</url>
|
<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
|
||||||
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
|
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
|
||||||
<zoom min="2" max="15"/>
|
<zoom min="2" max="15"/>
|
||||||
<bounds bottom="0" top="74"/>
|
<bounds bottom="0" top="74"/>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<map xmlns="http://www.gpxsee.org/map/1">
|
<map xmlns="http://www.gpxsee.org/map/1">
|
||||||
<name>USGS Topo</name>
|
<name>USGS Topo</name>
|
||||||
<url>https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png</url>
|
<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
|
||||||
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
|
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
|
||||||
<zoom min="2" max="15"/>
|
<zoom min="2" max="15"/>
|
||||||
</map>
|
</map>
|
||||||
|
@ -287,7 +287,10 @@ void MapView::setMap(Map *map)
|
|||||||
it.value()->setMap(_map);
|
it.value()->setMap(_map);
|
||||||
updatePOIVisibility();
|
updatePOIVisibility();
|
||||||
|
|
||||||
centerOn(_map->ll2xy(cr.center()));
|
QPointF oc = vr.center();
|
||||||
|
QPointF nc = _map->ll2xy(cr.center());
|
||||||
|
if (qAbs(oc.x() - nc.x()) >= 1.0 || qAbs(oc.y() - nc.y()) >= 1.0)
|
||||||
|
centerOn(nc);
|
||||||
|
|
||||||
resetCachedContent();
|
resetCachedContent();
|
||||||
QPixmapCache::clear();
|
QPixmapCache::clear();
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#define TILE_SIZE 256
|
#define TILE_SIZE 256
|
||||||
|
#define EPSILON 1e-6
|
||||||
|
|
||||||
static QPointF ll2m(const Coordinates &c)
|
static QPointF ll2m(const Coordinates &c)
|
||||||
{
|
{
|
||||||
@ -36,7 +37,7 @@ static qreal zoom2scale(int zoom)
|
|||||||
|
|
||||||
static int scale2zoom(qreal scale)
|
static int scale2zoom(qreal scale)
|
||||||
{
|
{
|
||||||
return (int)log2(360.0/(scale * (qreal)TILE_SIZE));
|
return (int)(log2(360.0/(scale * (qreal)TILE_SIZE)) + EPSILON);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user