1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-07 16:02:51 +02:00

Compare commits

...

18 Commits
7.16 ... 7.17

Author SHA1 Message Date
26c922d9a2 Merge branch 'origin/master' into Weblate. 2019-11-02 09:54:50 +01:00
2ba78545ef Fixed broken GPI files encoding handling 2019-11-02 09:54:11 +01:00
d2a47d1a51 Merge branch 'origin/master' into Weblate. 2019-11-01 19:11:10 +01:00
b2ca97b836 Version++ 2019-11-01 19:10:47 +01:00
979981ffb8 Merge branch 'origin/master' into Weblate. 2019-11-01 19:07:57 +01:00
9a57ca69a0 Added support for mangled POI files 2019-11-01 19:07:21 +01:00
7b9bdf1f08 Merge branch 'origin/master' into Weblate. 2019-10-31 19:16:04 +01:00
034647b461 Added Garmin GPI info 2019-10-31 19:16:00 +01:00
f1d8497851 Merge branch 'origin/master' into Weblate. 2019-10-31 17:49:39 +01:00
2f2f155707 Fixed broken DEM value reading on southern and western coordinates
Fixes #240
2019-10-31 17:47:58 +01:00
6d87587544 Translated using Weblate (Norwegian Bokmål)
Currently translated at 91.9% (319 of 347 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2019-10-31 06:46:09 +01:00
dad2d79361 Translated using Weblate (Swedish)
Currently translated at 100.0% (347 of 347 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2019-10-30 22:56:49 +01:00
9f2d7eb4bb Translated using Weblate (Turkish)
Currently translated at 100.0% (347 of 347 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2019-10-30 22:56:48 +01:00
b57809b3b3 Translated using Weblate (German)
Currently translated at 100.0% (347 of 347 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2019-10-30 22:56:48 +01:00
6cb6c1b4fd Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (347 of 347 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/pt_BR/
2019-10-30 22:56:47 +01:00
14a01b7126 Translated using Weblate (Czech)
Currently translated at 100.0% (347 of 347 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2019-10-30 22:56:47 +01:00
315c095af9 Localization files update 2019-10-30 19:48:06 +01:00
10d2fe4431 Fixed crash on empty segment
Fixes #239
2019-10-29 09:10:32 +01:00
21 changed files with 342 additions and 233 deletions

View File

@ -1,4 +1,4 @@
version: 7.16.{build} version: 7.17.{build}
configuration: Release configuration: Release
platform: Any CPU platform: Any CPU
environment: environment:

View File

@ -2,7 +2,7 @@
GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats. GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.
## Features ## Features
* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin CSV and geotagged JPEG files. * Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles). * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG & JNX maps, TwoNav RMaps, GeoTIFF images). * Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG & JNX maps, TwoNav RMaps, GeoTIFF images).
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs. * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.

View File

@ -3,7 +3,7 @@ unix:!macx {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 7.16 VERSION = 7.17
QT += core \ QT += core \
gui \ gui \

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Podporované soubory</translation> <translation>Podporované soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>Soubory CSV</translation> <translation>Soubory CSV</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>Soubory CUP</translation> <translation>Soubory CUP</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>Soubory FIT</translation> <translation>Soubory FIT</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>Soubory GeoJSON</translation> <translation>Soubory GeoJSON</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation>Soubory GPI</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>Soubory GPX</translation> <translation>Soubory GPX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>Soubory IGC</translation> <translation>Soubory IGC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>Obrázky JPEG</translation> <translation>Obrázky JPEG</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>Soubory KML</translation> <translation>Soubory KML</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>Soubory LOC</translation> <translation>Soubory LOC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>Soubory NMEA</translation> <translation>Soubory NMEA</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>Soubory OziExploreru</translation> <translation>Soubory OziExploreru</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>Soubory TCX</translation> <translation>Soubory TCX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>Soubory SLF</translation> <translation>Soubory SLF</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Všechny soubory</translation> <translation>Všechny soubory</translation>
</message> </message>
@ -950,12 +955,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Understøttede filer</translation> <translation>Understøttede filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV-filer</translation> <translation>CSV-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT-filer</translation> <translation>FIT-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX-filer</translation> <translation>GPX-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC-filer</translation> <translation>IGC-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML-filer</translation> <translation>KML-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC-filer</translation> <translation>LOC-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA-filer</translation> <translation>NMEA-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer-filer</translation> <translation>OziExplorer-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF-filer</translation> <translation>SLF-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX-filer</translation> <translation>TCX-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Alle filer</translation> <translation>Alle filer</translation>
</message> </message>
@ -908,7 +913,7 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Afstand</translation> <translation>Afstand</translation>
</message> </message>
@ -954,7 +959,7 @@
<translation>t</translation> <translation>t</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Tid</translation> <translation>Tid</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Unterstützte Dateien</translation> <translation>Unterstützte Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV-Dateien</translation> <translation>CSV-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>CUP-Dateien</translation> <translation>CUP-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT-Dateien</translation> <translation>FIT-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>GeoJSON-Dateien</translation> <translation>GeoJSON-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation>GPI-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX-Dateien</translation> <translation>GPX-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC-Dateien</translation> <translation>IGC-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>JPEG-Bilder</translation> <translation>JPEG-Bilder</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML-Dateien</translation> <translation>KML-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC-Dateien</translation> <translation>LOC-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA-Dateien</translation> <translation>NMEA-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer-Dateien</translation> <translation>OziExplorer-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX-Dateien</translation> <translation>TCX-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF-Dateien</translation> <translation>SLF-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Alle Dateien</translation> <translation>Alle Dateien</translation>
</message> </message>
@ -949,12 +954,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Distanz</translation> <translation>Distanz</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Zeit</translation> <translation>Zeit</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Formatos soportados</translation> <translation>Formatos soportados</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>Archivos CSV</translation> <translation>Archivos CSV</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>Archivos FIT</translation> <translation>Archivos FIT</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>Archivos GeoJSON</translation> <translation>Archivos GeoJSON</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>Archivos GPX</translation> <translation>Archivos GPX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>Archivos IGC</translation> <translation>Archivos IGC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>Imagen JPEG</translation> <translation>Imagen JPEG</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>Archivos KML</translation> <translation>Archivos KML</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>Archivos LOC</translation> <translation>Archivos LOC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>Archivos NMEA</translation> <translation>Archivos NMEA</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>Archivos OziExplorer</translation> <translation>Archivos OziExplorer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>Archivos SLF</translation> <translation>Archivos SLF</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>Archivos TCX</translation> <translation>Archivos TCX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Todos los archivos</translation> <translation>Todos los archivos</translation>
</message> </message>
@ -908,7 +913,7 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Distancia</translation> <translation>Distancia</translation>
</message> </message>
@ -954,7 +959,7 @@
<translation>h</translation> <translation>h</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Tiempo</translation> <translation>Tiempo</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Tuetut tiedostot</translation> <translation>Tuetut tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV-tiedostot</translation> <translation>CSV-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>CUP-tiedostot</translation> <translation>CUP-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT-tiedostot</translation> <translation>FIT-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>GeoJSON-tiedostot</translation> <translation>GeoJSON-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX-tiedostot</translation> <translation>GPX-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC-tiedostot</translation> <translation>IGC-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>JPEG-kuvat</translation> <translation>JPEG-kuvat</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML-tiedostot</translation> <translation>KML-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC-tiedostot</translation> <translation>LOC-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA-tiedostot</translation> <translation>NMEA-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer-tiedostot</translation> <translation>OziExplorer-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX-tiedostot</translation> <translation>TCX-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF-tiedostot</translation> <translation>SLF-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Kaikki tiedostot</translation> <translation>Kaikki tiedostot</translation>
</message> </message>
@ -949,12 +954,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Etäisyys</translation> <translation>Etäisyys</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Aika</translation> <translation>Aika</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Formats pris en charge</translation> <translation>Formats pris en charge</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>Données CSV</translation> <translation>Données CSV</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>Données CUP</translation> <translation>Données CUP</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>Données FIT</translation> <translation>Données FIT</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>Données GeoJSON</translation> <translation>Données GeoJSON</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>Données GPX</translation> <translation>Données GPX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>Données IGC</translation> <translation>Données IGC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>Images JPEG</translation> <translation>Images JPEG</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>Données KML</translation> <translation>Données KML</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>Données LOC</translation> <translation>Données LOC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>Données NMEA</translation> <translation>Données NMEA</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>Données OziExplorer</translation> <translation>Données OziExplorer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>Données TCX</translation> <translation>Données TCX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>Données SLF</translation> <translation>Données SLF</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Tous les fichiers</translation> <translation>Tous les fichiers</translation>
</message> </message>
@ -949,12 +954,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Distance</translation> <translation>Distance</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Temps</translation> <translation>Temps</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Støttede filer</translation> <translation>Støttede filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV-filer</translation> <translation>CSV-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>CUP-filer</translation> <translation>CUP-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT-filer</translation> <translation>FIT-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>GeoJSON-filer</translation> <translation>GeoJSON-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation>GPI-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX-filer</translation> <translation>GPX-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC-filer</translation> <translation>IGC-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>JPEG-bilder</translation> <translation>JPEG-bilder</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML-filer</translation> <translation>KML-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC-filer</translation> <translation>LOC-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA-filer</translation> <translation>NMEA-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer-filer</translation> <translation>OziExplorer-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF-filer</translation> <translation>SLF-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX-filer</translation> <translation>TCX-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Alle filer</translation> <translation>Alle filer</translation>
</message> </message>
@ -908,7 +913,7 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Avsntand</translation> <translation>Avsntand</translation>
</message> </message>
@ -954,7 +959,7 @@
<translation>t</translation> <translation>t</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Tid</translation> <translation>Tid</translation>
</message> </message>
@ -1534,12 +1539,12 @@
<message> <message>
<location filename="../src/GUI/areaitem.cpp" line="16"/> <location filename="../src/GUI/areaitem.cpp" line="16"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished">Navn</translation> <translation>Navn</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/areaitem.cpp" line="18"/> <location filename="../src/GUI/areaitem.cpp" line="18"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished">Beskrivelse</translation> <translation>Beskrivelse</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Obsługiwane pliki</translation> <translation>Obsługiwane pliki</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>Pliki CSV</translation> <translation>Pliki CSV</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>Pliki FIT</translation> <translation>Pliki FIT</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>Pliki GeoJSON</translation> <translation>Pliki GeoJSON</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>Pliki GPX</translation> <translation>Pliki GPX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>Pliki IGC</translation> <translation>Pliki IGC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>Pliki JPEG</translation> <translation>Pliki JPEG</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>Pliki KML</translation> <translation>Pliki KML</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>Pliki LOC</translation> <translation>Pliki LOC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>Pliki NMEA</translation> <translation>Pliki NMEA</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>Pliki OziExplorer</translation> <translation>Pliki OziExplorer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>Pliki TCX</translation> <translation>Pliki TCX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>Pliki SLF</translation> <translation>Pliki SLF</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Wszystkie pliki</translation> <translation>Wszystkie pliki</translation>
</message> </message>
@ -950,12 +955,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Dystans</translation> <translation>Dystans</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Czas</translation> <translation>Czas</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Formatos suportados</translation> <translation>Formatos suportados</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>Arquivos CSV</translation> <translation>Arquivos CSV</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>Arquivos CUP</translation> <translation>Arquivos CUP</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>Arquivos FIT</translation> <translation>Arquivos FIT</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>Arquivos GeoJSON</translation> <translation>Arquivos GeoJSON</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation>Arquivos GPI</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>Arquivos GPX</translation> <translation>Arquivos GPX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>Arquivos IGC</translation> <translation>Arquivos IGC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>Imagens JPEG</translation> <translation>Imagens JPEG</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>Arquivos KML</translation> <translation>Arquivos KML</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>Arquivos LOC</translation> <translation>Arquivos LOC</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>Arquivos NMEA</translation> <translation>Arquivos NMEA</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>Arquivos OziExplorer</translation> <translation>Arquivos OziExplorer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>Arquivos SLF</translation> <translation>Arquivos SLF</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>Arquivos TCX</translation> <translation>Arquivos TCX</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Todos os arquivos</translation> <translation>Todos os arquivos</translation>
</message> </message>
@ -908,7 +913,7 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Distância</translation> <translation>Distância</translation>
</message> </message>
@ -954,7 +959,7 @@
<translation>h</translation> <translation>h</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Tempo</translation> <translation>Tempo</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Все поддерживаемые файлы</translation> <translation>Все поддерживаемые файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV файлы</translation> <translation>CSV файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>CUP файлы</translation> <translation>CUP файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT файлы</translation> <translation>FIT файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>GeoJSON файлы</translation> <translation>GeoJSON файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX файлы</translation> <translation>GPX файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC файлы</translation> <translation>IGC файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>JPEG изображения</translation> <translation>JPEG изображения</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML файлы</translation> <translation>KML файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC файлы</translation> <translation>LOC файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA файлы</translation> <translation>NMEA файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer файлы</translation> <translation>OziExplorer файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX файлы</translation> <translation>TCX файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF файлы</translation> <translation>SLF файлы</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Все файлы</translation> <translation>Все файлы</translation>
</message> </message>
@ -950,12 +955,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Расстояние</translation> <translation>Расстояние</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Время</translation> <translation>Время</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Filer som stöds</translation> <translation>Filer som stöds</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV-filer</translation> <translation>CSV-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>CUP-filer</translation> <translation>CUP-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT-filer</translation> <translation>FIT-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>GeoJSON-filer</translation> <translation>GeoJSON-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation>GPI-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX-filer</translation> <translation>GPX-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC-filer</translation> <translation>IGC-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>JPEG-bilder</translation> <translation>JPEG-bilder</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML-filer</translation> <translation>KML-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC-filer</translation> <translation>LOC-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA-filer</translation> <translation>NMEA-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer-filer</translation> <translation>OziExplorer-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX-filer</translation> <translation>TCX-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF-filer</translation> <translation>SLF-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Alla filer</translation> <translation>Alla filer</translation>
</message> </message>
@ -949,12 +954,12 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Avstånd</translation> <translation>Avstånd</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Tid</translation> <translation>Tid</translation>
</message> </message>

View File

@ -47,77 +47,82 @@
<context> <context>
<name>Data</name> <name>Data</name>
<message> <message>
<location filename="../src/data/data.cpp" line="173"/> <location filename="../src/data/data.cpp" line="176"/>
<source>Supported files</source> <source>Supported files</source>
<translation>Desteklenen dosyalar</translation> <translation>Desteklenen dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="174"/> <location filename="../src/data/data.cpp" line="177"/>
<source>CSV files</source> <source>CSV files</source>
<translation>CSV dosyalar</translation> <translation>CSV dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="175"/> <location filename="../src/data/data.cpp" line="178"/>
<source>CUP files</source> <source>CUP files</source>
<translation>CUP dosyaları</translation> <translation>CUP dosyaları</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="176"/> <location filename="../src/data/data.cpp" line="179"/>
<source>FIT files</source> <source>FIT files</source>
<translation>FIT dosyalar</translation> <translation>FIT dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="178"/> <location filename="../src/data/data.cpp" line="181"/>
<source>GeoJSON files</source> <source>GeoJSON files</source>
<translation>GeoJSON dosyalar</translation> <translation>GeoJSON dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="180"/> <location filename="../src/data/data.cpp" line="183"/>
<source>GPI files</source>
<translation>GPI dosyaları</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="184"/>
<source>GPX files</source> <source>GPX files</source>
<translation>GPX dosyalar</translation> <translation>GPX dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="181"/> <location filename="../src/data/data.cpp" line="185"/>
<source>IGC files</source> <source>IGC files</source>
<translation>IGC dosyalar</translation> <translation>IGC dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="182"/> <location filename="../src/data/data.cpp" line="186"/>
<source>JPEG images</source> <source>JPEG images</source>
<translation>JPEG resimler</translation> <translation>JPEG resimler</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="183"/> <location filename="../src/data/data.cpp" line="187"/>
<source>KML files</source> <source>KML files</source>
<translation>KML dosyalar</translation> <translation>KML dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="184"/> <location filename="../src/data/data.cpp" line="188"/>
<source>LOC files</source> <source>LOC files</source>
<translation>LOC dosyalar</translation> <translation>LOC dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="185"/> <location filename="../src/data/data.cpp" line="189"/>
<source>NMEA files</source> <source>NMEA files</source>
<translation>NMEA dosyalar</translation> <translation>NMEA dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="186"/> <location filename="../src/data/data.cpp" line="190"/>
<source>OziExplorer files</source> <source>OziExplorer files</source>
<translation>OziExplorer dosyalar</translation> <translation>OziExplorer dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="187"/> <location filename="../src/data/data.cpp" line="191"/>
<source>SLF files</source> <source>SLF files</source>
<translation>SLF dosyalar</translation> <translation>SLF dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="188"/> <location filename="../src/data/data.cpp" line="192"/>
<source>TCX files</source> <source>TCX files</source>
<translation>TCX dosyalar</translation> <translation>TCX dosyalar</translation>
</message> </message>
<message> <message>
<location filename="../src/data/data.cpp" line="189"/> <location filename="../src/data/data.cpp" line="193"/>
<source>All files</source> <source>All files</source>
<translation>Tüm dosyalar</translation> <translation>Tüm dosyalar</translation>
</message> </message>
@ -908,7 +913,7 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="66"/> <location filename="../src/GUI/graphview.cpp" line="66"/>
<location filename="../src/GUI/graphview.cpp" line="173"/> <location filename="../src/GUI/graphview.cpp" line="177"/>
<source>Distance</source> <source>Distance</source>
<translation>Mesafe</translation> <translation>Mesafe</translation>
</message> </message>
@ -954,7 +959,7 @@
<translation>sa</translation> <translation>sa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/graphview.cpp" line="175"/> <location filename="../src/GUI/graphview.cpp" line="179"/>
<source>Time</source> <source>Time</source>
<translation>Zaman</translation> <translation>Zaman</translation>
</message> </message>

View File

@ -7,7 +7,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "7.16" !define VERSION "7.17"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}.exe" OutFile "GPXSee-${VERSION}.exe"

View File

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

View File

@ -1,4 +1,9 @@
#include <QtEndian> #include <QtEndian>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <QtCore/qmath.h>
#else // QT5
#include <QtMath>
#endif // QT5
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include "common/coordinates.h" #include "common/coordinates.h"
@ -37,10 +42,10 @@ static qreal height(const Coordinates &c, const QByteArray *data)
else else
return NAN; return NAN;
int row = (int)((c.lat() - (int)c.lat()) * (samples - 1)); int row = (int)((c.lat() - qFloor(c.lat())) * (samples - 1));
int col = (int)((c.lon() - (int)c.lon()) * (samples - 1)); int col = (int)((c.lon() - qFloor(c.lon())) * (samples - 1));
qreal dx = ((c.lon() - (int)c.lon()) * (samples - 1)) - col; qreal dx = ((c.lon() - qFloor(c.lon())) * (samples - 1)) - col;
qreal dy = ((c.lat() - (int)c.lat()) * (samples - 1)) - row; qreal dy = ((c.lat() - qFloor(c.lat())) * (samples - 1)) - row;
qreal p0 = value(col, row, samples, data); qreal p0 = value(col, row, samples, data);
qreal p1 = value(col + 1, row, samples, data); qreal p1 = value(col + 1, row, samples, data);
@ -75,7 +80,7 @@ qreal DEM::elevation(const Coordinates &c)
if (_dir.isEmpty()) if (_dir.isEmpty())
return NAN; return NAN;
Key k((int)c.lon(), (int)c.lat()); Key k(qFloor(c.lon()), qFloor(c.lat()));
QByteArray *ba = _data[k]; QByteArray *ba = _data[k];
if (!ba) { if (!ba) {

View File

@ -2,6 +2,7 @@
#include <QTextCodec> #include <QTextCodec>
#include <QtEndian> #include <QtEndian>
#include <QUrl> #include <QUrl>
#include <QBuffer>
#include "gpiparser.h" #include "gpiparser.h"
@ -26,6 +27,32 @@ private:
QString _str; QString _str;
}; };
#define BLOCK_KEY 0xf870b5
void demangle(quint8 *data, quint32 size, quint32 key)
{
static const unsigned char shuf[] = {
0xb, 0xc, 0xa, 0x0,
0x8, 0xf, 0x2, 0x1,
0x6, 0x4, 0x9, 0x3,
0xd, 0x5, 0x7, 0xe
};
int hiCnt = 0, loCnt;
quint8 sum = shuf[(key >> 0x10) + key + (key >> 0x18) + (key >> 8) & 0xf];
for (quint32 i = 0; i < size; i++) {
quint8 hiAdd = shuf[key >> (hiCnt << 2) & 0xf] + sum;
loCnt = (hiCnt > 6) ? 0 : hiCnt + 1;
quint8 loAdd = shuf[key >> (loCnt << 2) & 0xf] + sum;
quint8 hi = data[i] + hiAdd * 0xf0;
quint8 lo = data[i] - loAdd;
data[i] = (hi & 0xf0) | (lo & 0x0f);
hiCnt = (loCnt > 6) ? 0 : loCnt + 1;
}
}
static inline double toWGS(qint32 v) static inline double toWGS(qint32 v)
{ {
return (double)(((double)v / (double)(1U<<31)) * (double)180); return (double)(((double)v / (double)(1U<<31)) * (double)180);
@ -306,7 +333,7 @@ static quint32 readFileDataRecord(QDataStream &stream, QTextCodec *codec)
return rs + rh.size; return rs + rh.size;
} }
bool GPIParser::readFileHeader(QDataStream &stream) bool GPIParser::readFileHeader(QDataStream &stream, quint32 &ebs)
{ {
RecordHeader rh; RecordHeader rh;
quint32 ds, s7; quint32 ds, s7;
@ -326,10 +353,7 @@ bool GPIParser::readFileHeader(QDataStream &stream)
if (rh.flags & 8) if (rh.flags & 8)
ds += readFprsRecord(stream); ds += readFprsRecord(stream);
if (s8 & 0x4) { ebs = (s8 & 0x4) ? s9 * 8 + 8 : 0;
_errorString = "Encrypted GPI files not supported";
return false;
}
if (stream.status() != QDataStream::Ok || ds != rh.size) { if (stream.status() != QDataStream::Ok || ds != rh.size) {
_errorString = "Invalid file header"; _errorString = "Invalid file header";
@ -338,7 +362,7 @@ bool GPIParser::readFileHeader(QDataStream &stream)
return true; return true;
} }
bool GPIParser::readGPIHeader(QDataStream &stream, QTextCodec *codec) bool GPIParser::readGPIHeader(QDataStream &stream, QTextCodec **codec)
{ {
RecordHeader rh; RecordHeader rh;
char m1[6], m2[2]; char m1[6], m2[2];
@ -353,15 +377,15 @@ bool GPIParser::readGPIHeader(QDataStream &stream, QTextCodec *codec)
ds = sizeof(m1) + sizeof(m2) + 4; ds = sizeof(m1) + sizeof(m2) + 4;
if (codepage == 65001) if (codepage == 65001)
codec = QTextCodec::codecForName("UTF-8"); *codec = QTextCodec::codecForName("UTF-8");
else if (codepage == 0) else if (codepage == 0)
codec = 0; *codec = 0;
else else
codec = QTextCodec::codecForName(QString("CP%1").arg(codepage) *codec = QTextCodec::codecForName(QString("CP%1").arg(codepage)
.toLatin1()); .toLatin1());
if (s2 & 0x10) if (s2 & 0x10)
ds += readFileDataRecord(stream, codec); ds += readFileDataRecord(stream, *codec);
if (stream.status() != QDataStream::Ok || ds != rh.size) { if (stream.status() != QDataStream::Ok || ds != rh.size) {
_errorString = "Invalid GPI header"; _errorString = "Invalid GPI header";
@ -432,13 +456,31 @@ bool GPIParser::parse(QFile *file, QList<TrackData> &tracks,
Q_UNUSED(polygons); Q_UNUSED(polygons);
QDataStream stream(file); QDataStream stream(file);
QTextCodec *codec = 0; QTextCodec *codec = 0;
quint32 ebs;
bool ret;
stream.setByteOrder(QDataStream::LittleEndian); stream.setByteOrder(QDataStream::LittleEndian);
if (!readFileHeader(stream) || !readGPIHeader(stream, codec)) if (!readFileHeader(stream, ebs) || !readGPIHeader(stream, &codec))
return false; return false;
if (!readData(stream, codec, waypoints)) { if (ebs) {
QByteArray ba(stream.device()->readAll());
for (int i = 0; i < (ba.size() / (int)ebs); i++)
demangle((quint8*)(ba.data() + i * ebs), ebs, BLOCK_KEY);
demangle((quint8*)(ba.data() + (ba.size() / (int)ebs) * ebs),
ba.size() - ((ba.size() / (int)ebs) * ebs), BLOCK_KEY);
QBuffer buffer(&ba);
buffer.open(QIODevice::ReadOnly);
QDataStream memStream(&buffer);
memStream.setByteOrder(QDataStream::LittleEndian);
ret = readData(memStream, codec, waypoints);
} else
ret = readData(stream, codec, waypoints);
if (!ret) {
_errorString = "Invalid/corrupted GPI data"; _errorString = "Invalid/corrupted GPI data";
return false; return false;
} else } else

View File

@ -15,8 +15,8 @@ public:
int errorLine() const {return 0;} int errorLine() const {return 0;}
private: private:
bool readFileHeader(QDataStream &stream); bool readFileHeader(QDataStream &stream, quint32 &ebs);
bool readGPIHeader(QDataStream &stream, QTextCodec *codec); bool readGPIHeader(QDataStream &stream, QTextCodec **codec);
bool readData(QDataStream &stream, QTextCodec *codec, bool readData(QDataStream &stream, QTextCodec *codec,
QVector<Waypoint> &waypoints); QVector<Waypoint> &waypoints);
bool readEntry(QDataStream &stream, QTextCodec *codec, bool readEntry(QDataStream &stream, QTextCodec *codec,

View File

@ -74,17 +74,19 @@ Track::Track(const TrackData &data) : _data(data), _pause(0)
for (int i = 0; i < _data.size(); i++) { for (int i = 0; i < _data.size(); i++) {
const SegmentData &sd = _data.at(i); const SegmentData &sd = _data.at(i);
_segments.append(Segment());
if (sd.isEmpty()) if (sd.isEmpty())
continue; continue;
// precompute distances, times, speeds and acceleration // precompute distances, times, speeds and acceleration
QVector<qreal> acceleration; QVector<qreal> acceleration;
_segments.append(Segment());
Segment &seg = _segments.last(); Segment &seg = _segments.last();
seg.distance.append(i ? _segments.at(i-1).distance.last() : 0); seg.distance.append(i && !_segments.at(i-1).distance.isEmpty()
seg.time.append(i ? _segments.at(i-1).time.last() : ? _segments.at(i-1).distance.last() : 0);
seg.time.append(i && !_segments.at(i-1).time.isEmpty()
? _segments.at(i-1).time.last() :
sd.first().hasTimestamp() ? 0 : NAN); sd.first().hasTimestamp() ? 0 : NAN);
seg.speed.append(sd.first().hasTimestamp() ? 0 : NAN); seg.speed.append(sd.first().hasTimestamp() ? 0 : NAN);
acceleration.append(sd.first().hasTimestamp() ? 0 : NAN); acceleration.append(sd.first().hasTimestamp() ? 0 : NAN);