1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-01 05:19:15 +02:00

Compare commits

...

131 Commits
5.2 ... 5.8

Author SHA1 Message Date
bb10f7c0e1 Version++ 2018-04-17 22:54:42 +02:00
8ff21b5b37 Added the Polish translation into the builds 2018-04-17 22:52:47 +02:00
32f41e5287 Added new PL (Polish) translation file. (#103) 2018-04-17 22:40:12 +02:00
c50e41dea1 Numerical instability fix 2018-04-17 22:26:20 +02:00
e34800b8d1 Updated description (added OziExplorer files) 2018-04-17 21:27:03 +02:00
6642a2f810 Updated USGS maps URLs 2018-04-17 21:25:47 +02:00
55458b04a6 Fixed 1px map change offset & invalid zoom level 2018-04-17 21:24:46 +02:00
9e36451001 RectC now uses the expected axis direction
+ some more refactoring
2018-04-16 20:26:10 +02:00
b26a10a5b3 Added missing initialization 2018-04-16 19:14:27 +02:00
4530ec1354 Code cleanup 2018-04-15 17:32:25 +02:00
f2b72ec1b5 Fixed GeoTIFF on platforms where qreal != double 2018-04-15 16:27:47 +02:00
4b776c8cc1 Replaced remaining qreals in Coordinates logic 2018-04-15 10:42:06 +02:00
d31bf80885 Merget the OziExplorer parsers to a single source file 2018-04-15 10:08:50 +02:00
f77497c93e Translations update 2018-04-15 09:50:20 +02:00
c6ddee8682 Merge branch 'master' of https://github.com/tumic0/GPXSee 2018-04-14 23:35:09 +02:00
0d6bc05818 Added missing GPX icon to OS X bundle copy 2018-04-14 23:33:59 +02:00
fdecbc6cee Merge branch 'master' of https://github.com/tumic0/GPXSee 2018-04-14 22:56:37 +02:00
cad17fb5d3 appdata.xml description update 2018-04-14 22:55:58 +02:00
ced1244cbd Translations update (#100) 2018-04-14 22:34:41 +02:00
3dd22eb2ba Version++ 2018-04-14 21:26:13 +02:00
b12e83043d Updated icns files 2018-04-14 21:21:58 +02:00
6416c81232 Removed debug comment 2018-04-14 20:55:39 +02:00
e5db00a4f4 Added missing density setting 2018-04-14 20:54:18 +02:00
6266d71463 Added icns generation script 2018-04-14 20:30:44 +02:00
daf0cf6f9d Updated forgotten TCX icon 2018-04-14 17:41:20 +02:00
d6b810b6ef Updated icns icons 2018-04-14 17:31:39 +02:00
8f20080a36 Adjusted the SVG template to workaround broken rsvg vertical centering 2018-04-14 17:17:17 +02:00
e112363424 Fixed icon order 2018-04-14 15:10:27 +02:00
a277d0ad4f Added OziExplorer data formats icons & association 2018-04-14 14:04:19 +02:00
d4cd542a20 Grouped OziExplorer files to a single selection 2018-04-14 08:53:37 +02:00
5eaf0455aa Fixed empty CSV fields handling 2018-04-14 00:45:03 +02:00
3f71775101 Fixed broken radius-rect computation
Always use the double type for coordinate related data
2018-04-13 21:14:12 +02:00
f8009b0151 Added support for OziExplorer data files 2018-04-13 20:54:38 +02:00
f64e88290d Update README.md 2018-04-08 21:21:04 +02:00
b4cf614f77 Added missing "other sample dimensions" support for WMS 2018-04-08 19:13:16 +02:00
ca710b6a22 Fixed typo in german ts file
ts files update
2018-04-08 18:50:34 +02:00
c894e75c17 Adjusted stuff to comply with the new map version 1 xsd 2018-04-08 17:48:13 +02:00
259a15332e Fixed QT4 build 2018-04-07 23:04:26 +02:00
c4915891e7 Code cleanup 2018-04-07 18:42:25 +02:00
c5256b25e9 Added missing namespace 2018-04-05 21:13:48 +02:00
81b3a517f8 Use the correct axis order defaults for WMS/WMTS maps 2018-04-05 20:38:23 +02:00
3aa1ab4b4c Set a less restrictive lower bound for WMS scale denominators 2018-04-03 23:14:47 +02:00
d4fb8ed9c9 Fixed error reporting 2018-04-03 23:05:17 +02:00
fb16c3f2db Fixed tile cache reload logic 2018-04-03 22:36:08 +02:00
4096d87a6a Improved default WMS/WMTS style handling 2018-04-03 22:35:13 +02:00
68eac5b8cc Yet another WMS corner case handling fix 2018-04-03 01:14:58 +02:00
88d6904ded Yet another WMS bounding box computation fix 2018-04-03 00:08:01 +02:00
021558b114 Fixed QT4 build 2018-04-02 23:33:10 +02:00
b8815ca9f5 Fixed layer bounding box & scale denominator range joining 2018-04-02 23:27:42 +02:00
e845e216bd Added support for WMS multi-layer maps 2018-04-02 19:59:52 +02:00
60cc869ade The "default" style does not to be set wxplicitly 2018-04-02 18:30:57 +02:00
e3e8fdbacf Fixed WMS 1.1.x support
Added support for HTTP basic authorization
2018-04-01 20:01:25 +02:00
16f2d7ad34 Added support for WMS 1.1.x versions 2018-03-31 11:27:01 +02:00
aecda0e517 Version++ 2018-03-30 10:48:57 +02:00
bf3589812a Initial WMS support (no multi-layer support for now) 2018-03-30 10:25:05 +02:00
8821536419 Fixed most clazy warnings 2018-03-29 00:29:08 +02:00
bda24d9091 Use $HOME as the default open directory (on all platforms) 2018-03-28 02:01:27 +02:00
820e614921 Fixed broken data size copy 2018-03-26 01:02:31 +02:00
35703e3363 Refactoring 2018-03-22 20:00:30 +01:00
a54821863f Includes cleanup 2018-03-21 19:23:17 +01:00
5bc3b2ad05 Merge branch 'master' of https://github.com/tumic0/GPXSee 2018-03-21 19:10:42 +01:00
992fd2c5cd Code cleanup 2018-03-21 19:09:37 +01:00
4b4a1902ef Indent cleanup 2018-03-21 18:52:57 +01:00
7d3bc2112a Update gpxsee.desktop (#85)
Add Swedish translation
2018-03-20 21:29:45 +01:00
4ea2f0752a Do not display negative zeros.
Fixes #86
2018-03-20 21:17:20 +01:00
0bb3b3812c Fixed broken release builds 2018-03-19 22:40:49 +01:00
b23639bef2 Version++ 2018-03-19 20:11:12 +01:00
2d8bf2dbb9 Added missing Swiss grid map file support 2018-03-19 19:56:31 +01:00
29efa84075 Do not depend on the initializing ellipsoid 2018-03-19 19:13:48 +01:00
3d06fe8831 Also clear the error URLs when clearing the tile cache.
Code cleanup.
2018-03-15 18:46:34 +01:00
fe1f6c80b4 Use the correct units for azimuths 2018-03-15 00:27:44 +01:00
35d1e69d7f Merge branch 'master' of https://github.com/tumic0/GPXSee 2018-03-14 07:25:28 +01:00
3043128565 Added finite HTTP response timeout 2018-03-14 07:23:07 +01:00
e56a9e33f3 Added ETRS-TM35FIN (#82) 2018-03-13 09:17:59 +01:00
07aca435d8 Update gpxsee_sv.ts (#81)
Latest strings translated
2018-03-12 20:54:10 +01:00
4e4a3d042a Translations update (#80) 2018-03-12 20:53:15 +01:00
bf5ae22f0d Handle the WGS84 ellipsoid only definitions like the GRS80 ellipsoid only definitions 2018-03-12 20:05:53 +01:00
309fdb675c Removed unused definitions 2018-03-11 20:53:16 +01:00
e0daf367fb Added support for WGS84 GeoTIFF images with the GCS defined using the ellipsoid only 2018-03-11 20:11:42 +01:00
32d8672698 REST variables (dimensions) are apparently case-insensitive 2018-03-11 19:23:40 +01:00
0ef89e200d Translations update 2018-03-11 16:28:30 +01:00
6d6c232dba Version++ 2018-03-11 10:49:02 +01:00
8132ff722d Added support for WMTS dimensions 2018-03-11 10:31:41 +01:00
49792064d7 Fixed error handling 2018-03-11 09:24:04 +01:00
7aef81d823 Added support for EPSG 21781 PCS (Swiss grid)
Fixed swapped LCC1 and LCC2 GeoTIFF coordinate transformation codes
2018-03-11 01:10:24 +01:00
1d3d1aa5b7 Fixed broken zoom rectangle computation 2018-03-10 21:04:14 +01:00
bcd14726f3 Added pace info 2018-03-10 20:25:13 +01:00
fd15799114 Includes cleanup 2018-03-10 09:25:52 +01:00
a8bc2ae4c4 Fixed wrong data type 2018-03-10 08:40:55 +01:00
67aba4703b Some more code cleanup 2018-03-09 23:24:08 +01:00
a64e5e13c3 Remove the 1px offset workaround as it does not work properly anyway... 2018-03-09 21:53:06 +01:00
60fcff7658 Code cleanup 2018-03-09 18:57:23 +01:00
bc881836ac Improved map index caching 2018-03-09 18:56:54 +01:00
de05f5e64b Some more offline map code cleanup 2018-03-08 19:08:39 +01:00
16476dbf74 Offline map code cleanup/refactoring 2018-03-08 02:24:10 +01:00
a21464d98d Added missing virtual destructors 2018-03-08 00:57:09 +01:00
d6746bc444 Code cleanup 2018-03-06 19:28:07 +01:00
e4d8af2040 Update README.md 2018-03-01 20:30:02 +01:00
b40e0d3bbf Fixed accessing of un-initialized variable 2018-03-01 19:06:55 +01:00
9300d671a1 Fixed invalid memory access 2018-03-01 19:06:34 +01:00
b9ed0c3933 Improved scale computation on offline & WMTS maps 2018-02-28 22:19:46 +01:00
46cefada94 Code cleanup 2018-02-27 21:50:29 +01:00
e1e49b32e6 Added some more map definition checking 2018-02-27 01:02:22 +01:00
fa99d01a77 Extended error checking 2018-02-26 22:35:58 +01:00
688e309ef7 Update gpxsee_sv.ts (#79)
Change shortcut letter for "Data"
2018-02-26 19:22:34 +01:00
ae4723acb1 Added GCS 4178 and related PCSs 2018-02-26 19:21:00 +01:00
8c6f70d837 Code cleanup 2018-02-26 19:13:57 +01:00
d1b0e2ef73 Improved error reporting 2018-02-26 19:05:53 +01:00
962310df7d Fixed single point zoom fit on WMTS maps 2018-02-25 19:33:12 +01:00
f8c031e931 Translation update/cleanup 2018-02-25 09:31:19 +01:00
8022a9efbe Update gpxsee_sv.ts (#78) 2018-02-25 09:18:10 +01:00
fbab4b0097 Made the axis order an attribute of the set rather than a separate element 2018-02-25 08:58:40 +01:00
5e5ff6d96f Added support for REST WMTS maps 2018-02-25 02:31:01 +01:00
55e967673c Use image/png as the default image format 2018-02-24 22:31:37 +01:00
757ba6a566 Fixed QT4 build 2018-02-24 16:48:38 +01:00
ee80260e46 Improved capabilities xml parsing
Improved bounds handling
2018-02-24 16:44:30 +01:00
fa3e6d8550 Added error checking 2018-02-24 11:40:54 +01:00
6e95d484cd Added support for OGC:CRS84 CRS to WMTS maps 2018-02-24 11:20:29 +01:00
376587202b Properly handling non-integer tile matrix ids 2018-02-24 10:34:27 +01:00
d11ffc9ea4 Added tile matrix set limits handling
Added axis order setting
2018-02-24 01:59:03 +01:00
bf6ebdc088 Translations update (#77) 2018-02-23 00:13:49 +01:00
619df591e2 Added support for geographic2d "projected" WMTS maps 2018-02-22 21:02:56 +01:00
10aa7d3945 Code cleanup 2018-02-22 18:12:47 +01:00
12319fd8fd Cleanup 2018-02-22 18:07:51 +01:00
ccb7336e3f Added menu accelerator keys 2018-02-22 08:18:10 +01:00
a7fea3878c Version++ 2018-02-22 00:56:49 +01:00
a6cf88aa92 Fixed visual artefacts on transparent tiles 2018-02-22 00:50:45 +01:00
b054cf9046 Using the correct projection for Lambert azimuthal equal area 2018-02-22 00:46:05 +01:00
9c5153f89a Fixed QT4 build 2018-02-21 00:13:11 +01:00
2ebcdeeeff Added ETRS89 data 2018-02-20 23:38:29 +01:00
1bc4833a81 Added initial WMTS support 2018-02-20 23:37:19 +01:00
141 changed files with 8626 additions and 4857 deletions

View File

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

View File

@ -1,9 +1,9 @@
# GPXSee
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
* User-definable online maps.
* User-definable online maps (OSM/Google tiles, WMTS, WMS).
* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF images).
* Elevation, speed, heart rate, cadence, power and temperature graphs.
* Support for multiple tracks in one view.
@ -11,7 +11,7 @@ KML, FIT, IGC and NMEA files.
* Print/export to PDF.
* Full-screen mode.
* 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.
![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)

View File

@ -1,5 +1,5 @@
TARGET = GPXSee
VERSION = 5.2
VERSION = 5.8
QT += core \
gui \
network
@ -92,6 +92,20 @@ HEADERS += src/config.h \
src/map/transform.h \
src/map/mapfile.h \
src/map/tifffile.h \
src/map/gcs.h \
src/map/angularunits.h \
src/map/primemeridian.h \
src/map/linearunits.h \
src/map/ct.h \
src/map/mapsource.h \
src/map/tileloader.h \
src/map/wmtsmap.h \
src/map/wmts.h \
src/map/wmsmap.h \
src/map/wms.h \
src/map/crs.h \
src/map/coordinatesystem.h \
src/map/pointd.h \
src/data/graph.h \
src/data/poi.h \
src/data/waypoint.h \
@ -111,12 +125,7 @@ HEADERS += src/config.h \
src/data/fitparser.h \
src/data/igcparser.h \
src/data/nmeaparser.h \
src/map/gcs.h \
src/map/angularunits.h \
src/map/primemeridian.h \
src/map/linearunits.h \
src/map/ct.h \
src/map/mapsource.h
src/data/oziparsers.h
SOURCES += src/main.cpp \
src/common/coordinates.cpp \
src/common/rectc.cpp \
@ -185,6 +194,19 @@ SOURCES += src/main.cpp \
src/map/transform.cpp \
src/map/mapfile.cpp \
src/map/tifffile.cpp \
src/map/projection.cpp \
src/map/gcs.cpp \
src/map/angularunits.cpp \
src/map/primemeridian.cpp \
src/map/linearunits.cpp \
src/map/mapsource.cpp \
src/map/tileloader.cpp \
src/map/wmtsmap.cpp \
src/map/wmts.cpp \
src/map/wmsmap.cpp \
src/map/wms.cpp \
src/map/crs.cpp \
src/map/coordinatesystem.cpp \
src/data/data.cpp \
src/data/poi.cpp \
src/data/track.cpp \
@ -197,19 +219,15 @@ SOURCES += src/main.cpp \
src/data/fitparser.cpp \
src/data/igcparser.cpp \
src/data/nmeaparser.cpp \
src/map/projection.cpp \
src/map/gcs.cpp \
src/map/angularunits.cpp \
src/map/primemeridian.cpp \
src/map/linearunits.cpp \
src/map/mapsource.cpp
src/data/oziparsers.cpp
RESOURCES += gpxsee.qrc
TRANSLATIONS = lang/gpxsee_cs.ts \
lang/gpxsee_sv.ts \
lang/gpxsee_de.ts \
lang/gpxsee_ru.ts \
lang/gpxsee_fi.ts \
lang/gpxsee_fr.ts
lang/gpxsee_fr.ts \
lang/gpxsee_pl.ts
macx {
ICON = icons/gpxsee.icns
QMAKE_INFO_PLIST = pkg/Info.plist
@ -219,17 +237,22 @@ macx {
lang/gpxsee_fi.qm \
lang/gpxsee_fr.qm \
lang/gpxsee_ru.qm \
lang/gpxsee_sv.qm
lang/gpxsee_sv.qm \
lang/gpxsee_pl.qm
CSV.path = Contents/Resources
CSV.files = pkg/csv
MAPS.path = Contents/Resources
MAPS.files = pkg/maps
ICONS.path = Contents/Resources/icons
ICONS.files = icons/tcx.icns \
ICONS.files = icons/gpx.icns \
icons/tcx.icns \
icons/kml.icns \
icons/fit.icns \
icons/igc.icns \
icons/nmea.icns
icons/nmea.icns \
icons/plt.icns \
icons/rte.icns \
icons/wpt.icns
QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV
}
win32 {
@ -239,6 +262,9 @@ win32 {
icons/kml.ico \
icons/fit.ico \
icons/igc.ico \
icons/nmea.ico
icons/nmea.ico \
icons/plt.ico \
icons/rte.ico \
icons/wpt.ico
}
DEFINES += APP_VERSION=\\\"$$VERSION\\\"

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 302 KiB

View File

@ -1,171 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg3390"
height="185"
width="185"
inkscape:version="0.91 r13725"
sodipodi:docname="fit.svg">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1440"
inkscape:window-height="815"
id="namedview3427"
showgrid="false"
inkscape:zoom="3.1351351"
inkscape:cx="92.5"
inkscape:cy="92.5"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3390" />
<metadata
id="metadata3404">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3402" />
<path
style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
id="path3392"
d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
<rect
y="124.9782"
x="16.573463"
height="49.84631"
width="120.3215"
id="rect3426"
style="fill:#006600;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="g3828"
transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
<g
id="g3715">
<circle
style="fill:#000000"
cx="113"
cy="90.875"
id="ellipse3717"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
cx="113"
cy="90.875"
id="ellipse3719"
r="7.0209999" />
</g>
<polyline
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
id="polyline3721" />
<g
id="g3723">
<circle
style="fill:#000000"
cx="73.5"
cy="125.854"
id="ellipse3725"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="73.5"
cy="125.854"
id="ellipse3727"
r="7.0209999" />
</g>
<g
id="g3729">
<circle
style="fill:#000000"
cx="136.5"
cy="172.375"
id="ellipse3731"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="136.5"
cy="172.375"
id="ellipse3733"
r="7.0209999" />
</g>
<g
id="g3735">
<circle
style="fill:#000000"
cx="60.700001"
cy="186.39999"
id="ellipse3737"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="60.700001"
cy="186.39999"
id="ellipse3739"
r="7.0209999" />
</g>
<g
id="g3741">
<circle
style="fill:#000000"
cx="154.5"
cy="154.354"
id="ellipse3743"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="154.5"
cy="154.354"
id="ellipse3745"
r="7.0209999" />
</g>
<g
id="g3747">
<circle
style="fill:#000000"
cx="96"
cy="151.875"
id="ellipse3749"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="96"
cy="151.875"
id="ellipse3751"
r="7.0209999" />
</g>
</g>
<text
transform="scale(0.9437456,1.0596076)"
id="text3921"
y="155.86783"
x="44.388157"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"
sodipodi:linespacing="100%"><tspan
sodipodi:role="line"
id="tspan3429"
x="44.388157"
y="155.86783">FIT</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 305 KiB

View File

@ -1,146 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="svg3390"
height="185"
width="185">
<metadata
id="metadata3404">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3402" />
<path
style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
id="path3392"
d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
<rect
y="124.9782"
x="16.573463"
height="49.84631"
width="120.3215"
id="rect3426"
style="fill:#003399;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="g3828"
transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
<g
id="g3715">
<circle
style="fill:#000000"
cx="113"
cy="90.875"
id="ellipse3717"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
cx="113"
cy="90.875"
id="ellipse3719"
r="7.0209999" />
</g>
<polyline
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
id="polyline3721" />
<g
id="g3723">
<circle
style="fill:#000000"
cx="73.5"
cy="125.854"
id="ellipse3725"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="73.5"
cy="125.854"
id="ellipse3727"
r="7.0209999" />
</g>
<g
id="g3729">
<circle
style="fill:#000000"
cx="136.5"
cy="172.375"
id="ellipse3731"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="136.5"
cy="172.375"
id="ellipse3733"
r="7.0209999" />
</g>
<g
id="g3735">
<circle
style="fill:#000000"
cx="60.700001"
cy="186.39999"
id="ellipse3737"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="60.700001"
cy="186.39999"
id="ellipse3739"
r="7.0209999" />
</g>
<g
id="g3741">
<circle
style="fill:#000000"
cx="154.5"
cy="154.354"
id="ellipse3743"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="154.5"
cy="154.354"
id="ellipse3745"
r="7.0209999" />
</g>
<g
id="g3747">
<circle
style="fill:#000000"
cx="96"
cy="151.875"
id="ellipse3749"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="96"
cy="151.875"
id="ellipse3751"
r="7.0209999" />
</g>
</g>
<text
transform="scale(0.9437456,1.0596076)"
id="text3921"
y="155.86783"
x="31.672857"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
y="155.86783"
x="31.672857"
id="tspan3923"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">GPX</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 304 KiB

View File

@ -1,145 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="185"
height="185"
id="svg3390"
version="1.1">
<metadata
id="metadata3404">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3402" />
<path
d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0"
id="path3392"
style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" />
<rect
style="fill:#ff3300;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3426"
width="120.3215"
height="49.84631"
x="16.573463"
y="124.9782" />
<g
transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)"
id="g3828">
<g
id="g3715">
<circle
r="7.0209999"
id="ellipse3717"
cy="90.875"
cx="113"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3719"
cy="90.875"
cx="113"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round" />
</g>
<polyline
id="polyline3721"
points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" />
<g
id="g3723">
<circle
r="7.0209999"
id="ellipse3725"
cy="125.854"
cx="73.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3727"
cy="125.854"
cx="73.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3729">
<circle
r="7.0209999"
id="ellipse3731"
cy="172.375"
cx="136.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3733"
cy="172.375"
cx="136.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3735">
<circle
r="7.0209999"
id="ellipse3737"
cy="186.39999"
cx="60.700001"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3739"
cy="186.39999"
cx="60.700001"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3741">
<circle
r="7.0209999"
id="ellipse3743"
cy="154.354"
cx="154.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3745"
cy="154.354"
cx="154.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3747">
<circle
r="7.0209999"
id="ellipse3749"
cy="151.875"
cx="96"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3751"
cy="151.875"
cx="96"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
</g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="40.149723"
y="155.86783"
id="text3921"
transform="scale(0.9437456,1.0596076)"><tspan
y="155.86783"
x="40.149723"
id="tspan3448">IGC</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 304 KiB

View File

@ -1,143 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="185"
height="185"
id="svg3390"
version="1.1">
<metadata
id="metadata3404">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3402" />
<path
d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0"
id="path3392"
style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" />
<rect
style="fill:#990000;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3426"
width="120.3215"
height="49.84631"
x="16.573463"
y="124.9782" />
<g
transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)"
id="g3828">
<g
id="g3715">
<circle
r="7.0209999"
id="ellipse3717"
cy="90.875"
cx="113"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3719"
cy="90.875"
cx="113"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round" />
</g>
<polyline
id="polyline3721"
points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" />
<g
id="g3723">
<circle
r="7.0209999"
id="ellipse3725"
cy="125.854"
cx="73.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3727"
cy="125.854"
cx="73.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3729">
<circle
r="7.0209999"
id="ellipse3731"
cy="172.375"
cx="136.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3733"
cy="172.375"
cx="136.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3735">
<circle
r="7.0209999"
id="ellipse3737"
cy="186.39999"
cx="60.700001"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3739"
cy="186.39999"
cx="60.700001"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3741">
<circle
r="7.0209999"
id="ellipse3743"
cy="154.354"
cx="154.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3745"
cy="154.354"
cx="154.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3747">
<circle
r="7.0209999"
id="ellipse3749"
cy="151.875"
cx="96"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3751"
cy="151.875"
cx="96"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
</g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
x="31.672857"
y="155.86783"
id="text3921"
transform="scale(0.9437456,1.0596076)"><tspan
id="tspan3429">KML</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 304 KiB

View File

@ -1,145 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="svg3390"
height="185"
width="185">
<metadata
id="metadata3404">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3402" />
<path
style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
id="path3392"
d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
<rect
y="124.9782"
x="16.573463"
height="49.84631"
width="131.6837"
id="rect3426"
style="fill:#0083d7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="g3828"
transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
<g
id="g3715">
<circle
style="fill:#000000"
cx="113"
cy="90.875"
id="ellipse3717"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
cx="113"
cy="90.875"
id="ellipse3719"
r="7.0209999" />
</g>
<polyline
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
id="polyline3721" />
<g
id="g3723">
<circle
style="fill:#000000"
cx="73.5"
cy="125.854"
id="ellipse3725"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="73.5"
cy="125.854"
id="ellipse3727"
r="7.0209999" />
</g>
<g
id="g3729">
<circle
style="fill:#000000"
cx="136.5"
cy="172.375"
id="ellipse3731"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="136.5"
cy="172.375"
id="ellipse3733"
r="7.0209999" />
</g>
<g
id="g3735">
<circle
style="fill:#000000"
cx="60.700001"
cy="186.39999"
id="ellipse3737"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="60.700001"
cy="186.39999"
id="ellipse3739"
r="7.0209999" />
</g>
<g
id="g3741">
<circle
style="fill:#000000"
cx="154.5"
cy="154.354"
id="ellipse3743"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="154.5"
cy="154.354"
id="ellipse3745"
r="7.0209999" />
</g>
<g
id="g3747">
<circle
style="fill:#000000"
cx="96"
cy="151.875"
id="ellipse3749"
r="7.0209999" />
<circle
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
cx="96"
cy="151.875"
id="ellipse3751"
r="7.0209999" />
</g>
</g>
<text
transform="scale(0.9437456,1.0596076)"
id="text3921"
y="155.86783"
x="21.076782"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
y="155.86783"
x="21.076782"
id="tspan3429">NMEA</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
icons/plt.icns Normal file

Binary file not shown.

BIN
icons/plt.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 KiB

BIN
icons/rte.icns Normal file

Binary file not shown.

BIN
icons/rte.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 KiB

28
icons/scripts/icns.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/bash
EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
for e in $EXTENSIONS; do
IFS=":"; set $e
EXT=`echo $1 | tr /a-z/ /A-Z/`
sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
ICONSET=$1.iconset
mkdir $ICONSET
convert -density 400 -background none -resize '16x16' "$1.svg" "$ICONSET/icon_16x16.png"
convert -density 400 -background none -resize '32x32' "$1.svg" "$ICONSET/icon_16x16@2x.png"
cp "$ICONSET/icon_16x16@2x.png" "$ICONSET/icon_32x32.png"
convert -density 400 -background none -resize '64x64' "$1.svg" "$ICONSET/icon_32x32@2x.png"
convert -density 400 -background none -resize '128x128' "$1.svg" "$ICONSET/icon_128x128.png"
convert -density 400 -background none -resize '256x256' "$1.svg" "$ICONSET/icon_128x128@2x.png"
cp "$ICONSET/icon_128x128@2x.png" "$ICONSET/icon_256x256.png"
convert -density 400 -background none -resize '512x512' "$1.svg" "$ICONSET/icon_256x256@2x.png"
cp "$ICONSET/icon_256x256@2x.png" "$ICONSET/icon_512x512.png"
convert -density 400 -background none -resize '1024x1024' "$1.svg" "$ICONSET/icon_512x512@2x.png"
iconutil -c icns -o $1.icns "$ICONSET"
rm -R "$ICONSET" $1.svg
done

13
icons/scripts/ico.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
for e in $EXTENSIONS; do
IFS=":"; set $e
EXT=`echo $1 | tr /a-z/ /A-Z/`
sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
convert -density 400 $1.svg -define icon:auto-resize $1.ico
rm $1.svg
done

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" height="185" width="185">
<path id="envelope" style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
<g id="logo" transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
<polyline style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "/>
<circle style="fill:#000000" cx="113" cy="90.875" r="8"/>
<circle style="fill:#000000" cx="73.5" cy="125.854" r="8"/>
<circle style="fill:#000000" cx="136.5" cy="172.375" r="8"/>
<circle style="fill:#000000" cx="60.700001" cy="186.39999" r="8"/>
<circle style="fill:#000000" cx="154.5" cy="154.354" r="8"/>
<circle style="fill:#000000" cx="96" cy="151.875" r="8"/>
</g>
<g transform="translate(16.573463,124.9782)">
<rect y="0" x="0" id="textrect" height="50" width="120" style="fill:$COLOR;fill-opacity:1;stroke:none;"/>
<text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:sans-serif;font-weight:bold;">$EXTENSION</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 304 KiB

View File

@ -1,145 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="185"
height="185"
id="svg3390"
version="1.1">
<metadata
id="metadata3404">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3402" />
<path
d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0"
id="path3392"
style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3426"
width="120.3215"
height="49.84631"
x="16.573463"
y="124.9782" />
<g
transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)"
id="g3828">
<g
id="g3715">
<circle
r="7.0209999"
id="ellipse3717"
cy="90.875"
cx="113"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3719"
cy="90.875"
cx="113"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round" />
</g>
<polyline
id="polyline3721"
points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" />
<g
id="g3723">
<circle
r="7.0209999"
id="ellipse3725"
cy="125.854"
cx="73.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3727"
cy="125.854"
cx="73.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3729">
<circle
r="7.0209999"
id="ellipse3731"
cy="172.375"
cx="136.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3733"
cy="172.375"
cx="136.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3735">
<circle
r="7.0209999"
id="ellipse3737"
cy="186.39999"
cx="60.700001"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3739"
cy="186.39999"
cx="60.700001"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3741">
<circle
r="7.0209999"
id="ellipse3743"
cy="154.354"
cx="154.5"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3745"
cy="154.354"
cx="154.5"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
<g
id="g3747">
<circle
r="7.0209999"
id="ellipse3749"
cy="151.875"
cx="96"
style="fill:#000000" />
<circle
r="7.0209999"
id="ellipse3751"
cy="151.875"
cx="96"
style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
</g>
</g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="35.911289"
y="155.86783"
id="text3921"
transform="scale(0.9437456,1.0596076)"><tspan
y="155.86783"
x="35.911289"
id="tspan3429">TCX</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
icons/wpt.icns Normal file

Binary file not shown.

BIN
icons/wpt.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 KiB

View File

@ -47,47 +47,52 @@
<context>
<name>Data</name>
<message>
<location filename="../src/data/data.cpp" line="103"/>
<location filename="../src/data/data.cpp" line="112"/>
<source>Supported files</source>
<translation>Podporované soubory</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>CSV files</source>
<translation>Soubory CSV</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>FIT files</source>
<translation>Soubory FIT</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>GPX files</source>
<translation>Soubory GPX</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>IGC files</source>
<translation>Soubory IGC</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>KML files</source>
<translation>Soubory KML</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>NMEA files</source>
<translation>Soubory NMEA</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="117"/>
<source>OziExplorer files</source>
<translation>Soubory OziExploreru</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="118"/>
<source>TCX files</source>
<translation>Soubory TCX</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="118"/>
<source>All files</source>
<translation>Všechny soubory</translation>
</message>
@ -301,376 +306,380 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/GUI/gui.cpp" line="588"/>
<location filename="../src/GUI/gui.cpp" line="592"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="662"/>
<location filename="../src/GUI/gui.cpp" line="666"/>
<source>Open file</source>
<translation>Otevřít soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="751"/>
<location filename="../src/GUI/gui.cpp" line="757"/>
<source>Open POI file</source>
<translation>Otevřít POI soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="195"/>
<location filename="../src/GUI/gui.cpp" line="199"/>
<source>Quit</source>
<translation>Ukončit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="204"/>
<location filename="../src/GUI/gui.cpp" line="605"/>
<location filename="../src/GUI/gui.cpp" line="606"/>
<location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="610"/>
<source>Keyboard controls</source>
<translation>Ovládací klávesy</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="229"/>
<location filename="../src/GUI/gui.cpp" line="233"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="235"/>
<location filename="../src/GUI/gui.cpp" line="239"/>
<source>Reload</source>
<translation>Znovu načíst</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="517"/>
<location filename="../src/GUI/gui.cpp" line="521"/>
<source>Show</source>
<translation>Zobrazit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="428"/>
<location filename="../src/GUI/gui.cpp" line="511"/>
<location filename="../src/GUI/gui.cpp" line="515"/>
<source>File</source>
<translation>Soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="246"/>
<location filename="../src/GUI/gui.cpp" line="250"/>
<source>Close POI files</source>
<translation>Zavřit POI soubory</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<location filename="../src/GUI/gui.cpp" line="252"/>
<source>Overlap POIs</source>
<translation>Překrývat POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="252"/>
<location filename="../src/GUI/gui.cpp" line="256"/>
<source>Show POI labels</source>
<translation>Zobrazit názvy POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="257"/>
<location filename="../src/GUI/gui.cpp" line="261"/>
<source>Show POIs</source>
<translation>Zobrazit POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="266"/>
<location filename="../src/GUI/gui.cpp" line="270"/>
<source>Show map</source>
<translation>Zobrazit mapu</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="276"/>
<location filename="../src/GUI/gui.cpp" line="280"/>
<source>Clear tile cache</source>
<translation>Vymazat mezipaměť dlaždic</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="213"/>
<location filename="../src/GUI/gui.cpp" line="217"/>
<source>Open...</source>
<translation>Otevřít...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="202"/>
<location filename="../src/GUI/gui.cpp" line="639"/>
<location filename="../src/GUI/gui.cpp" line="640"/>
<location filename="../src/GUI/gui.cpp" line="206"/>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="644"/>
<source>Paths</source>
<translation>Cesty</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="243"/>
<location filename="../src/GUI/gui.cpp" line="247"/>
<source>Load POI file...</source>
<translation>Nahrát POI soubor...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="274"/>
<location filename="../src/GUI/gui.cpp" line="278"/>
<source>Load map...</source>
<translation>Nahrát mapu...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="280"/>
<location filename="../src/GUI/gui.cpp" line="284"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<location filename="../src/GUI/gui.cpp" line="288"/>
<location filename="../src/GUI/gui.cpp" line="626"/>
<source>Next map</source>
<translation>Následující mapa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="294"/>
<location filename="../src/GUI/gui.cpp" line="298"/>
<source>Show tracks</source>
<translation>Zobrazit cesty</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="298"/>
<location filename="../src/GUI/gui.cpp" line="302"/>
<source>Show routes</source>
<translation>Zobrazit trasy</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="302"/>
<location filename="../src/GUI/gui.cpp" line="306"/>
<source>Show waypoints</source>
<translation>Zobrazit navigační body</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="306"/>
<location filename="../src/GUI/gui.cpp" line="310"/>
<source>Waypoint labels</source>
<translation>Názvy navigačních bodů</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="317"/>
<location filename="../src/GUI/gui.cpp" line="321"/>
<source>Show graphs</source>
<translation>Zobrazit grafy</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="337"/>
<location filename="../src/GUI/gui.cpp" line="341"/>
<source>Show grid</source>
<translation>Zobrazit mřížku</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="341"/>
<location filename="../src/GUI/gui.cpp" line="345"/>
<source>Show slider info</source>
<translation>Zobrazit informace o posuvníku</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="347"/>
<location filename="../src/GUI/gui.cpp" line="351"/>
<source>Show toolbars</source>
<translation>Zobrazovat nástrojové lišty</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="353"/>
<location filename="../src/GUI/gui.cpp" line="357"/>
<source>Total time</source>
<translation>Celkový čas</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="358"/>
<location filename="../src/GUI/gui.cpp" line="926"/>
<location filename="../src/GUI/gui.cpp" line="362"/>
<location filename="../src/GUI/gui.cpp" line="934"/>
<source>Moving time</source>
<translation>Čistý čas</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="365"/>
<location filename="../src/GUI/gui.cpp" line="369"/>
<source>Metric</source>
<translation>Metrické</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="370"/>
<location filename="../src/GUI/gui.cpp" line="374"/>
<source>Imperial</source>
<translation>Imperiální</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="375"/>
<location filename="../src/GUI/gui.cpp" line="379"/>
<source>Nautical</source>
<translation>Námořní</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="382"/>
<location filename="../src/GUI/gui.cpp" line="386"/>
<source>Decimal degrees (DD)</source>
<translation>Desetinné stupně (DD)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="387"/>
<location filename="../src/GUI/gui.cpp" line="391"/>
<source>Degrees and decimal minutes (DMM)</source>
<translation>Stupně a desetinné minuty (DMM)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="393"/>
<location filename="../src/GUI/gui.cpp" line="397"/>
<source>Degrees, minutes, seconds (DMS)</source>
<translation>Stupně, minuty, vteřiny (DMS)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="398"/>
<location filename="../src/GUI/gui.cpp" line="402"/>
<source>Fullscreen mode</source>
<translation>Celoobrazovkový režim</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="404"/>
<location filename="../src/GUI/gui.cpp" line="408"/>
<source>Options...</source>
<translation>Nastavení...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="410"/>
<location filename="../src/GUI/gui.cpp" line="414"/>
<source>Next</source>
<translation>Následující</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="413"/>
<location filename="../src/GUI/gui.cpp" line="417"/>
<source>Previous</source>
<translation>Předchozí</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="417"/>
<location filename="../src/GUI/gui.cpp" line="421"/>
<source>Last</source>
<translation>Poslední</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="420"/>
<location filename="../src/GUI/gui.cpp" line="424"/>
<source>First</source>
<translation>První</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="442"/>
<source>Map</source>
<translation>Mapa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="450"/>
<source>Graph</source>
<translation>Graf</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="460"/>
<location filename="../src/GUI/gui.cpp" line="464"/>
<source>POI files</source>
<translation>POI soubory</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="471"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="472"/>
<location filename="../src/GUI/gui.cpp" line="476"/>
<source>Display</source>
<translation>Zobrazit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="480"/>
<source>Settings</source>
<translation>Nastavení</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<location filename="../src/GUI/gui.cpp" line="488"/>
<source>Units</source>
<translation>Jednotky</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="488"/>
<location filename="../src/GUI/gui.cpp" line="492"/>
<source>Coordinates format</source>
<translation>Formát souřadnic</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="498"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="615"/>
<location filename="../src/GUI/gui.cpp" line="619"/>
<source>Append file</source>
<translation>Přidat soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<location filename="../src/GUI/gui.cpp" line="620"/>
<source>Next/Previous</source>
<translation>Následující/Předchozí</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="618"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<source>Toggle graph type</source>
<translation>Přepnout typ grafu</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="620"/>
<location filename="../src/GUI/gui.cpp" line="624"/>
<source>Toggle time type</source>
<translation>Přepnout typ času</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="624"/>
<location filename="../src/GUI/gui.cpp" line="628"/>
<source>Previous map</source>
<translation>Předchozí mapa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="625"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Zoom in</source>
<translation>Přiblížit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="627"/>
<location filename="../src/GUI/gui.cpp" line="631"/>
<source>Zoom out</source>
<translation>Oddálit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="629"/>
<location filename="../src/GUI/gui.cpp" line="633"/>
<source>Digital zoom</source>
<translation>Digitální zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="630"/>
<location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1127"/>
<location filename="../src/GUI/gui.cpp" line="1135"/>
<source>Open map file</source>
<translation>Otevřít mapový soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1165"/>
<location filename="../src/GUI/gui.cpp" line="1175"/>
<source>No files loaded</source>
<translation>Nejsou načteny žádné soubory</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="912"/>
<location filename="../src/GUI/gui.cpp" line="915"/>
<location filename="../src/GUI/gui.cpp" line="920"/>
<location filename="../src/GUI/gui.cpp" line="923"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="432"/>
<source>&amp;File</source>
<translation>&amp;Soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="446"/>
<source>&amp;Map</source>
<translation>&amp;Mapa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="454"/>
<source>&amp;Graph</source>
<translation>&amp;Graf</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="463"/>
<source>&amp;POI</source>
<translation>&amp;POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="475"/>
<source>&amp;Data</source>
<translation>&amp;Data</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<source>&amp;Settings</source>
<translation>&amp;Nastavení</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="502"/>
<source>&amp;Help</source>
<translation>N&amp;ápověda</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<source>Map directory:</source>
<translation>Adresář s mapami:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="645"/>
<location filename="../src/GUI/gui.cpp" line="649"/>
<source>POI directory:</source>
<translation>Adresář s POI body:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<location filename="../src/GUI/gui.cpp" line="651"/>
<source>GCS file:</source>
<translation>Soubor s GCS daty:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="648"/>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>PCS file:</source>
<translation>Soubor s PCS daty:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="654"/>
<source>Ellipsoids file:</source>
<translation>Soubor s daty elipsoidů:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="653"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>User override directory:</source>
<translation>Uživatelský adresář:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="904"/>
<location filename="../src/GUI/gui.cpp" line="912"/>
<source>Routes</source>
<translation>Trasy</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1154"/>
<location filename="../src/GUI/gui.cpp" line="1164"/>
<source>Error loading map:</source>
<translation>Mapu nelze načíst:</translation>
</message>
<message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1169"/>
<location filename="../src/GUI/gui.cpp" line="1179"/>
<source>%n files</source>
<translation>
<numerusform>%n soubor</numerusform>
@ -679,97 +688,97 @@
</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="613"/>
<source>Next file</source>
<translation>Následující soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="585"/>
<location filename="../src/GUI/gui.cpp" line="589"/>
<source>Version </source>
<translation>Verze </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="218"/>
<location filename="../src/GUI/gui.cpp" line="222"/>
<source>Print...</source>
<translation>Tisknout...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="223"/>
<location filename="../src/GUI/gui.cpp" line="227"/>
<source>Export to PDF...</source>
<translation>Exportovat do PDF...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="906"/>
<location filename="../src/GUI/gui.cpp" line="914"/>
<source>Waypoints</source>
<translation>Navigační body</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="610"/>
<location filename="../src/GUI/gui.cpp" line="614"/>
<source>Previous file</source>
<translation>Předchozí soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="310"/>
<location filename="../src/GUI/gui.cpp" line="314"/>
<source>Route waypoints</source>
<translation>Body tras</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="616"/>
<source>First file</source>
<translation>První soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="614"/>
<location filename="../src/GUI/gui.cpp" line="618"/>
<source>Last file</source>
<translation>Poslední soubor</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="740"/>
<location filename="../src/GUI/gui.cpp" line="746"/>
<source>Error loading data file:</source>
<translation>Datový soubor nelze načíst:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="743"/>
<location filename="../src/GUI/gui.cpp" line="768"/>
<location filename="../src/GUI/gui.cpp" line="749"/>
<location filename="../src/GUI/gui.cpp" line="776"/>
<source>Line: %1</source>
<translation>Řádka: %1</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="765"/>
<location filename="../src/GUI/gui.cpp" line="773"/>
<source>Error loading POI file:</source>
<translation>Soubor POI nelze načíst:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="898"/>
<location filename="../src/GUI/gui.cpp" line="906"/>
<source>Name</source>
<translation>Název</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="902"/>
<location filename="../src/GUI/gui.cpp" line="910"/>
<source>Tracks</source>
<translation>Cesty</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="207"/>
<location filename="../src/GUI/gui.cpp" line="584"/>
<location filename="../src/GUI/gui.cpp" line="211"/>
<location filename="../src/GUI/gui.cpp" line="588"/>
<source>About GPXSee</source>
<translation>O aplikaci GPXSee</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="522"/>
<location filename="../src/GUI/gui.cpp" line="526"/>
<source>Navigation</source>
<translation>Navigace</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="325"/>
<location filename="../src/GUI/gui.cpp" line="922"/>
<location filename="../src/GUI/gui.cpp" line="329"/>
<location filename="../src/GUI/gui.cpp" line="930"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="331"/>
<location filename="../src/GUI/gui.cpp" line="481"/>
<location filename="../src/GUI/gui.cpp" line="924"/>
<location filename="../src/GUI/gui.cpp" line="335"/>
<location filename="../src/GUI/gui.cpp" line="485"/>
<location filename="../src/GUI/gui.cpp" line="932"/>
<source>Time</source>
<translation>Čas</translation>
</message>
@ -875,27 +884,27 @@
<context>
<name>MapList</name>
<message>
<location filename="../src/map/maplist.cpp" line="131"/>
<location filename="../src/map/maplist.cpp" line="130"/>
<source>Supported files</source>
<translation>Podporované soubory</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="132"/>
<location filename="../src/map/maplist.cpp" line="131"/>
<source>OziExplorer maps</source>
<translation>OziExplorer mapy</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="133"/>
<location filename="../src/map/maplist.cpp" line="132"/>
<source>TrekBuddy maps/atlases</source>
<translation>TrekBuddy mapy/atlasy</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="134"/>
<location filename="../src/map/maplist.cpp" line="133"/>
<source>GeoTIFF images</source>
<translation>GeoTIFF obrázky</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="135"/>
<location filename="../src/map/maplist.cpp" line="134"/>
<source>Online map sources</source>
<translation>Online mapové zdroje</translation>
</message>
@ -1380,33 +1389,53 @@
<context>
<name>SpeedGraph</name>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="14"/>
<location filename="../src/GUI/speedgraph.cpp" line="16"/>
<location filename="../src/GUI/speedgraph.h" line="14"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="89"/>
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="22"/>
<location filename="../src/GUI/speedgraph.cpp" line="28"/>
<source>Average</source>
<translation>Průměr</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="24"/>
<location filename="../src/GUI/speedgraph.cpp" line="25"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/nmi</source>
<translation>min/nmi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="30"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="83"/>
<location filename="../src/GUI/speedgraph.cpp" line="32"/>
<source>Pace</source>
<translation>Tempo</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
<source>kn</source>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="86"/>
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
@ -1414,30 +1443,50 @@
<context>
<name>SpeedGraphItem</name>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="21"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>kn</source>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="24"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/nmi</source>
<translation>min/nmi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="29"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="31"/>
<source>Average</source>
<translation>Průměr</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="33"/>
<source>Pace</source>
<translation>Tempo</translation>
</message>
</context>
<context>
<name>TemperatureGraph</name>

View File

@ -47,47 +47,52 @@
<context>
<name>Data</name>
<message>
<location filename="../src/data/data.cpp" line="103"/>
<location filename="../src/data/data.cpp" line="112"/>
<source>Supported files</source>
<translation>Unterstütze Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>CSV files</source>
<translation>CSV-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>FIT files</source>
<translation>FIT-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>GPX files</source>
<translation>GPX-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>IGC files</source>
<translation>IGC-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>KML files</source>
<translation>KML-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>NMEA files</source>
<translation>NMEA-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="117"/>
<source>OziExplorer files</source>
<translation>OziExplorer-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="118"/>
<source>TCX files</source>
<translation>TCX-Dateien</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="118"/>
<source>All files</source>
<translation>Alle Dateien</translation>
</message>
@ -284,7 +289,7 @@
<message>
<location filename="../src/GUI/format.cpp" line="62"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/format.cpp" line="66"/>
@ -301,365 +306,334 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/GUI/gui.cpp" line="588"/>
<location filename="../src/GUI/gui.cpp" line="592"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee wird unter der GNU General Public License version 3 vertrieben. Mehr Informationen zu GPXSee auf der Homepage </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="647"/>
<source>Map directory:</source>
<translation>Kartenverzeichnis:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="645"/>
<location filename="../src/GUI/gui.cpp" line="649"/>
<source>POI directory:</source>
<translation>POI-Verzeichnis:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<location filename="../src/GUI/gui.cpp" line="651"/>
<source>GCS file:</source>
<translation>GCS-Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="648"/>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>PCS file:</source>
<translation>PCS-Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="654"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoidendatei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="653"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>User override directory:</source>
<translation>Benutzerverzeichnis:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="662"/>
<location filename="../src/GUI/gui.cpp" line="666"/>
<source>Open file</source>
<translation>Datei öffnen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="751"/>
<location filename="../src/GUI/gui.cpp" line="757"/>
<source>Open POI file</source>
<translation>POI Datei öffnen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="195"/>
<location filename="../src/GUI/gui.cpp" line="199"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="204"/>
<location filename="../src/GUI/gui.cpp" line="605"/>
<location filename="../src/GUI/gui.cpp" line="606"/>
<location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="610"/>
<source>Keyboard controls</source>
<translation>Tastaturkürzel</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="229"/>
<location filename="../src/GUI/gui.cpp" line="233"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="235"/>
<location filename="../src/GUI/gui.cpp" line="239"/>
<source>Reload</source>
<translation>Neu Laden</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="517"/>
<location filename="../src/GUI/gui.cpp" line="521"/>
<source>Show</source>
<translation>Ansicht</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="428"/>
<location filename="../src/GUI/gui.cpp" line="511"/>
<location filename="../src/GUI/gui.cpp" line="515"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="246"/>
<location filename="../src/GUI/gui.cpp" line="250"/>
<source>Close POI files</source>
<translation>POI-Datei schließen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<location filename="../src/GUI/gui.cpp" line="252"/>
<source>Overlap POIs</source>
<translation>POI überlappen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="252"/>
<location filename="../src/GUI/gui.cpp" line="256"/>
<source>Show POI labels</source>
<translation>POI-Labels anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="257"/>
<location filename="../src/GUI/gui.cpp" line="261"/>
<source>Show POIs</source>
<translation>POIs anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="266"/>
<location filename="../src/GUI/gui.cpp" line="270"/>
<source>Show map</source>
<translation>Karte anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="276"/>
<location filename="../src/GUI/gui.cpp" line="280"/>
<source>Clear tile cache</source>
<translation>Tile-Cache bereinigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="213"/>
<location filename="../src/GUI/gui.cpp" line="217"/>
<source>Open...</source>
<translation>Öffnen...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="202"/>
<location filename="../src/GUI/gui.cpp" line="639"/>
<location filename="../src/GUI/gui.cpp" line="640"/>
<location filename="../src/GUI/gui.cpp" line="206"/>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="644"/>
<source>Paths</source>
<translation>Pfade</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="243"/>
<location filename="../src/GUI/gui.cpp" line="247"/>
<source>Load POI file...</source>
<translation>POI-Datei laden...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="274"/>
<location filename="../src/GUI/gui.cpp" line="278"/>
<source>Load map...</source>
<translation>Karte laden...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="280"/>
<location filename="../src/GUI/gui.cpp" line="284"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<location filename="../src/GUI/gui.cpp" line="288"/>
<location filename="../src/GUI/gui.cpp" line="626"/>
<source>Next map</source>
<translation>Nächste Karte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="294"/>
<location filename="../src/GUI/gui.cpp" line="298"/>
<source>Show tracks</source>
<translation>Strecken anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="298"/>
<location filename="../src/GUI/gui.cpp" line="302"/>
<source>Show routes</source>
<translation>Routen anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="302"/>
<location filename="../src/GUI/gui.cpp" line="306"/>
<source>Show waypoints</source>
<translation>Wegpunkte anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="306"/>
<location filename="../src/GUI/gui.cpp" line="310"/>
<source>Waypoint labels</source>
<translation>Wegpunkt Labels</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="317"/>
<location filename="../src/GUI/gui.cpp" line="321"/>
<source>Show graphs</source>
<translation>Graphen anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="337"/>
<location filename="../src/GUI/gui.cpp" line="341"/>
<source>Show grid</source>
<translation>Gitter anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="341"/>
<location filename="../src/GUI/gui.cpp" line="345"/>
<source>Show slider info</source>
<translation>Schieberinfo anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="347"/>
<location filename="../src/GUI/gui.cpp" line="351"/>
<source>Show toolbars</source>
<translation>Toolbars anzeigen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="353"/>
<location filename="../src/GUI/gui.cpp" line="357"/>
<source>Total time</source>
<translation>Gesamtzeit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="358"/>
<location filename="../src/GUI/gui.cpp" line="926"/>
<location filename="../src/GUI/gui.cpp" line="362"/>
<location filename="../src/GUI/gui.cpp" line="934"/>
<source>Moving time</source>
<translation>Bewegungszeit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="365"/>
<location filename="../src/GUI/gui.cpp" line="369"/>
<source>Metric</source>
<translation>Metrisch</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="370"/>
<location filename="../src/GUI/gui.cpp" line="374"/>
<source>Imperial</source>
<translation>Imperial</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="375"/>
<location filename="../src/GUI/gui.cpp" line="379"/>
<source>Nautical</source>
<translation type="unfinished"></translation>
<translation>Nautisch</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="382"/>
<location filename="../src/GUI/gui.cpp" line="386"/>
<source>Decimal degrees (DD)</source>
<translation type="unfinished"></translation>
<translation>Dezimalgrad (DD)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="387"/>
<location filename="../src/GUI/gui.cpp" line="391"/>
<source>Degrees and decimal minutes (DMM)</source>
<translation type="unfinished"></translation>
<translation>Grad und Dezimalminuten (DMM)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="393"/>
<location filename="../src/GUI/gui.cpp" line="397"/>
<source>Degrees, minutes, seconds (DMS)</source>
<translation type="unfinished"></translation>
<translation>Grad, Minuten, Sekunden (DMS)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="398"/>
<location filename="../src/GUI/gui.cpp" line="402"/>
<source>Fullscreen mode</source>
<translation>Vollbildmodus</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="404"/>
<location filename="../src/GUI/gui.cpp" line="408"/>
<source>Options...</source>
<translation>Einstellungen...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="410"/>
<location filename="../src/GUI/gui.cpp" line="414"/>
<source>Next</source>
<translation>Nächste</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="413"/>
<location filename="../src/GUI/gui.cpp" line="417"/>
<source>Previous</source>
<translation>Vorherige</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="417"/>
<location filename="../src/GUI/gui.cpp" line="421"/>
<source>Last</source>
<translation>Letzte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="420"/>
<location filename="../src/GUI/gui.cpp" line="424"/>
<source>First</source>
<translation>Erste</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="442"/>
<source>Map</source>
<translation>Karte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="450"/>
<source>Graph</source>
<translation>Graph</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="460"/>
<location filename="../src/GUI/gui.cpp" line="464"/>
<source>POI files</source>
<translation>POI-Dateien</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="471"/>
<source>Data</source>
<translation>Daten</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="472"/>
<location filename="../src/GUI/gui.cpp" line="476"/>
<source>Display</source>
<translation>Anzeige</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="480"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<location filename="../src/GUI/gui.cpp" line="488"/>
<source>Units</source>
<translation>Einheiten</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="488"/>
<location filename="../src/GUI/gui.cpp" line="492"/>
<source>Coordinates format</source>
<translation type="unfinished"></translation>
<translation>Koordinatenformate</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="498"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="615"/>
<location filename="../src/GUI/gui.cpp" line="619"/>
<source>Append file</source>
<translation>An Datei anhängen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<location filename="../src/GUI/gui.cpp" line="620"/>
<source>Next/Previous</source>
<translation>Nächste/Vorherige</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="618"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<source>Toggle graph type</source>
<translation>Graphtyp umschalten</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="620"/>
<location filename="../src/GUI/gui.cpp" line="624"/>
<source>Toggle time type</source>
<translation>Zeittyp umschalten</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="624"/>
<location filename="../src/GUI/gui.cpp" line="628"/>
<source>Previous map</source>
<translation>Vorherige Karte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="625"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Zoom in</source>
<translation>Hineinzoomen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="627"/>
<location filename="../src/GUI/gui.cpp" line="631"/>
<source>Zoom out</source>
<translation>Herauszoomen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="629"/>
<location filename="../src/GUI/gui.cpp" line="633"/>
<source>Digital zoom</source>
<translation>Digitaler Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="630"/>
<location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1127"/>
<location filename="../src/GUI/gui.cpp" line="1135"/>
<source>Open map file</source>
<translation>Karte Datei öffnen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1154"/>
<location filename="../src/GUI/gui.cpp" line="1164"/>
<source>Error loading map:</source>
<translation>Fehler beim Laden der Karte-Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1165"/>
<location filename="../src/GUI/gui.cpp" line="1175"/>
<source>No files loaded</source>
<translation>Keine Dateien geladen</translation>
</message>
<message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1169"/>
<location filename="../src/GUI/gui.cpp" line="1179"/>
<source>%n files</source>
<translation>
<numerusform>%n Datei</numerusform>
@ -667,108 +641,143 @@
</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="912"/>
<location filename="../src/GUI/gui.cpp" line="915"/>
<location filename="../src/GUI/gui.cpp" line="920"/>
<location filename="../src/GUI/gui.cpp" line="923"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="904"/>
<location filename="../src/GUI/gui.cpp" line="912"/>
<source>Routes</source>
<translation>Routen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="613"/>
<source>Next file</source>
<translation>Nächste Datei</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="585"/>
<location filename="../src/GUI/gui.cpp" line="589"/>
<source>Version </source>
<translation>Version </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="218"/>
<location filename="../src/GUI/gui.cpp" line="222"/>
<source>Print...</source>
<translation>Drucken...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="223"/>
<location filename="../src/GUI/gui.cpp" line="227"/>
<source>Export to PDF...</source>
<translation>Als PDF exportieren...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="906"/>
<location filename="../src/GUI/gui.cpp" line="914"/>
<source>Waypoints</source>
<translation>Wegpunkte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="610"/>
<location filename="../src/GUI/gui.cpp" line="614"/>
<source>Previous file</source>
<translation>Vorherige Datei</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="310"/>
<location filename="../src/GUI/gui.cpp" line="314"/>
<source>Route waypoints</source>
<translation>Routen Wegpunkte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="432"/>
<source>&amp;File</source>
<translation>&amp;Datei</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="446"/>
<source>&amp;Map</source>
<translation>&amp;Map</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="454"/>
<source>&amp;Graph</source>
<translation>&amp;Graph</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="463"/>
<source>&amp;POI</source>
<translation>&amp;POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="475"/>
<source>&amp;Data</source>
<translation>D&amp;ata</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<source>&amp;Settings</source>
<translation>&amp;Einstellungen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="502"/>
<source>&amp;Help</source>
<translation>&amp;Hilfe</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<source>First file</source>
<translation>Erste Datei</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="614"/>
<location filename="../src/GUI/gui.cpp" line="618"/>
<source>Last file</source>
<translation>Letzte Datei</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="740"/>
<location filename="../src/GUI/gui.cpp" line="746"/>
<source>Error loading data file:</source>
<translation>Fehler beim Laden der Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="743"/>
<location filename="../src/GUI/gui.cpp" line="768"/>
<location filename="../src/GUI/gui.cpp" line="749"/>
<location filename="../src/GUI/gui.cpp" line="776"/>
<source>Line: %1</source>
<translation>Linie: %1</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="765"/>
<location filename="../src/GUI/gui.cpp" line="773"/>
<source>Error loading POI file:</source>
<translation>Fehler beim Laden der POI-Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="898"/>
<location filename="../src/GUI/gui.cpp" line="906"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="902"/>
<location filename="../src/GUI/gui.cpp" line="910"/>
<source>Tracks</source>
<translation>Strecken</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="207"/>
<location filename="../src/GUI/gui.cpp" line="584"/>
<location filename="../src/GUI/gui.cpp" line="211"/>
<location filename="../src/GUI/gui.cpp" line="588"/>
<source>About GPXSee</source>
<translation>Über GPXSee</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="522"/>
<location filename="../src/GUI/gui.cpp" line="526"/>
<source>Navigation</source>
<translation>Navigation</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="325"/>
<location filename="../src/GUI/gui.cpp" line="922"/>
<location filename="../src/GUI/gui.cpp" line="329"/>
<location filename="../src/GUI/gui.cpp" line="930"/>
<source>Distance</source>
<translation>Distanz</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="331"/>
<location filename="../src/GUI/gui.cpp" line="481"/>
<location filename="../src/GUI/gui.cpp" line="924"/>
<location filename="../src/GUI/gui.cpp" line="335"/>
<location filename="../src/GUI/gui.cpp" line="485"/>
<location filename="../src/GUI/gui.cpp" line="932"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
@ -799,7 +808,7 @@
<message>
<location filename="../src/GUI/graphview.cpp" line="120"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/graphview.cpp" line="134"/>
@ -874,27 +883,27 @@
<context>
<name>MapList</name>
<message>
<location filename="../src/map/maplist.cpp" line="131"/>
<location filename="../src/map/maplist.cpp" line="130"/>
<source>Supported files</source>
<translation>Unterstütze Dateien</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="132"/>
<location filename="../src/map/maplist.cpp" line="131"/>
<source>OziExplorer maps</source>
<translation>OziExplorer Karten</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="133"/>
<location filename="../src/map/maplist.cpp" line="132"/>
<source>TrekBuddy maps/atlases</source>
<translation>TrekBuddy Karten/Atlanten</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="134"/>
<location filename="../src/map/maplist.cpp" line="133"/>
<source>GeoTIFF images</source>
<translation>GeoTIFF Bilder</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="135"/>
<location filename="../src/map/maplist.cpp" line="134"/>
<source>Online map sources</source>
<translation>Online-Kartenquellen</translation>
</message>
@ -1121,7 +1130,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="296"/>
<source>kn</source>
<translation type="unfinished"></translation>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="299"/>
@ -1161,7 +1170,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="331"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="334"/>
@ -1363,7 +1372,7 @@
<message>
<location filename="../src/GUI/scaleitem.cpp" line="86"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/scaleitem.cpp" line="89"/>
@ -1379,33 +1388,53 @@
<context>
<name>SpeedGraph</name>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="14"/>
<location filename="../src/GUI/speedgraph.cpp" line="16"/>
<location filename="../src/GUI/speedgraph.h" line="14"/>
<source>Speed</source>
<translation>Geschwindigkeit</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="89"/>
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="22"/>
<location filename="../src/GUI/speedgraph.cpp" line="28"/>
<source>Average</source>
<translation>Durchschnitt</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="24"/>
<location filename="../src/GUI/speedgraph.cpp" line="25"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/nmi</source>
<translation>min/nmi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="30"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="83"/>
<source>kn</source>
<translation type="unfinished"></translation>
<location filename="../src/GUI/speedgraph.cpp" line="32"/>
<source>Pace</source>
<translation>Tempo</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="86"/>
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
<source>kn</source>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
@ -1413,30 +1442,50 @@
<context>
<name>SpeedGraphItem</name>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="21"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>kn</source>
<translation type="unfinished"></translation>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="24"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/nmi</source>
<translation>min/nmi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="29"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="31"/>
<source>Average</source>
<translation>Durchschnitt</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="33"/>
<source>Pace</source>
<translation>Tempo</translation>
</message>
</context>
<context>
<name>TemperatureGraph</name>

View File

@ -47,47 +47,52 @@
<context>
<name>Data</name>
<message>
<location filename="../src/data/data.cpp" line="103"/>
<location filename="../src/data/data.cpp" line="112"/>
<source>Supported files</source>
<translation>Tuetut tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>CSV files</source>
<translation>CSV-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>FIT files</source>
<translation>FIT-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>GPX files</source>
<translation>GPX-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>IGC files</source>
<translation>IGC-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>KML files</source>
<translation>KML-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>NMEA files</source>
<translation>NMEA-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="117"/>
<source>OziExplorer files</source>
<translation>OziExplorer-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="118"/>
<source>TCX files</source>
<translation>TCX-tiedostot</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="118"/>
<source>All files</source>
<translation>Kaikki tiedostot</translation>
</message>
@ -301,376 +306,380 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/GUI/gui.cpp" line="588"/>
<location filename="../src/GUI/gui.cpp" line="592"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="662"/>
<location filename="../src/GUI/gui.cpp" line="666"/>
<source>Open file</source>
<translation>Avaa tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="751"/>
<location filename="../src/GUI/gui.cpp" line="757"/>
<source>Open POI file</source>
<translation>Avaa POI-tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="195"/>
<location filename="../src/GUI/gui.cpp" line="199"/>
<source>Quit</source>
<translation>Lopeta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="204"/>
<location filename="../src/GUI/gui.cpp" line="605"/>
<location filename="../src/GUI/gui.cpp" line="606"/>
<location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="610"/>
<source>Keyboard controls</source>
<translation>Näppäimistön säätimet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="229"/>
<location filename="../src/GUI/gui.cpp" line="233"/>
<source>Close</source>
<translation>Sulje</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="235"/>
<location filename="../src/GUI/gui.cpp" line="239"/>
<source>Reload</source>
<translation>Lataa uudelleen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="517"/>
<location filename="../src/GUI/gui.cpp" line="521"/>
<source>Show</source>
<translation>Näytä</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="428"/>
<location filename="../src/GUI/gui.cpp" line="511"/>
<location filename="../src/GUI/gui.cpp" line="515"/>
<source>File</source>
<translation>Tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="246"/>
<location filename="../src/GUI/gui.cpp" line="250"/>
<source>Close POI files</source>
<translation>Sulje POI-tiedostot</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<location filename="../src/GUI/gui.cpp" line="252"/>
<source>Overlap POIs</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="252"/>
<location filename="../src/GUI/gui.cpp" line="256"/>
<source>Show POI labels</source>
<translation>Näytä POI:n nimiöt</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="257"/>
<location filename="../src/GUI/gui.cpp" line="261"/>
<source>Show POIs</source>
<translation>Näytä POI:t</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="266"/>
<location filename="../src/GUI/gui.cpp" line="270"/>
<source>Show map</source>
<translation>Näytä kartta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="276"/>
<location filename="../src/GUI/gui.cpp" line="280"/>
<source>Clear tile cache</source>
<translation>Tyhjennä välimuisti</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="213"/>
<location filename="../src/GUI/gui.cpp" line="217"/>
<source>Open...</source>
<translation>Avaa...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="202"/>
<location filename="../src/GUI/gui.cpp" line="639"/>
<location filename="../src/GUI/gui.cpp" line="640"/>
<location filename="../src/GUI/gui.cpp" line="206"/>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="644"/>
<source>Paths</source>
<translation>Tiedostopolut</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="243"/>
<location filename="../src/GUI/gui.cpp" line="247"/>
<source>Load POI file...</source>
<translation>Lataa POI-tiedosto...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="274"/>
<location filename="../src/GUI/gui.cpp" line="278"/>
<source>Load map...</source>
<translation>Lataa kartta...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="280"/>
<location filename="../src/GUI/gui.cpp" line="284"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<location filename="../src/GUI/gui.cpp" line="288"/>
<location filename="../src/GUI/gui.cpp" line="626"/>
<source>Next map</source>
<translation>Seuraava kartta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="294"/>
<location filename="../src/GUI/gui.cpp" line="298"/>
<source>Show tracks</source>
<translation>Näytä jäljet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="298"/>
<location filename="../src/GUI/gui.cpp" line="302"/>
<source>Show routes</source>
<translation>Näytä reitit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="302"/>
<location filename="../src/GUI/gui.cpp" line="306"/>
<source>Show waypoints</source>
<translation>Näytä reittipisteet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="306"/>
<location filename="../src/GUI/gui.cpp" line="310"/>
<source>Waypoint labels</source>
<translation>Reittipisteen nimiöt</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="317"/>
<location filename="../src/GUI/gui.cpp" line="321"/>
<source>Show graphs</source>
<translation>Näytä kaaviokuvat</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="337"/>
<location filename="../src/GUI/gui.cpp" line="341"/>
<source>Show grid</source>
<translation>Näytä ruudukko</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="341"/>
<location filename="../src/GUI/gui.cpp" line="345"/>
<source>Show slider info</source>
<translation>Näytä liukusäätimen arvo</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="347"/>
<location filename="../src/GUI/gui.cpp" line="351"/>
<source>Show toolbars</source>
<translation>Näytä työkalupalkit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="353"/>
<location filename="../src/GUI/gui.cpp" line="357"/>
<source>Total time</source>
<translation>Kokonaisaika</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="358"/>
<location filename="../src/GUI/gui.cpp" line="926"/>
<location filename="../src/GUI/gui.cpp" line="362"/>
<location filename="../src/GUI/gui.cpp" line="934"/>
<source>Moving time</source>
<translation>Liikkumisaika</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="365"/>
<location filename="../src/GUI/gui.cpp" line="369"/>
<source>Metric</source>
<translation>Metriset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="370"/>
<location filename="../src/GUI/gui.cpp" line="374"/>
<source>Imperial</source>
<translation>Brittiläiset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="375"/>
<location filename="../src/GUI/gui.cpp" line="379"/>
<source>Nautical</source>
<translation>Merelliset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="382"/>
<location filename="../src/GUI/gui.cpp" line="386"/>
<source>Decimal degrees (DD)</source>
<translation>Desimaaliasteet (DD)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="387"/>
<location filename="../src/GUI/gui.cpp" line="391"/>
<source>Degrees and decimal minutes (DMM)</source>
<translation>Asteet, desimaaliminuutit (DMM)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="393"/>
<location filename="../src/GUI/gui.cpp" line="397"/>
<source>Degrees, minutes, seconds (DMS)</source>
<translation>Asteet, minuutit, sekunnit (DMS)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="398"/>
<location filename="../src/GUI/gui.cpp" line="402"/>
<source>Fullscreen mode</source>
<translation>Kokoruututila</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="404"/>
<location filename="../src/GUI/gui.cpp" line="408"/>
<source>Options...</source>
<translation>Valinnat...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="410"/>
<location filename="../src/GUI/gui.cpp" line="414"/>
<source>Next</source>
<translation>Seuraava</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="413"/>
<location filename="../src/GUI/gui.cpp" line="417"/>
<source>Previous</source>
<translation>Edellinen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="417"/>
<location filename="../src/GUI/gui.cpp" line="421"/>
<source>Last</source>
<translation>Viimeinen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="420"/>
<location filename="../src/GUI/gui.cpp" line="424"/>
<source>First</source>
<translation>Ensimmäinen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="442"/>
<source>Map</source>
<translation>Kartat</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="450"/>
<source>Graph</source>
<translation>Kaaviokuva</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="460"/>
<location filename="../src/GUI/gui.cpp" line="464"/>
<source>POI files</source>
<translation>POI-tiedostot</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="471"/>
<source>Data</source>
<translation>Tiedot</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="472"/>
<location filename="../src/GUI/gui.cpp" line="476"/>
<source>Display</source>
<translation>Näytä</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="480"/>
<source>Settings</source>
<translation>Asetukset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<location filename="../src/GUI/gui.cpp" line="488"/>
<source>Units</source>
<translation>Yksiköt</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="488"/>
<location filename="../src/GUI/gui.cpp" line="492"/>
<source>Coordinates format</source>
<translation>Koordinaattien muoto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="498"/>
<source>Help</source>
<translation>Ohje</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="615"/>
<location filename="../src/GUI/gui.cpp" line="619"/>
<source>Append file</source>
<translation>Lisää tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<location filename="../src/GUI/gui.cpp" line="620"/>
<source>Next/Previous</source>
<translation>Next/Previous</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="618"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<source>Toggle graph type</source>
<translation>Vaihda kaaviokuvan tyyppi</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="620"/>
<location filename="../src/GUI/gui.cpp" line="624"/>
<source>Toggle time type</source>
<translation>Vaihda ajan tyyppi</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="624"/>
<location filename="../src/GUI/gui.cpp" line="628"/>
<source>Previous map</source>
<translation>Edellinen kartta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="625"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Zoom in</source>
<translation>Lähennä</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="627"/>
<location filename="../src/GUI/gui.cpp" line="631"/>
<source>Zoom out</source>
<translation>Loitonna</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="629"/>
<location filename="../src/GUI/gui.cpp" line="633"/>
<source>Digital zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="630"/>
<location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1127"/>
<location filename="../src/GUI/gui.cpp" line="1135"/>
<source>Open map file</source>
<translation>Avaa karttatiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1165"/>
<location filename="../src/GUI/gui.cpp" line="1175"/>
<source>No files loaded</source>
<translation>Yhtään tiedostoja ei ladattu</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="912"/>
<location filename="../src/GUI/gui.cpp" line="915"/>
<location filename="../src/GUI/gui.cpp" line="920"/>
<location filename="../src/GUI/gui.cpp" line="923"/>
<source>Date</source>
<translation>Päivämäärä</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="432"/>
<source>&amp;File</source>
<translation>&amp;Tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="446"/>
<source>&amp;Map</source>
<translation>&amp;Kartat</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="454"/>
<source>&amp;Graph</source>
<translation>Kaa&amp;viokuva</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="463"/>
<source>&amp;POI</source>
<translation>&amp;POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="475"/>
<source>&amp;Data</source>
<translation>Tie&amp;dot</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<source>&amp;Settings</source>
<translation>&amp;Asetukset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="502"/>
<source>&amp;Help</source>
<translation>&amp;Ohje</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<source>Map directory:</source>
<translation>Karttojen hakemisto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="645"/>
<location filename="../src/GUI/gui.cpp" line="649"/>
<source>POI directory:</source>
<translation>POI:n hakemisto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<location filename="../src/GUI/gui.cpp" line="651"/>
<source>GCS file:</source>
<translation>GCS-tiedosto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="648"/>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>PCS file:</source>
<translation>PCS-tiedosto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="654"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoids-tiedosto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="653"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>User override directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="904"/>
<location filename="../src/GUI/gui.cpp" line="912"/>
<source>Routes</source>
<translation>Reitit</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1154"/>
<location filename="../src/GUI/gui.cpp" line="1164"/>
<source>Error loading map:</source>
<translation>Virhe ladattaessa karttaa:</translation>
</message>
<message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1169"/>
<location filename="../src/GUI/gui.cpp" line="1179"/>
<source>%n files</source>
<translation>
<numerusform>%n tiedosto</numerusform>
@ -678,97 +687,97 @@
</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="613"/>
<source>Next file</source>
<translation>Seuraava tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="585"/>
<location filename="../src/GUI/gui.cpp" line="589"/>
<source>Version </source>
<translation>Versio </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="218"/>
<location filename="../src/GUI/gui.cpp" line="222"/>
<source>Print...</source>
<translation>Tulosta...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="223"/>
<location filename="../src/GUI/gui.cpp" line="227"/>
<source>Export to PDF...</source>
<translation>Vie PDF:ksi...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="906"/>
<location filename="../src/GUI/gui.cpp" line="914"/>
<source>Waypoints</source>
<translation>Reittipisteet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="610"/>
<location filename="../src/GUI/gui.cpp" line="614"/>
<source>Previous file</source>
<translation>Edellinen tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="310"/>
<location filename="../src/GUI/gui.cpp" line="314"/>
<source>Route waypoints</source>
<translation>Reittipisteet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="616"/>
<source>First file</source>
<translation>Ensimmäinen tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="614"/>
<location filename="../src/GUI/gui.cpp" line="618"/>
<source>Last file</source>
<translation>Viimeinen tiedosto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="740"/>
<location filename="../src/GUI/gui.cpp" line="746"/>
<source>Error loading data file:</source>
<translation>Virhe ladattaessa datatiedostoa:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="743"/>
<location filename="../src/GUI/gui.cpp" line="768"/>
<location filename="../src/GUI/gui.cpp" line="749"/>
<location filename="../src/GUI/gui.cpp" line="776"/>
<source>Line: %1</source>
<translation>Rivi: %1</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="765"/>
<location filename="../src/GUI/gui.cpp" line="773"/>
<source>Error loading POI file:</source>
<translation>Virhe ladattaessa POI-tiedostoa:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="898"/>
<location filename="../src/GUI/gui.cpp" line="906"/>
<source>Name</source>
<translation>Nimi</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="902"/>
<location filename="../src/GUI/gui.cpp" line="910"/>
<source>Tracks</source>
<translation>Jäljet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="207"/>
<location filename="../src/GUI/gui.cpp" line="584"/>
<location filename="../src/GUI/gui.cpp" line="211"/>
<location filename="../src/GUI/gui.cpp" line="588"/>
<source>About GPXSee</source>
<translation>Tietoja GPXSee:stä</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="522"/>
<location filename="../src/GUI/gui.cpp" line="526"/>
<source>Navigation</source>
<translation>Navigointi</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="325"/>
<location filename="../src/GUI/gui.cpp" line="922"/>
<location filename="../src/GUI/gui.cpp" line="329"/>
<location filename="../src/GUI/gui.cpp" line="930"/>
<source>Distance</source>
<translation>Etäisyys</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="331"/>
<location filename="../src/GUI/gui.cpp" line="481"/>
<location filename="../src/GUI/gui.cpp" line="924"/>
<location filename="../src/GUI/gui.cpp" line="335"/>
<location filename="../src/GUI/gui.cpp" line="485"/>
<location filename="../src/GUI/gui.cpp" line="932"/>
<source>Time</source>
<translation>Aika</translation>
</message>
@ -874,27 +883,27 @@
<context>
<name>MapList</name>
<message>
<location filename="../src/map/maplist.cpp" line="131"/>
<location filename="../src/map/maplist.cpp" line="130"/>
<source>Supported files</source>
<translation>Tuetut tiedostot</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="132"/>
<location filename="../src/map/maplist.cpp" line="131"/>
<source>OziExplorer maps</source>
<translation>OziExplorer -kartat</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="133"/>
<location filename="../src/map/maplist.cpp" line="132"/>
<source>TrekBuddy maps/atlases</source>
<translation>TrekBuddy -kartat/kartastot</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="134"/>
<location filename="../src/map/maplist.cpp" line="133"/>
<source>GeoTIFF images</source>
<translation>GeoTIFF -kuvat</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="135"/>
<location filename="../src/map/maplist.cpp" line="134"/>
<source>Online map sources</source>
<translation>Online-karttojen lähteet</translation>
</message>
@ -1379,33 +1388,53 @@
<context>
<name>SpeedGraph</name>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="14"/>
<location filename="../src/GUI/speedgraph.cpp" line="16"/>
<location filename="../src/GUI/speedgraph.h" line="14"/>
<source>Speed</source>
<translation>Vauhti</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="89"/>
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
<source>km/h</source>
<translation>km/t</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="22"/>
<location filename="../src/GUI/speedgraph.cpp" line="28"/>
<source>Average</source>
<translation>Keskiarvo</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="24"/>
<location filename="../src/GUI/speedgraph.cpp" line="25"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/nmi</source>
<translation>min/mpk</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="30"/>
<source>Maximum</source>
<translation>Maksimi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="83"/>
<location filename="../src/GUI/speedgraph.cpp" line="32"/>
<source>Pace</source>
<translation>Tahti</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
<source>kn</source>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="86"/>
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
<source>mi/h</source>
<translation>mph</translation>
</message>
@ -1413,30 +1442,50 @@
<context>
<name>SpeedGraphItem</name>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>km/h</source>
<translation>km/t</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="21"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<source>mi/h</source>
<translation>mph</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>kn</source>
<translation>kn</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="24"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/nmi</source>
<translation>min/mpk</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="29"/>
<source>Maximum</source>
<translation>Maksimi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="31"/>
<source>Average</source>
<translation>Keskiarvo</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="33"/>
<source>Pace</source>
<translation>Tahti</translation>
</message>
</context>
<context>
<name>TemperatureGraph</name>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de">
<TS version="2.1" language="fr">
<context>
<name>CadenceGraph</name>
<message>
@ -47,47 +47,52 @@
<context>
<name>Data</name>
<message>
<location filename="../src/data/data.cpp" line="103"/>
<location filename="../src/data/data.cpp" line="112"/>
<source>Supported files</source>
<translation>Formats pris en charge</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>CSV files</source>
<translation>Données CSV</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>FIT files</source>
<translation>Données FIT</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>GPX files</source>
<translation>Données GPX</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>IGC files</source>
<translation>Données IGC</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>KML files</source>
<translation>Données KML</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>NMEA files</source>
<translation>Données NMEA</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="117"/>
<source>OziExplorer files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="118"/>
<source>TCX files</source>
<translation>Données TCX</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="118"/>
<source>All files</source>
<translation>Tous les fichiers</translation>
</message>
@ -284,7 +289,7 @@
<message>
<location filename="../src/GUI/format.cpp" line="62"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/format.cpp" line="66"/>
@ -301,365 +306,334 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/GUI/gui.cpp" line="588"/>
<location filename="../src/GUI/gui.cpp" line="592"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d&apos;information sur GPXSee, visiter le site du projet sur </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="647"/>
<source>Map directory:</source>
<translation>Dossier des cartes :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="645"/>
<location filename="../src/GUI/gui.cpp" line="649"/>
<source>POI directory:</source>
<translation>Dossier des POI:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<location filename="../src/GUI/gui.cpp" line="651"/>
<source>GCS file:</source>
<translation>Fichier GCS :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="648"/>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>PCS file:</source>
<translation>Fichier PCS :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="654"/>
<source>Ellipsoids file:</source>
<translation>Fichier des ellipsoïdes :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="653"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>User override directory:</source>
<translation>Dossier de l&apos;utilisateur :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="662"/>
<location filename="../src/GUI/gui.cpp" line="666"/>
<source>Open file</source>
<translation>Ouvrir un fichier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="751"/>
<location filename="../src/GUI/gui.cpp" line="757"/>
<source>Open POI file</source>
<translation>Ouvrir un fichier POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="195"/>
<location filename="../src/GUI/gui.cpp" line="199"/>
<source>Quit</source>
<translation>Quitter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="204"/>
<location filename="../src/GUI/gui.cpp" line="605"/>
<location filename="../src/GUI/gui.cpp" line="606"/>
<location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="610"/>
<source>Keyboard controls</source>
<translation>Raccourcis clavier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="229"/>
<location filename="../src/GUI/gui.cpp" line="233"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="235"/>
<location filename="../src/GUI/gui.cpp" line="239"/>
<source>Reload</source>
<translation>Actualiser</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="517"/>
<location filename="../src/GUI/gui.cpp" line="521"/>
<source>Show</source>
<translation>Afficher</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="428"/>
<location filename="../src/GUI/gui.cpp" line="511"/>
<location filename="../src/GUI/gui.cpp" line="515"/>
<source>File</source>
<translation>Fichier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="246"/>
<location filename="../src/GUI/gui.cpp" line="250"/>
<source>Close POI files</source>
<translation>Fermer les fichiers POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<location filename="../src/GUI/gui.cpp" line="252"/>
<source>Overlap POIs</source>
<translation>Superposer les POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="252"/>
<location filename="../src/GUI/gui.cpp" line="256"/>
<source>Show POI labels</source>
<translation>Afficher les notes des POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="257"/>
<location filename="../src/GUI/gui.cpp" line="261"/>
<source>Show POIs</source>
<translation>Afficher les POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="266"/>
<location filename="../src/GUI/gui.cpp" line="270"/>
<source>Show map</source>
<translation>Afficher la carte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="276"/>
<location filename="../src/GUI/gui.cpp" line="280"/>
<source>Clear tile cache</source>
<translation>Effacer les tuiles en cache</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="213"/>
<location filename="../src/GUI/gui.cpp" line="217"/>
<source>Open...</source>
<translation>Ouvrir...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="202"/>
<location filename="../src/GUI/gui.cpp" line="639"/>
<location filename="../src/GUI/gui.cpp" line="640"/>
<location filename="../src/GUI/gui.cpp" line="206"/>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="644"/>
<source>Paths</source>
<translation>Chemin d&apos;accès</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="243"/>
<location filename="../src/GUI/gui.cpp" line="247"/>
<source>Load POI file...</source>
<translation>Charger un fichier POI...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="274"/>
<location filename="../src/GUI/gui.cpp" line="278"/>
<source>Load map...</source>
<translation>Charger une carte...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="280"/>
<location filename="../src/GUI/gui.cpp" line="284"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<location filename="../src/GUI/gui.cpp" line="288"/>
<location filename="../src/GUI/gui.cpp" line="626"/>
<source>Next map</source>
<translation>Carte suivante</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="294"/>
<location filename="../src/GUI/gui.cpp" line="298"/>
<source>Show tracks</source>
<translation>Afficher la trace</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="298"/>
<location filename="../src/GUI/gui.cpp" line="302"/>
<source>Show routes</source>
<translation>Afficher la route</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="302"/>
<location filename="../src/GUI/gui.cpp" line="306"/>
<source>Show waypoints</source>
<translation>Afficher les points de jalonnement</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="306"/>
<location filename="../src/GUI/gui.cpp" line="310"/>
<source>Waypoint labels</source>
<translation>Étiquettes des jalons</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="317"/>
<location filename="../src/GUI/gui.cpp" line="321"/>
<source>Show graphs</source>
<translation>Afficher les graphes</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="337"/>
<location filename="../src/GUI/gui.cpp" line="341"/>
<source>Show grid</source>
<translation>Afficher la grille</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="341"/>
<location filename="../src/GUI/gui.cpp" line="345"/>
<source>Show slider info</source>
<translation>Afficher les infos du curseur</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="347"/>
<location filename="../src/GUI/gui.cpp" line="351"/>
<source>Show toolbars</source>
<translation>Afficher la barre d&apos;outils</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="353"/>
<location filename="../src/GUI/gui.cpp" line="357"/>
<source>Total time</source>
<translation>Durée totale</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="358"/>
<location filename="../src/GUI/gui.cpp" line="926"/>
<location filename="../src/GUI/gui.cpp" line="362"/>
<location filename="../src/GUI/gui.cpp" line="934"/>
<source>Moving time</source>
<translation>Durée en déplacement</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="365"/>
<location filename="../src/GUI/gui.cpp" line="369"/>
<source>Metric</source>
<translation>Métrique</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="370"/>
<location filename="../src/GUI/gui.cpp" line="374"/>
<source>Imperial</source>
<translation>Impérial</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="375"/>
<location filename="../src/GUI/gui.cpp" line="379"/>
<source>Nautical</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="382"/>
<location filename="../src/GUI/gui.cpp" line="386"/>
<source>Decimal degrees (DD)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="387"/>
<location filename="../src/GUI/gui.cpp" line="391"/>
<source>Degrees and decimal minutes (DMM)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="393"/>
<location filename="../src/GUI/gui.cpp" line="397"/>
<source>Degrees, minutes, seconds (DMS)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="398"/>
<location filename="../src/GUI/gui.cpp" line="402"/>
<source>Fullscreen mode</source>
<translation>Mode plein écran</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="404"/>
<location filename="../src/GUI/gui.cpp" line="408"/>
<source>Options...</source>
<translation>Options...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="410"/>
<location filename="../src/GUI/gui.cpp" line="414"/>
<source>Next</source>
<translation>Suivant</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="413"/>
<location filename="../src/GUI/gui.cpp" line="417"/>
<source>Previous</source>
<translation>Précèdant</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="417"/>
<location filename="../src/GUI/gui.cpp" line="421"/>
<source>Last</source>
<translation>Dernier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="420"/>
<location filename="../src/GUI/gui.cpp" line="424"/>
<source>First</source>
<translation>Premier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="442"/>
<source>Map</source>
<translation>Carte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="450"/>
<source>Graph</source>
<translation>Graphe</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="460"/>
<location filename="../src/GUI/gui.cpp" line="464"/>
<source>POI files</source>
<translation>Fichiers POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="471"/>
<source>Data</source>
<translation>Données</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="472"/>
<location filename="../src/GUI/gui.cpp" line="476"/>
<source>Display</source>
<translation>Affichage</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="480"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<location filename="../src/GUI/gui.cpp" line="488"/>
<source>Units</source>
<translation>Système d&apos;unités</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="488"/>
<location filename="../src/GUI/gui.cpp" line="492"/>
<source>Coordinates format</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="498"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="615"/>
<location filename="../src/GUI/gui.cpp" line="619"/>
<source>Append file</source>
<translation>Joindre un fichier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<location filename="../src/GUI/gui.cpp" line="620"/>
<source>Next/Previous</source>
<translation>Suivant/Précèdant</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="618"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<source>Toggle graph type</source>
<translation>Controler le type de graphe</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="620"/>
<location filename="../src/GUI/gui.cpp" line="624"/>
<source>Toggle time type</source>
<translation>Controler le type de durée</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="624"/>
<location filename="../src/GUI/gui.cpp" line="628"/>
<source>Previous map</source>
<translation>Carte précèdente</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="625"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Zoom in</source>
<translation>Zoomer</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="627"/>
<location filename="../src/GUI/gui.cpp" line="631"/>
<source>Zoom out</source>
<translation>Dézoomer</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="629"/>
<location filename="../src/GUI/gui.cpp" line="633"/>
<source>Digital zoom</source>
<translation>Zoom numérique</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="630"/>
<location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1127"/>
<location filename="../src/GUI/gui.cpp" line="1135"/>
<source>Open map file</source>
<translation>Ouvrir un fichier de carte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1154"/>
<location filename="../src/GUI/gui.cpp" line="1164"/>
<source>Error loading map:</source>
<translation>Erreur lors du chargement de la carte :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1165"/>
<location filename="../src/GUI/gui.cpp" line="1175"/>
<source>No files loaded</source>
<translation>Aucun fichier chargé</translation>
</message>
<message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1169"/>
<location filename="../src/GUI/gui.cpp" line="1179"/>
<source>%n files</source>
<translation>
<numerusform>%n fichier</numerusform>
@ -667,108 +641,143 @@
</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="912"/>
<location filename="../src/GUI/gui.cpp" line="915"/>
<location filename="../src/GUI/gui.cpp" line="920"/>
<location filename="../src/GUI/gui.cpp" line="923"/>
<source>Date</source>
<translation>Date</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="904"/>
<location filename="../src/GUI/gui.cpp" line="912"/>
<source>Routes</source>
<translation>Routes</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="613"/>
<source>Next file</source>
<translation>Fichier suivant</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="585"/>
<location filename="../src/GUI/gui.cpp" line="589"/>
<source>Version </source>
<translation>Version </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="218"/>
<location filename="../src/GUI/gui.cpp" line="222"/>
<source>Print...</source>
<translation>Imprimer...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="223"/>
<location filename="../src/GUI/gui.cpp" line="227"/>
<source>Export to PDF...</source>
<translation>Exporter au format PDF...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="906"/>
<location filename="../src/GUI/gui.cpp" line="914"/>
<source>Waypoints</source>
<translation>Points de jalonnement</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="610"/>
<location filename="../src/GUI/gui.cpp" line="614"/>
<source>Previous file</source>
<translation>Fichier précédent</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="310"/>
<location filename="../src/GUI/gui.cpp" line="314"/>
<source>Route waypoints</source>
<translation>Jalons de route</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="432"/>
<source>&amp;File</source>
<translation>&amp;Fichier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="446"/>
<source>&amp;Map</source>
<translation>&amp;Carte</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="454"/>
<source>&amp;Graph</source>
<translation>&amp;Graphe</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="463"/>
<source>&amp;POI</source>
<translation>&amp;POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="475"/>
<source>&amp;Data</source>
<translation>&amp;Données</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<source>&amp;Settings</source>
<translation>Pa&amp;ramètres</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="502"/>
<source>&amp;Help</source>
<translation>&amp;Aide</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<source>First file</source>
<translation>Premier fichier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="614"/>
<location filename="../src/GUI/gui.cpp" line="618"/>
<source>Last file</source>
<translation>Dernier fichier</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="740"/>
<location filename="../src/GUI/gui.cpp" line="746"/>
<source>Error loading data file:</source>
<translation>Erreur lors du chargement des données:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="743"/>
<location filename="../src/GUI/gui.cpp" line="768"/>
<location filename="../src/GUI/gui.cpp" line="749"/>
<location filename="../src/GUI/gui.cpp" line="776"/>
<source>Line: %1</source>
<translation>Ligne : %1</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="765"/>
<location filename="../src/GUI/gui.cpp" line="773"/>
<source>Error loading POI file:</source>
<translation>Erreur lors du chargement du fichier POI :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="898"/>
<location filename="../src/GUI/gui.cpp" line="906"/>
<source>Name</source>
<translation>Nom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="902"/>
<location filename="../src/GUI/gui.cpp" line="910"/>
<source>Tracks</source>
<translation>Traces</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="207"/>
<location filename="../src/GUI/gui.cpp" line="584"/>
<location filename="../src/GUI/gui.cpp" line="211"/>
<location filename="../src/GUI/gui.cpp" line="588"/>
<source>About GPXSee</source>
<translation>À propos de GPXSee</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="522"/>
<location filename="../src/GUI/gui.cpp" line="526"/>
<source>Navigation</source>
<translation>Navigation</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="325"/>
<location filename="../src/GUI/gui.cpp" line="922"/>
<location filename="../src/GUI/gui.cpp" line="329"/>
<location filename="../src/GUI/gui.cpp" line="930"/>
<source>Distance</source>
<translation>Distance</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="331"/>
<location filename="../src/GUI/gui.cpp" line="481"/>
<location filename="../src/GUI/gui.cpp" line="924"/>
<location filename="../src/GUI/gui.cpp" line="335"/>
<location filename="../src/GUI/gui.cpp" line="485"/>
<location filename="../src/GUI/gui.cpp" line="932"/>
<source>Time</source>
<translation>Temps</translation>
</message>
@ -799,7 +808,7 @@
<message>
<location filename="../src/GUI/graphview.cpp" line="120"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/graphview.cpp" line="134"/>
@ -874,27 +883,27 @@
<context>
<name>MapList</name>
<message>
<location filename="../src/map/maplist.cpp" line="131"/>
<location filename="../src/map/maplist.cpp" line="130"/>
<source>Supported files</source>
<translation>Formats pris en charge</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="132"/>
<location filename="../src/map/maplist.cpp" line="131"/>
<source>OziExplorer maps</source>
<translation>Cartes OziExplorer</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="133"/>
<location filename="../src/map/maplist.cpp" line="132"/>
<source>TrekBuddy maps/atlases</source>
<translation>Cartes ou atlas TrekBuddy</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="134"/>
<location filename="../src/map/maplist.cpp" line="133"/>
<source>GeoTIFF images</source>
<translation>Images GeoTIFF</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="135"/>
<location filename="../src/map/maplist.cpp" line="134"/>
<source>Online map sources</source>
<translation>Cartes en ligne</translation>
</message>
@ -1161,7 +1170,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="331"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="334"/>
@ -1363,7 +1372,7 @@
<message>
<location filename="../src/GUI/scaleitem.cpp" line="86"/>
<source>nmi</source>
<translation type="unfinished"></translation>
<translation>nmi</translation>
</message>
<message>
<location filename="../src/GUI/scaleitem.cpp" line="89"/>
@ -1379,33 +1388,53 @@
<context>
<name>SpeedGraph</name>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="14"/>
<location filename="../src/GUI/speedgraph.cpp" line="16"/>
<location filename="../src/GUI/speedgraph.h" line="14"/>
<source>Speed</source>
<translation>Vitesse</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="89"/>
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="22"/>
<location filename="../src/GUI/speedgraph.cpp" line="28"/>
<source>Average</source>
<translation>Moyenne</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="24"/>
<location filename="../src/GUI/speedgraph.cpp" line="25"/>
<source>min/km</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/nmi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="30"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="83"/>
<location filename="../src/GUI/speedgraph.cpp" line="32"/>
<source>Pace</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
<source>kn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="86"/>
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
@ -1413,30 +1442,50 @@
<context>
<name>SpeedGraphItem</name>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="21"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>kn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="24"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<source>min/km</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/nmi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="29"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="31"/>
<source>Average</source>
<translation>Moyenne</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="33"/>
<source>Pace</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemperatureGraph</name>

1614
lang/gpxsee_pl.ts Normal file

File diff suppressed because it is too large Load Diff

View File

@ -47,47 +47,52 @@
<context>
<name>Data</name>
<message>
<location filename="../src/data/data.cpp" line="103"/>
<location filename="../src/data/data.cpp" line="112"/>
<source>Supported files</source>
<translation>Все поддерживаемые файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>CSV files</source>
<translation>CSV файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>FIT files</source>
<translation>FIT файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>GPX files</source>
<translation>GPX файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>IGC files</source>
<translation>IGC файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>KML files</source>
<translation>KML файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>NMEA files</source>
<translation>NMEA файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="117"/>
<source>OziExplorer files</source>
<translation>OziExplorer файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="118"/>
<source>TCX files</source>
<translation>TCX файлы</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="118"/>
<source>All files</source>
<translation>Все файлы</translation>
</message>
@ -301,376 +306,380 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/GUI/gui.cpp" line="588"/>
<location filename="../src/GUI/gui.cpp" line="592"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee распространяется в соответствиями с условиями версии 3 Стандартной Общественной Лицензии GNU. Для получения дополнительной информации о GPXSee посетите страницу проекта </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="662"/>
<location filename="../src/GUI/gui.cpp" line="666"/>
<source>Open file</source>
<translation>Открыть файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="751"/>
<location filename="../src/GUI/gui.cpp" line="757"/>
<source>Open POI file</source>
<translation>Открыть файл с точками POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="195"/>
<location filename="../src/GUI/gui.cpp" line="199"/>
<source>Quit</source>
<translation>Выход</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="204"/>
<location filename="../src/GUI/gui.cpp" line="605"/>
<location filename="../src/GUI/gui.cpp" line="606"/>
<location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="610"/>
<source>Keyboard controls</source>
<translation>Управление с помощью клавиатуры</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="229"/>
<location filename="../src/GUI/gui.cpp" line="233"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="235"/>
<location filename="../src/GUI/gui.cpp" line="239"/>
<source>Reload</source>
<translation>Обновить</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="517"/>
<location filename="../src/GUI/gui.cpp" line="521"/>
<source>Show</source>
<translation>Показать</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="428"/>
<location filename="../src/GUI/gui.cpp" line="511"/>
<location filename="../src/GUI/gui.cpp" line="515"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="246"/>
<location filename="../src/GUI/gui.cpp" line="250"/>
<source>Close POI files</source>
<translation>Закрыть файлы с точками POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<location filename="../src/GUI/gui.cpp" line="252"/>
<source>Overlap POIs</source>
<translation>Наложение точек POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="252"/>
<location filename="../src/GUI/gui.cpp" line="256"/>
<source>Show POI labels</source>
<translation>Показать подписи к точкам POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="257"/>
<location filename="../src/GUI/gui.cpp" line="261"/>
<source>Show POIs</source>
<translation>Показать точки POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="266"/>
<location filename="../src/GUI/gui.cpp" line="270"/>
<source>Show map</source>
<translation>Показать карту</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="276"/>
<location filename="../src/GUI/gui.cpp" line="280"/>
<source>Clear tile cache</source>
<translation>Очистить кэш</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="213"/>
<location filename="../src/GUI/gui.cpp" line="217"/>
<source>Open...</source>
<translation>Открыть...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="202"/>
<location filename="../src/GUI/gui.cpp" line="639"/>
<location filename="../src/GUI/gui.cpp" line="640"/>
<location filename="../src/GUI/gui.cpp" line="206"/>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="644"/>
<source>Paths</source>
<translation>Пути</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="243"/>
<location filename="../src/GUI/gui.cpp" line="247"/>
<source>Load POI file...</source>
<translation>Загрузить файл с точками POI...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="274"/>
<location filename="../src/GUI/gui.cpp" line="278"/>
<source>Load map...</source>
<translation>Загрузить карту...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="280"/>
<location filename="../src/GUI/gui.cpp" line="284"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<location filename="../src/GUI/gui.cpp" line="288"/>
<location filename="../src/GUI/gui.cpp" line="626"/>
<source>Next map</source>
<translation>Следующая карта</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="294"/>
<location filename="../src/GUI/gui.cpp" line="298"/>
<source>Show tracks</source>
<translation>Показать треки</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="298"/>
<location filename="../src/GUI/gui.cpp" line="302"/>
<source>Show routes</source>
<translation>Показать маршруты</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="302"/>
<location filename="../src/GUI/gui.cpp" line="306"/>
<source>Show waypoints</source>
<translation>Показать точки</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="306"/>
<location filename="../src/GUI/gui.cpp" line="310"/>
<source>Waypoint labels</source>
<translation>Подписи точек</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="317"/>
<location filename="../src/GUI/gui.cpp" line="321"/>
<source>Show graphs</source>
<translation>Показать графики</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="337"/>
<location filename="../src/GUI/gui.cpp" line="341"/>
<source>Show grid</source>
<translation>Показать сетку</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="341"/>
<location filename="../src/GUI/gui.cpp" line="345"/>
<source>Show slider info</source>
<translation>Показать значение на слайдере</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="347"/>
<location filename="../src/GUI/gui.cpp" line="351"/>
<source>Show toolbars</source>
<translation>Показывать панели инструментов</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="353"/>
<location filename="../src/GUI/gui.cpp" line="357"/>
<source>Total time</source>
<translation>Общее время</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="358"/>
<location filename="../src/GUI/gui.cpp" line="926"/>
<location filename="../src/GUI/gui.cpp" line="362"/>
<location filename="../src/GUI/gui.cpp" line="934"/>
<source>Moving time</source>
<translation>Время движения</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="365"/>
<location filename="../src/GUI/gui.cpp" line="369"/>
<source>Metric</source>
<translation>Метрические</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="370"/>
<location filename="../src/GUI/gui.cpp" line="374"/>
<source>Imperial</source>
<translation>Британские</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="375"/>
<location filename="../src/GUI/gui.cpp" line="379"/>
<source>Nautical</source>
<translation>Морские</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="382"/>
<location filename="../src/GUI/gui.cpp" line="386"/>
<source>Decimal degrees (DD)</source>
<translation>Десятичные градусы (DD)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="387"/>
<location filename="../src/GUI/gui.cpp" line="391"/>
<source>Degrees and decimal minutes (DMM)</source>
<translation>Градусы, десятичные минуты (DMM)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="393"/>
<location filename="../src/GUI/gui.cpp" line="397"/>
<source>Degrees, minutes, seconds (DMS)</source>
<translation>Градусы, минуты, секунды (DMS)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="398"/>
<location filename="../src/GUI/gui.cpp" line="402"/>
<source>Fullscreen mode</source>
<translation>Полноэкранный режим</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="404"/>
<location filename="../src/GUI/gui.cpp" line="408"/>
<source>Options...</source>
<translation>Параметры...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="410"/>
<location filename="../src/GUI/gui.cpp" line="414"/>
<source>Next</source>
<translation>Следующий</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="413"/>
<location filename="../src/GUI/gui.cpp" line="417"/>
<source>Previous</source>
<translation>Предыдущий</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="417"/>
<location filename="../src/GUI/gui.cpp" line="421"/>
<source>Last</source>
<translation>Последний</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="420"/>
<location filename="../src/GUI/gui.cpp" line="424"/>
<source>First</source>
<translation>Первый</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="442"/>
<source>Map</source>
<translation>Карты</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="450"/>
<source>Graph</source>
<translation>График</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>
<source>POI</source>
<translation>Точки POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="460"/>
<location filename="../src/GUI/gui.cpp" line="464"/>
<source>POI files</source>
<translation>Файлы с точками POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="471"/>
<source>Data</source>
<translation>Данные</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="472"/>
<location filename="../src/GUI/gui.cpp" line="476"/>
<source>Display</source>
<translation>Отображать</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="480"/>
<source>Settings</source>
<translation>Параметры</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<location filename="../src/GUI/gui.cpp" line="488"/>
<source>Units</source>
<translation>Единицы</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="488"/>
<location filename="../src/GUI/gui.cpp" line="492"/>
<source>Coordinates format</source>
<translation>Формат координат</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="498"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="615"/>
<location filename="../src/GUI/gui.cpp" line="619"/>
<source>Append file</source>
<translation>Добавить файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<location filename="../src/GUI/gui.cpp" line="620"/>
<source>Next/Previous</source>
<translation>Next/Previous</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="618"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<source>Toggle graph type</source>
<translation>Переключить тип графика</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="620"/>
<location filename="../src/GUI/gui.cpp" line="624"/>
<source>Toggle time type</source>
<translation>Переключить тип времени</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="624"/>
<location filename="../src/GUI/gui.cpp" line="628"/>
<source>Previous map</source>
<translation>Предыдущая карта</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="625"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Zoom in</source>
<translation>Увеличить</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="627"/>
<location filename="../src/GUI/gui.cpp" line="631"/>
<source>Zoom out</source>
<translation>Уменьшить</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="629"/>
<location filename="../src/GUI/gui.cpp" line="633"/>
<source>Digital zoom</source>
<translation>Цифровой зум</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="630"/>
<location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1127"/>
<location filename="../src/GUI/gui.cpp" line="1135"/>
<source>Open map file</source>
<translation>Открыть файл карты</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1165"/>
<location filename="../src/GUI/gui.cpp" line="1175"/>
<source>No files loaded</source>
<translation>Нет загруженных файлов</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="912"/>
<location filename="../src/GUI/gui.cpp" line="915"/>
<location filename="../src/GUI/gui.cpp" line="920"/>
<location filename="../src/GUI/gui.cpp" line="923"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="432"/>
<source>&amp;File</source>
<translation>&amp;Файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="446"/>
<source>&amp;Map</source>
<translation>&amp;Карты</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="454"/>
<source>&amp;Graph</source>
<translation>&amp;График</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="463"/>
<source>&amp;POI</source>
<translation>&amp;Точки POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="475"/>
<source>&amp;Data</source>
<translation>&amp;Данные</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<source>&amp;Settings</source>
<translation>&amp;Параметры</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="502"/>
<source>&amp;Help</source>
<translation>&amp;Справка</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<source>Map directory:</source>
<translation>Директория с картами:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="645"/>
<location filename="../src/GUI/gui.cpp" line="649"/>
<source>POI directory:</source>
<translation>Директория с POI:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<location filename="../src/GUI/gui.cpp" line="651"/>
<source>GCS file:</source>
<translation>GCS файл:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="648"/>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>PCS file:</source>
<translation>PCS файл:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="654"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoids файл:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="653"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>User override directory:</source>
<translation>Каталог пользовательских настроек:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="904"/>
<location filename="../src/GUI/gui.cpp" line="912"/>
<source>Routes</source>
<translation>Маршруты</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1154"/>
<location filename="../src/GUI/gui.cpp" line="1164"/>
<source>Error loading map:</source>
<translation>Ошибка загрузки карты:</translation>
</message>
<message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1169"/>
<location filename="../src/GUI/gui.cpp" line="1179"/>
<source>%n files</source>
<translation>
<numerusform>%n файл</numerusform>
@ -679,97 +688,97 @@
</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="613"/>
<source>Next file</source>
<translation>Следующий файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="585"/>
<location filename="../src/GUI/gui.cpp" line="589"/>
<source>Version </source>
<translation>Версия </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="218"/>
<location filename="../src/GUI/gui.cpp" line="222"/>
<source>Print...</source>
<translation>Печать...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="223"/>
<location filename="../src/GUI/gui.cpp" line="227"/>
<source>Export to PDF...</source>
<translation>Экспорт в PDF...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="906"/>
<location filename="../src/GUI/gui.cpp" line="914"/>
<source>Waypoints</source>
<translation>Точки</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="610"/>
<location filename="../src/GUI/gui.cpp" line="614"/>
<source>Previous file</source>
<translation>Предыдущий файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="310"/>
<location filename="../src/GUI/gui.cpp" line="314"/>
<source>Route waypoints</source>
<translation>Маршрутные точки</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="616"/>
<source>First file</source>
<translation>Первый файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="614"/>
<location filename="../src/GUI/gui.cpp" line="618"/>
<source>Last file</source>
<translation>Последний файл</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="740"/>
<location filename="../src/GUI/gui.cpp" line="746"/>
<source>Error loading data file:</source>
<translation>Ошибка загрузки файла данных:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="743"/>
<location filename="../src/GUI/gui.cpp" line="768"/>
<location filename="../src/GUI/gui.cpp" line="749"/>
<location filename="../src/GUI/gui.cpp" line="776"/>
<source>Line: %1</source>
<translation>Строка: %1</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="765"/>
<location filename="../src/GUI/gui.cpp" line="773"/>
<source>Error loading POI file:</source>
<translation>Ошибка загрузки файла с точками POI:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="898"/>
<location filename="../src/GUI/gui.cpp" line="906"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="902"/>
<location filename="../src/GUI/gui.cpp" line="910"/>
<source>Tracks</source>
<translation>Треки</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="207"/>
<location filename="../src/GUI/gui.cpp" line="584"/>
<location filename="../src/GUI/gui.cpp" line="211"/>
<location filename="../src/GUI/gui.cpp" line="588"/>
<source>About GPXSee</source>
<translation>О GPXSee</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="522"/>
<location filename="../src/GUI/gui.cpp" line="526"/>
<source>Navigation</source>
<translation>Навигация</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="325"/>
<location filename="../src/GUI/gui.cpp" line="922"/>
<location filename="../src/GUI/gui.cpp" line="329"/>
<location filename="../src/GUI/gui.cpp" line="930"/>
<source>Distance</source>
<translation>Расстояние</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="331"/>
<location filename="../src/GUI/gui.cpp" line="481"/>
<location filename="../src/GUI/gui.cpp" line="924"/>
<location filename="../src/GUI/gui.cpp" line="335"/>
<location filename="../src/GUI/gui.cpp" line="485"/>
<location filename="../src/GUI/gui.cpp" line="932"/>
<source>Time</source>
<translation>Время</translation>
</message>
@ -875,27 +884,27 @@
<context>
<name>MapList</name>
<message>
<location filename="../src/map/maplist.cpp" line="131"/>
<location filename="../src/map/maplist.cpp" line="130"/>
<source>Supported files</source>
<translation>Все поддерживаемые файлы</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="132"/>
<location filename="../src/map/maplist.cpp" line="131"/>
<source>OziExplorer maps</source>
<translation>OziExplorer карты</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="133"/>
<location filename="../src/map/maplist.cpp" line="132"/>
<source>TrekBuddy maps/atlases</source>
<translation>TrekBuddy карты/атласы</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="134"/>
<location filename="../src/map/maplist.cpp" line="133"/>
<source>GeoTIFF images</source>
<translation>GeoTIFF изображения</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="135"/>
<location filename="../src/map/maplist.cpp" line="134"/>
<source>Online map sources</source>
<translation>Источники онлайн карт</translation>
</message>
@ -1380,33 +1389,53 @@
<context>
<name>SpeedGraph</name>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="14"/>
<location filename="../src/GUI/speedgraph.cpp" line="16"/>
<location filename="../src/GUI/speedgraph.h" line="14"/>
<source>Speed</source>
<translation>Скорость</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="89"/>
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
<source>km/h</source>
<translation>км/ч</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="22"/>
<location filename="../src/GUI/speedgraph.cpp" line="28"/>
<source>Average</source>
<translation>Cреднее</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="24"/>
<location filename="../src/GUI/speedgraph.cpp" line="25"/>
<source>min/km</source>
<translation>мин/км</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/mi</source>
<translation>мин/мл</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/nmi</source>
<translation>мин/мор.мл</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="30"/>
<source>Maximum</source>
<translation>Максимум</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="83"/>
<location filename="../src/GUI/speedgraph.cpp" line="32"/>
<source>Pace</source>
<translation>Темп</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
<source>kn</source>
<translation>уз</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="86"/>
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
<source>mi/h</source>
<translation>мл/ч</translation>
</message>
@ -1414,30 +1443,50 @@
<context>
<name>SpeedGraphItem</name>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>km/h</source>
<translation>км/ч</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="21"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<source>mi/h</source>
<translation>мл/ч</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>kn</source>
<translation>уз</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="24"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<source>min/km</source>
<translation>мин/км</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/mi</source>
<translation>мин/мл</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/nmi</source>
<translation>мин/мор.мл</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="29"/>
<source>Maximum</source>
<translation>Максимум</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="31"/>
<source>Average</source>
<translation>Cреднее</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="33"/>
<source>Pace</source>
<translation>Темп</translation>
</message>
</context>
<context>
<name>TemperatureGraph</name>

View File

@ -47,47 +47,52 @@
<context>
<name>Data</name>
<message>
<location filename="../src/data/data.cpp" line="103"/>
<location filename="../src/data/data.cpp" line="112"/>
<source>Supported files</source>
<translation>Filer som stöds</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>CSV files</source>
<translation>CSV-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="104"/>
<location filename="../src/data/data.cpp" line="114"/>
<source>FIT files</source>
<translation>FIT-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>GPX files</source>
<translation>GPX-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="105"/>
<location filename="../src/data/data.cpp" line="115"/>
<source>IGC files</source>
<translation>IGC-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>KML files</source>
<translation>KML-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="106"/>
<location filename="../src/data/data.cpp" line="116"/>
<source>NMEA files</source>
<translation>NMEA-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="117"/>
<source>OziExplorer files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="118"/>
<source>TCX files</source>
<translation>TCX-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="107"/>
<location filename="../src/data/data.cpp" line="118"/>
<source>All files</source>
<translation>Alla filer</translation>
</message>
@ -301,365 +306,334 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/GUI/gui.cpp" line="588"/>
<location filename="../src/GUI/gui.cpp" line="592"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="647"/>
<source>Map directory:</source>
<translation>Kartmapp:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="645"/>
<location filename="../src/GUI/gui.cpp" line="649"/>
<source>POI directory:</source>
<translation>POI-mapp:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="647"/>
<location filename="../src/GUI/gui.cpp" line="651"/>
<source>GCS file:</source>
<translation>GCS-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="648"/>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>PCS file:</source>
<translation>PCS-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="654"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoids-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="653"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>User override directory:</source>
<translation>Användarspecificerad mapp:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="662"/>
<location filename="../src/GUI/gui.cpp" line="666"/>
<source>Open file</source>
<translation>Öppna fil</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="751"/>
<location filename="../src/GUI/gui.cpp" line="757"/>
<source>Open POI file</source>
<translation>Öppna POI-fil</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="195"/>
<location filename="../src/GUI/gui.cpp" line="199"/>
<source>Quit</source>
<translation>Avsluta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="204"/>
<location filename="../src/GUI/gui.cpp" line="605"/>
<location filename="../src/GUI/gui.cpp" line="606"/>
<location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="610"/>
<source>Keyboard controls</source>
<translation>Snabbtangenter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="229"/>
<location filename="../src/GUI/gui.cpp" line="233"/>
<source>Close</source>
<translation>Stäng</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="235"/>
<location filename="../src/GUI/gui.cpp" line="239"/>
<source>Reload</source>
<translation>Uppdatera</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="517"/>
<location filename="../src/GUI/gui.cpp" line="521"/>
<source>Show</source>
<translation>Visa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="428"/>
<location filename="../src/GUI/gui.cpp" line="511"/>
<location filename="../src/GUI/gui.cpp" line="515"/>
<source>File</source>
<translation>Arkiv</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="246"/>
<location filename="../src/GUI/gui.cpp" line="250"/>
<source>Close POI files</source>
<translation>Stäng POI-filer</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<location filename="../src/GUI/gui.cpp" line="252"/>
<source>Overlap POIs</source>
<translation>Överlappa POI:er</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="252"/>
<location filename="../src/GUI/gui.cpp" line="256"/>
<source>Show POI labels</source>
<translation>Visa POI-namn</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="257"/>
<location filename="../src/GUI/gui.cpp" line="261"/>
<source>Show POIs</source>
<translation>Visa POI:er</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="266"/>
<location filename="../src/GUI/gui.cpp" line="270"/>
<source>Show map</source>
<translation>Visa karta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="276"/>
<location filename="../src/GUI/gui.cpp" line="280"/>
<source>Clear tile cache</source>
<translation>Rensa kart-cache</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="213"/>
<location filename="../src/GUI/gui.cpp" line="217"/>
<source>Open...</source>
<translation>Öppna...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="202"/>
<location filename="../src/GUI/gui.cpp" line="639"/>
<location filename="../src/GUI/gui.cpp" line="640"/>
<location filename="../src/GUI/gui.cpp" line="206"/>
<location filename="../src/GUI/gui.cpp" line="643"/>
<location filename="../src/GUI/gui.cpp" line="644"/>
<source>Paths</source>
<translation type="unfinished">Sökvägar</translation>
<translation>Sökvägar</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="243"/>
<location filename="../src/GUI/gui.cpp" line="247"/>
<source>Load POI file...</source>
<translation>Läs in POI-fil...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="274"/>
<location filename="../src/GUI/gui.cpp" line="278"/>
<source>Load map...</source>
<translation>Läs in karta...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="280"/>
<location filename="../src/GUI/gui.cpp" line="284"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<location filename="../src/GUI/gui.cpp" line="288"/>
<location filename="../src/GUI/gui.cpp" line="626"/>
<source>Next map</source>
<translation>Nästa karta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="294"/>
<location filename="../src/GUI/gui.cpp" line="298"/>
<source>Show tracks</source>
<translation>Visa spår</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="298"/>
<location filename="../src/GUI/gui.cpp" line="302"/>
<source>Show routes</source>
<translation>Visa rutter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="302"/>
<location filename="../src/GUI/gui.cpp" line="306"/>
<source>Show waypoints</source>
<translation>Visa vägpunkter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="306"/>
<location filename="../src/GUI/gui.cpp" line="310"/>
<source>Waypoint labels</source>
<translation>Vägpunktsnamn</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="317"/>
<location filename="../src/GUI/gui.cpp" line="321"/>
<source>Show graphs</source>
<translation>Visa diagram</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="337"/>
<location filename="../src/GUI/gui.cpp" line="341"/>
<source>Show grid</source>
<translation>Visa stödlinjer</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="341"/>
<location filename="../src/GUI/gui.cpp" line="345"/>
<source>Show slider info</source>
<translation>Visa reglageinfo</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="347"/>
<location filename="../src/GUI/gui.cpp" line="351"/>
<source>Show toolbars</source>
<translation>Visa verktygsfält</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="353"/>
<location filename="../src/GUI/gui.cpp" line="357"/>
<source>Total time</source>
<translation>Total tid</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="358"/>
<location filename="../src/GUI/gui.cpp" line="926"/>
<location filename="../src/GUI/gui.cpp" line="362"/>
<location filename="../src/GUI/gui.cpp" line="934"/>
<source>Moving time</source>
<translation>Förflyttningstid</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="365"/>
<location filename="../src/GUI/gui.cpp" line="369"/>
<source>Metric</source>
<translation>Meter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="370"/>
<location filename="../src/GUI/gui.cpp" line="374"/>
<source>Imperial</source>
<translation>Imperial</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="375"/>
<location filename="../src/GUI/gui.cpp" line="379"/>
<source>Nautical</source>
<translation>Nautiska</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="382"/>
<location filename="../src/GUI/gui.cpp" line="386"/>
<source>Decimal degrees (DD)</source>
<translation>Decimala grader (DD)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="387"/>
<location filename="../src/GUI/gui.cpp" line="391"/>
<source>Degrees and decimal minutes (DMM)</source>
<translation>Grader och decimala minuter (DMM)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="393"/>
<location filename="../src/GUI/gui.cpp" line="397"/>
<source>Degrees, minutes, seconds (DMS)</source>
<translation>Grader, minuter, sekunder (DMS)</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="398"/>
<location filename="../src/GUI/gui.cpp" line="402"/>
<source>Fullscreen mode</source>
<translation>Helskärmsläge</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="404"/>
<location filename="../src/GUI/gui.cpp" line="408"/>
<source>Options...</source>
<translation>Alternativ...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="410"/>
<location filename="../src/GUI/gui.cpp" line="414"/>
<source>Next</source>
<translation>Nästa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="413"/>
<location filename="../src/GUI/gui.cpp" line="417"/>
<source>Previous</source>
<translation>Föregående</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="417"/>
<location filename="../src/GUI/gui.cpp" line="421"/>
<source>Last</source>
<translation>Sista</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="420"/>
<location filename="../src/GUI/gui.cpp" line="424"/>
<source>First</source>
<translation>Första</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="442"/>
<source>Map</source>
<translation>Karta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="450"/>
<source>Graph</source>
<translation>Diagram</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="460"/>
<location filename="../src/GUI/gui.cpp" line="464"/>
<source>POI files</source>
<translation>POI-filer</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="471"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="472"/>
<location filename="../src/GUI/gui.cpp" line="476"/>
<source>Display</source>
<translation>Visa</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="480"/>
<source>Settings</source>
<translation>Inställningar</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<location filename="../src/GUI/gui.cpp" line="488"/>
<source>Units</source>
<translation>Enhet</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="488"/>
<location filename="../src/GUI/gui.cpp" line="492"/>
<source>Coordinates format</source>
<translation>Koordinatformat</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="498"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="615"/>
<location filename="../src/GUI/gui.cpp" line="619"/>
<source>Append file</source>
<translation>Lägg till fil</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<location filename="../src/GUI/gui.cpp" line="620"/>
<source>Next/Previous</source>
<translation>Nästa/Föregående</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="618"/>
<location filename="../src/GUI/gui.cpp" line="622"/>
<source>Toggle graph type</source>
<translation>Växla diagramtyp</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="620"/>
<location filename="../src/GUI/gui.cpp" line="624"/>
<source>Toggle time type</source>
<translation>Växla tidstyp</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="624"/>
<location filename="../src/GUI/gui.cpp" line="628"/>
<source>Previous map</source>
<translation>Föregående karta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="625"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Zoom in</source>
<translation>Zooma in</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="627"/>
<location filename="../src/GUI/gui.cpp" line="631"/>
<source>Zoom out</source>
<translation>Zooma ut</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="629"/>
<location filename="../src/GUI/gui.cpp" line="633"/>
<source>Digital zoom</source>
<translation>Digital zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="630"/>
<location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1127"/>
<location filename="../src/GUI/gui.cpp" line="1135"/>
<source>Open map file</source>
<translation>Öppna kartfil</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1154"/>
<location filename="../src/GUI/gui.cpp" line="1164"/>
<source>Error loading map:</source>
<translation>Fel vid inläsning av karta:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1165"/>
<location filename="../src/GUI/gui.cpp" line="1175"/>
<source>No files loaded</source>
<translation>Inga filer inlästa</translation>
</message>
<message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1169"/>
<location filename="../src/GUI/gui.cpp" line="1179"/>
<source>%n files</source>
<translation>
<numerusform>%n filer</numerusform>
@ -667,108 +641,143 @@
</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="912"/>
<location filename="../src/GUI/gui.cpp" line="915"/>
<location filename="../src/GUI/gui.cpp" line="920"/>
<location filename="../src/GUI/gui.cpp" line="923"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="904"/>
<location filename="../src/GUI/gui.cpp" line="912"/>
<source>Routes</source>
<translation>Rutter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="609"/>
<location filename="../src/GUI/gui.cpp" line="613"/>
<source>Next file</source>
<translation>Nästa fil</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="585"/>
<location filename="../src/GUI/gui.cpp" line="589"/>
<source>Version </source>
<translation>Version </translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="218"/>
<location filename="../src/GUI/gui.cpp" line="222"/>
<source>Print...</source>
<translation>Skriv ut...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="223"/>
<location filename="../src/GUI/gui.cpp" line="227"/>
<source>Export to PDF...</source>
<translation>Exportera till PDF...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="906"/>
<location filename="../src/GUI/gui.cpp" line="914"/>
<source>Waypoints</source>
<translation>Vägpunkter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="610"/>
<location filename="../src/GUI/gui.cpp" line="614"/>
<source>Previous file</source>
<translation>Föregående fil</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="310"/>
<location filename="../src/GUI/gui.cpp" line="314"/>
<source>Route waypoints</source>
<translation>Ruttvägpunkter</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="432"/>
<source>&amp;File</source>
<translation>&amp;Arkiv</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="446"/>
<source>&amp;Map</source>
<translation>&amp;Karta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="454"/>
<source>&amp;Graph</source>
<translation>&amp;Diagram</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="463"/>
<source>&amp;POI</source>
<translation>&amp;POI</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="475"/>
<source>&amp;Data</source>
<translation>Da&amp;ta</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="484"/>
<source>&amp;Settings</source>
<translation>&amp;Inställningar</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="502"/>
<source>&amp;Help</source>
<translation>&amp;Hjälp</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="616"/>
<source>First file</source>
<translation>Första filen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="614"/>
<location filename="../src/GUI/gui.cpp" line="618"/>
<source>Last file</source>
<translation>Sista filen</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="740"/>
<location filename="../src/GUI/gui.cpp" line="746"/>
<source>Error loading data file:</source>
<translation>Fel vid inläsning av datafil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="743"/>
<location filename="../src/GUI/gui.cpp" line="768"/>
<location filename="../src/GUI/gui.cpp" line="749"/>
<location filename="../src/GUI/gui.cpp" line="776"/>
<source>Line: %1</source>
<translation>Rad: %1</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="765"/>
<location filename="../src/GUI/gui.cpp" line="773"/>
<source>Error loading POI file:</source>
<translation>Fel vid inläsning av POI-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="898"/>
<location filename="../src/GUI/gui.cpp" line="906"/>
<source>Name</source>
<translation>Namn</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="902"/>
<location filename="../src/GUI/gui.cpp" line="910"/>
<source>Tracks</source>
<translation>Spår</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="207"/>
<location filename="../src/GUI/gui.cpp" line="584"/>
<location filename="../src/GUI/gui.cpp" line="211"/>
<location filename="../src/GUI/gui.cpp" line="588"/>
<source>About GPXSee</source>
<translation>Om GPXSee</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="522"/>
<location filename="../src/GUI/gui.cpp" line="526"/>
<source>Navigation</source>
<translation>Navigation</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="325"/>
<location filename="../src/GUI/gui.cpp" line="922"/>
<location filename="../src/GUI/gui.cpp" line="329"/>
<location filename="../src/GUI/gui.cpp" line="930"/>
<source>Distance</source>
<translation>Avstånd</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="331"/>
<location filename="../src/GUI/gui.cpp" line="481"/>
<location filename="../src/GUI/gui.cpp" line="924"/>
<location filename="../src/GUI/gui.cpp" line="335"/>
<location filename="../src/GUI/gui.cpp" line="485"/>
<location filename="../src/GUI/gui.cpp" line="932"/>
<source>Time</source>
<translation>Tid</translation>
</message>
@ -874,27 +883,27 @@
<context>
<name>MapList</name>
<message>
<location filename="../src/map/maplist.cpp" line="131"/>
<location filename="../src/map/maplist.cpp" line="130"/>
<source>Supported files</source>
<translation>Filer som stöds</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="132"/>
<location filename="../src/map/maplist.cpp" line="131"/>
<source>OziExplorer maps</source>
<translation>OziExplorer-kartor</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="133"/>
<location filename="../src/map/maplist.cpp" line="132"/>
<source>TrekBuddy maps/atlases</source>
<translation>TrekBuddy-kartor/-atlaser</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="134"/>
<location filename="../src/map/maplist.cpp" line="133"/>
<source>GeoTIFF images</source>
<translation>GeoTIFF-bilder</translation>
</message>
<message>
<location filename="../src/map/maplist.cpp" line="135"/>
<location filename="../src/map/maplist.cpp" line="134"/>
<source>Online map sources</source>
<translation>Online-kartkällor</translation>
</message>
@ -1379,33 +1388,53 @@
<context>
<name>SpeedGraph</name>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="14"/>
<location filename="../src/GUI/speedgraph.cpp" line="16"/>
<location filename="../src/GUI/speedgraph.h" line="14"/>
<source>Speed</source>
<translation>Hastighet</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="89"/>
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="22"/>
<location filename="../src/GUI/speedgraph.cpp" line="28"/>
<source>Average</source>
<translation>Medel</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="24"/>
<location filename="../src/GUI/speedgraph.cpp" line="25"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="26"/>
<source>min/nmi</source>
<translation>min/nmi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="30"/>
<source>Maximum</source>
<translation>Max</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="83"/>
<location filename="../src/GUI/speedgraph.cpp" line="32"/>
<source>Pace</source>
<translation>Tempo</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
<source>kn</source>
<translation>knop</translation>
</message>
<message>
<location filename="../src/GUI/speedgraph.cpp" line="86"/>
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
@ -1413,30 +1442,50 @@
<context>
<name>SpeedGraphItem</name>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="21"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="22"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="23"/>
<source>kn</source>
<translation>knop</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="24"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<source>min/km</source>
<translation>min/km</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/mi</source>
<translation>min/mi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="27"/>
<source>min/nmi</source>
<translation>min/nmi</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="29"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="26"/>
<location filename="../src/GUI/speedgraphitem.cpp" line="31"/>
<source>Average</source>
<translation>Medel</translation>
</message>
<message>
<location filename="../src/GUI/speedgraphitem.cpp" line="33"/>
<source>Pace</source>
<translation>Tempo</translation>
</message>
</context>
<context>
<name>TemperatureGraph</name>

View File

@ -115,6 +115,54 @@
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>plt</string>
</array>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/vnd.oziexplorer.plt</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>icons/plt.icns</string>
<key>CFBundleTypeName</key>
<string>OziExplorer Track Point File</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>rte</string>
</array>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/vnd.oziexplorer.rte</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>icons/rte.icns</string>
<key>CFBundleTypeName</key>
<string>OziExplorer Route File</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>wpt</string>
</array>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/vnd.oziexplorer.wpt</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>icons/wpt.icns</string>
<key>CFBundleTypeName</key>
<string>OziExplorer Waypoint File</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array>
<key>UTImportedTypeDeclarations</key>
@ -245,6 +293,69 @@
<string>application/vnd.nmea.nmea</string>
</dict>
</dict>
<dict>
<key>UTTypeIdentifier</key>
<string>com.oziexplorer3.plt</string>
<key>UTTypeReferenceURL</key>
<string>http://www.oziexplorer3.com/eng/help/fileformats.html</string>
<key>UTTypeDescription</key>
<string>OziExplorer Track Point File</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>plt</string>
</array>
<key>public.mime-type</key>
<string>application/vnd.oziexplorer.plt</string>
</dict>
</dict>
<dict>
<key>UTTypeIdentifier</key>
<string>com.oziexplorer3.plt</string>
<key>UTTypeReferenceURL</key>
<string>http://www.oziexplorer3.com/eng/help/fileformats.html</string>
<key>UTTypeDescription</key>
<string>OziExplorer Route File</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>rte</string>
</array>
<key>public.mime-type</key>
<string>application/vnd.oziexplorer.rte</string>
</dict>
</dict>
<dict>
<key>UTTypeIdentifier</key>
<string>com.oziexplorer3.plt</string>
<key>UTTypeReferenceURL</key>
<string>http://www.oziexplorer3.com/eng/help/fileformats.html</string>
<key>UTTypeDescription</key>
<string>OziExplorer Waypoint File</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>wpt</string>
</array>
<key>public.mime-type</key>
<string>application/vnd.oziexplorer.wpt</string>
</dict>
</dict>
</array>
</dict>

View File

@ -8,11 +8,11 @@
<summary>GPS log file viewer and analyzer</summary>
<description>
<p>GPXSee is a GPS log file viewer and analyzer that supports GPX, TCX,
KML, FIT, IGC and NMEA files.</p>
KML, FIT, IGC, NMEA and OziExplorer files.</p>
<p>Features:</p>
<ul>
<li>User-definable online maps.</li>
<li>User-definable online maps (OSM/Google tiles, WMTS, WMS).</li>
<li>Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF
images).</li>
<li>Elevation, speed, heart rate, cadence, power and temperature
@ -21,7 +21,8 @@
<li>Support for POI files.</li>
<li>Print/export to PDF.</li>
<li>Full-screen mode.</li>
<li>Opens GPX, TCX, FIT, KML, IGC, NMEA and Garmin CSV files.</li>
<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, OziExplorer (PLT, WPT, RTE)
and Garmin CSV files.</li>
</ul>
</description>
@ -54,5 +55,8 @@
<mimetype>application/vnd.google-earth.kml+xml</mimetype>
<mimetype>application/vnd.fai.igc</mimetype>
<mimetype>application/vnd.nmea.nmea</mimetype>
<mimetype>application/vnd.oziexplorer.plt</mimetype>
<mimetype>application/vnd.oziexplorer.rte</mimetype>
<mimetype>application/vnd.oziexplorer.wpt</mimetype>
</mimetypes>
</component>

View File

@ -21,7 +21,7 @@ Canton Astro 1966,4716,6716,9122,7022,8901,9603,298,-304,-375
Cape,4222,6222,9122,7012,8901,9603,-136,-108,-292
Cape Canaveral,4717,6717,9122,7008,8901,9603,-2,150,181
Carthage,4223,6223,9122,7012,8901,9603,-263,6,431
CH-1903,4149,6149,9122,7004,8901,9603,674,15,405
CH-1903,4149,6149,9122,7004,8901,9603,674.374,15.056,405.343
Chatham 1971,4672,6672,9122,7022,8901,9603,175,-38,113
Chua Astro,4224,6224,9122,7022,8901,9603,-134,229,-29
Corrego Alegre,4225,6225,9122,7022,8901,9603,-206,172,-6
@ -29,6 +29,7 @@ Djakarta (Batavia),4211,6211,9122,7004,8901,9603,-377,681,-50
DOS 1968,,,9122,7022,8901,9603,230,-199,-752
Easter Island 1967,4719,6719,9122,7022,8901,9603,211,147,111
Egypt,4199,6199,9122,7022,8901,9603,-130,-117,-151
ETRS 89,4258,6258,9122,7019,8901,9603,0,0,0
European 1950,4230,6230,9122,7022,8901,9603,-87,-98,-121
European 1950 (Mean France),,,9122,7022,8901,9603,-87,-96,-120
European 1950 (Spain and Portugal),,,9122,7022,8901,9603,-84,-107,-120
@ -104,6 +105,7 @@ Rijksdriehoeksmeting,4289,6289,9122,7004,8901,9603,593,26,478
Rome 1940,4806,6806,9122,7022,8906,9603,-225,-65,9
RT 90,4124,6124,9122,7004,8901,9603,498,-36,568
S42,4179,6179,9122,7024,8901,9603,28,-121,-77
S42 (83),4178,6178,9122,7024,8901,9603,26,-121,-78
Santo (DOS),4730,6730,9122,7022,8901,9603,170,42,84
Sao Braz,4184,6184,9122,7022,8901,9603,-203,141,53
Sapper Hill 1943,4292,6292,9122,7022,8901,9603,-355,16,74

1 Adindan 4201 6201 9122 7012 8901 9603 -162 -12 206
21 Cape 4222 6222 9122 7012 8901 9603 -136 -108 -292
22 Cape Canaveral 4717 6717 9122 7008 8901 9603 -2 150 181
23 Carthage 4223 6223 9122 7012 8901 9603 -263 6 431
24 CH-1903 4149 6149 9122 7004 8901 9603 674 674.374 15 15.056 405 405.343
25 Chatham 1971 4672 6672 9122 7022 8901 9603 175 -38 113
26 Chua Astro 4224 6224 9122 7022 8901 9603 -134 229 -29
27 Corrego Alegre 4225 6225 9122 7022 8901 9603 -206 172 -6
29 DOS 1968 9122 7022 8901 9603 230 -199 -752
30 Easter Island 1967 4719 6719 9122 7022 8901 9603 211 147 111
31 Egypt 4199 6199 9122 7022 8901 9603 -130 -117 -151
32 ETRS 89 4258 6258 9122 7019 8901 9603 0 0 0
33 European 1950 4230 6230 9122 7022 8901 9603 -87 -98 -121
34 European 1950 (Mean France) 9122 7022 8901 9603 -87 -96 -120
35 European 1950 (Spain and Portugal) 9122 7022 8901 9603 -84 -107 -120
105 Rome 1940 4806 6806 9122 7022 8906 9603 -225 -65 9
106 RT 90 4124 6124 9122 7004 8901 9603 498 -36 568
107 S42 4179 6179 9122 7024 8901 9603 28 -121 -77
108 S42 (83) 4178 6178 9122 7024 8901 9603 26 -121 -78
109 Santo (DOS) 4730 6730 9122 7022 8901 9603 170 42 84
110 Sao Braz 4184 6184 9122 7022 8901 9603 -203 141 53
111 Sapper Hill 1943 4292 6292 9122 7022 8901 9603 -355 16 74

File diff suppressed because it is too large Load Diff

View File

@ -4,9 +4,10 @@ Comment=GPS log file viewer and analyzer
Comment[cz]=Prohlížeč a analyzátor GPS logů
Comment[fi]=Ohjelma GPS-lokien katseluun ja analysointiin
Comment[ru]=Программа для просмотра и анализа GPS логов
Comment[sv]=GPS-loggfilsläsare och analysator
Exec=gpxsee %F
Icon=gpxsee
Terminal=false
Type=Application
Categories=Graphics;Viewer;Maps;Qt;
MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;
MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;

View File

@ -5,14 +5,14 @@
; The name of the installer
Name "GPXSee"
; Program version
!define VERSION "5.2"
!define VERSION "5.8"
; The file to write
OutFile "GPXSee-${VERSION}.exe"
; Compression method
SetCompressor /SOLID lzma
; Required execution level
; Required execution level
RequestExecutionLevel admin
; The default installation directory
@ -26,7 +26,7 @@ VIAddVersionKey "ProductName" "GPXSee"
VIAddVersionKey "LegalCopyright" "GPXSee project"
VIAddVersionKey "FileDescription" "GPXSee installer"
; Registry key to check for directory (so if you install again, it will
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
@ -39,11 +39,14 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
!define REGFIT "GPXSee.fit"
!define REGIGC "GPXSee.igc"
!define REGNMEA "GPXSee.nmea"
!define REGPLT "GPXSee.plt"
!define REGRTE "GPXSee.rte"
!define REGWPT "GPXSee.wpt"
; Start menu page configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
Var StartMenuFolder
@ -77,10 +80,10 @@ FunctionEnd
Section "GPXSee" SEC_APP
SectionIn RO
; Set output path to the installation directory.
; Set output path to the installation directory
SetOutPath $INSTDIR
; Put the files there
File "gpxsee.exe"
File /r "maps"
@ -88,14 +91,14 @@ Section "GPXSee" SEC_APP
; Create start menu entry and add links
SetShellVarContext all
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
!insertmacro MUI_STARTMENU_WRITE_END
; Create the uninstaller
WriteUninstaller "$INSTDIR\uninstall.exe"
WriteUninstaller "$INSTDIR\uninstall.exe"
; Write the installation path into the registry
DetailPrint "Registering application..."
@ -113,28 +116,40 @@ Section "GPXSee" SEC_APP
DetailPrint "Associating file types..."
WriteRegStr HKCR ".gpx" "" "${REGGPX}"
WriteRegStr HKCR "${REGGPX}" "" "GPS Exchange Format"
WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".tcx" "" "${REGTCX}"
WriteRegStr HKCR "${REGTCX}" "" "Training Center XML"
WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".kml" "" "${REGKML}"
WriteRegStr HKCR "${REGKML}" "" "Keyhole Markup Language"
WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
WriteRegStr HKCR "${REGKML}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".fit" "" "${REGFIT}"
WriteRegStr HKCR "${REGFIT}" "" "Flexible and Interoperable Data Transfer"
WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
WriteRegStr HKCR "${REGFIT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".igc" "" "${REGIGC}"
WriteRegStr HKCR "${REGIGC}" "" "Flight Recorder Data Format"
WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
WriteRegStr HKCR "${REGIGC}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".nmea" "" "${REGNMEA}"
WriteRegStr HKCR "${REGNMEA}" "" "NMEA 0183 data"
WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7"
WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".plt" "" "${REGPLT}"
WriteRegStr HKCR "${REGPLT}" "" "OziExplorer Track Point File"
WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8"
WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".rte" "" "${REGRTE}"
WriteRegStr HKCR "${REGRTE}" "" "OziExplorer Route File"
WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9"
WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".wpt" "" "${REGWPT}"
WriteRegStr HKCR "${REGWPT}" "" "OziExplorer Waypoint File"
WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
@ -152,7 +167,7 @@ Section "QT framework" SEC_QT
File /r "platforms"
File /r "imageformats"
File /r "printsupport"
SectionEnd
Section "MSVC runtime" SEC_MSVC
@ -215,6 +230,11 @@ SectionGroup "Localization" SEC_LOCALIZATION
File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
File /oname=translations\qt_de.qm translations\qt_de.qm
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"
CreateDirectory "$INSTDIR\translations"
File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
@ -231,7 +251,7 @@ SectionGroupEnd
; Uninstaller
Section "Uninstall"
; Remove registry keys
DeleteRegKey HKLM "${REGENTRY}"
DeleteRegKey HKLM SOFTWARE\GPXSee
@ -258,7 +278,13 @@ Section "Uninstall"
DeleteRegKey HKCR ".igc"
DeleteRegKey HKCR "${REGNMEA}"
DeleteRegKey HKCR ".nmea"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
DeleteRegKey HKCR "${REGPLT}"
DeleteRegKey HKCR ".plt"
DeleteRegKey HKCR "${REGRTE}"
DeleteRegKey HKCR ".rte"
DeleteRegKey HKCR "${REGWPT}"
DeleteRegKey HKCR ".wpt"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd

View File

@ -43,4 +43,24 @@
<glob pattern="*.nmea"/>
</mime-type>
<mime-type type="application/vnd.oziexplorer.plt">
<comment>OziExplorer Track Point File</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-plain"/>
<glob pattern="*.plt"/>
</mime-type>
<mime-type type="application/vnd.oziexplorer.rte">
<comment>OziExplorer Route File</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-plain"/>
<glob pattern="*.rte"/>
</mime-type>
<mime-type type="application/vnd.oziexplorer.wpt">
<comment>OziExplorer Waypoint File</comment>
<sub-class-of type="text/plain"/>
<generic-icon name="text-plain"/>
<glob pattern="*.wpt"/>
</mime-type>
</mime-info>

View File

@ -5,14 +5,14 @@
; The name of the installer
Name "GPXSee"
; Program version
!define VERSION "5.2"
!define VERSION "5.8"
; The file to write
OutFile "GPXSee-${VERSION}_x64.exe"
; Compression method
SetCompressor /SOLID lzma
; Required execution level
; Required execution level
RequestExecutionLevel admin
; The default installation directory
@ -26,7 +26,7 @@ VIAddVersionKey "ProductName" "GPXSee"
VIAddVersionKey "LegalCopyright" "GPXSee project"
VIAddVersionKey "FileDescription" "GPXSee installer (x64)"
; Registry key to check for directory (so if you install again, it will
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
@ -39,11 +39,14 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
!define REGFIT "GPXSee.fit"
!define REGIGC "GPXSee.igc"
!define REGNMEA "GPXSee.nmea"
!define REGPLT "GPXSee.plt"
!define REGRTE "GPXSee.rte"
!define REGWPT "GPXSee.wpt"
; Start menu page configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
Var StartMenuFolder
@ -71,31 +74,31 @@ Function .onInit
MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
Abort
${EndIf}
${If} ${RunningX64}
SetRegView 64
${Else}
MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems."
Abort
${Else}
MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems."
Abort
${EndIf}
FunctionEnd
FunctionEnd
; The stuff to install
Section "GPXSee" SEC_APP
SectionIn RO
; Set output path to the installation directory.
; Set output path to the installation directory
SetOutPath $INSTDIR
; Put the files there
File "gpxsee.exe"
File /r "maps"
File /r "csv"
; Create start menu entry and add links
SetShellVarContext all
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
@ -103,7 +106,7 @@ Section "GPXSee" SEC_APP
; Create the uninstaller
WriteUninstaller "$INSTDIR\uninstall.exe"
; Write the installation path into the registry
DetailPrint "Registering application..."
WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
@ -120,29 +123,41 @@ Section "GPXSee" SEC_APP
DetailPrint "Associating file types..."
WriteRegStr HKCR ".gpx" "" "${REGGPX}"
WriteRegStr HKCR "${REGGPX}" "" "GPS Exchange Format"
WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".tcx" "" "${REGTCX}"
WriteRegStr HKCR "${REGTCX}" "" "Training Center XML"
WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".kml" "" "${REGKML}"
WriteRegStr HKCR "${REGKML}" "" "Keyhole Markup Language"
WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
WriteRegStr HKCR "${REGKML}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".fit" "" "${REGFIT}"
WriteRegStr HKCR "${REGFIT}" "" "Flexible and Interoperable Data Transfer"
WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
WriteRegStr HKCR "${REGFIT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".igc" "" "${REGIGC}"
WriteRegStr HKCR "${REGIGC}" "" "Flight Recorder Data Format"
WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
WriteRegStr HKCR "${REGIGC}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".nmea" "" "${REGNMEA}"
WriteRegStr HKCR "${REGNMEA}" "" "NMEA 0183 data"
WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7"
WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".plt" "" "${REGPLT}"
WriteRegStr HKCR "${REGPLT}" "" "OziExplorer Track Point File"
WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8"
WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".rte" "" "${REGRTE}"
WriteRegStr HKCR "${REGRTE}" "" "OziExplorer Route File"
WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9"
WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
WriteRegStr HKCR ".wpt" "" "${REGWPT}"
WriteRegStr HKCR "${REGWPT}" "" "OziExplorer Waypoint File"
WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
@ -159,7 +174,7 @@ Section "QT framework" SEC_QT
File /r "platforms"
File /r "imageformats"
File /r "printsupport"
SectionEnd
Section "MSVC runtime" SEC_MSVC
@ -217,6 +232,11 @@ SectionGroup "Localization" SEC_LOCALIZATION
File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
File /oname=translations\qt_de.qm translations\qt_de.qm
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"
CreateDirectory "$INSTDIR\translations"
File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
@ -233,7 +253,7 @@ SectionGroupEnd
; Uninstaller
Section "Uninstall"
; Remove registry keys
SetRegView 64
DeleteRegKey HKLM "${REGENTRY}"
@ -247,7 +267,7 @@ Section "Uninstall"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
RMDir "$SMPROGRAMS\$StartMenuFolder"
; Remove File associations
DeleteRegKey HKCR "${REGGPX}"
DeleteRegKey HKCR ".gpx"
@ -261,6 +281,12 @@ Section "Uninstall"
DeleteRegKey HKCR ".igc"
DeleteRegKey HKCR "${REGNMEA}"
DeleteRegKey HKCR ".nmea"
DeleteRegKey HKCR "${REGPLT}"
DeleteRegKey HKCR ".plt"
DeleteRegKey HKCR "${REGRTE}"
DeleteRegKey HKCR ".rte"
DeleteRegKey HKCR "${REGWPT}"
DeleteRegKey HKCR ".wpt"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<map>
<map xmlns="http://www.gpxsee.org/map/1">
<name>4UMaps</name>
<url>http://4umaps.eu/$z/$x/$y.png</url>
<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
<zoom min="2" max="15"/>
<bounds bottom="-65"/>
<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
</map>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map>
<map xmlns="http://www.gpxsee.org/map/1">
<name>Open Street Map</name>
<url>http://tile.openstreetmap.org/$z/$x/$y.png</url>
<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © OpenStreetMap (CC-BY-SA)</copyright>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map>
<map xmlns="http://www.gpxsee.org/map/1">
<name>Open Topo Map</name>
<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
<zoom max="17"/>
<copyright>Map data: © OpenStreetMap contributors (ODbL), SRTM | Rendering: © OpenTopoMap (CC-BY-SA)</copyright>
<zoom max="17"/>
</map>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<map>
<map xmlns="http://www.gpxsee.org/map/1">
<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>
<zoom min="2" max="15"/>
<bounds bottom="0" top="74"/>
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
</map>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map>
<map xmlns="http://www.gpxsee.org/map/1">
<name>USGS Topo</name>
<url>https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png</url>
<zoom min="2" max="15"/>
<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>
<zoom min="2" max="15"/>
</map>

View File

@ -4,7 +4,9 @@
#include <QFileOpenEvent>
#include <QNetworkProxyFactory>
#include <QLibraryInfo>
#include "map/onlinemap.h"
#include "map/wmts.h"
#include "map/wms.h"
#include "map/tileloader.h"
#include "map/downloader.h"
#include "map/ellipsoid.h"
#include "map/gcs.h"
@ -23,12 +25,12 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
installTranslator(gpxsee);
QTranslator *qt = new QTranslator(this);
#if defined(Q_OS_WINDOWS) || defined(Q_OS_MAC)
#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
qt->load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR);
#else // Q_OS_WINDOWS || Q_OS_MAC
#else // Q_OS_WIN32 || Q_OS_MAC
qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
QLibraryInfo::TranslationsPath));
#endif // Q_OS_WINDOWS || Q_OS_MAC
#endif // Q_OS_WIN32 || Q_OS_MAC
installTranslator(qt);
#ifdef Q_OS_MAC
@ -36,7 +38,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
#endif // Q_OS_MAC
QNetworkProxyFactory::setUseSystemConfiguration(true);
OnlineMap::setDownloader(new Downloader(this));
Downloader *dl = new Downloader(this);
TileLoader::setDownloader(dl);
WMTS::setDownloader(dl);
WMS::setDownloader(dl);
OPENGL_SET_SAMPLES(4);
loadDatums();
loadPCSs();

View File

@ -73,10 +73,10 @@ QString Format::distance(qreal value, Units units)
QString Format::elevation(qreal value, Units units)
{
if (units == Metric)
return QString::number(value, 'f', 0) + UNIT_SPACE
return QString::number(qRound(value)) + UNIT_SPACE
+ qApp->translate("Format", "m");
else
return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
return QString::number(qRound(value * M2FT)) + UNIT_SPACE
+ qApp->translate("Format", "ft");
}

View File

@ -12,6 +12,7 @@ class GraphItem : public QGraphicsObject
public:
GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent = 0);
virtual ~GraphItem() {}
QPainterPath shape() const {return _shape;}
QRectF boundingRect() const {return _shape.boundingRect();}

View File

@ -16,6 +16,7 @@ class GraphTab : public GraphView
public:
GraphTab(QWidget *parent = 0) : GraphView(parent)
{setFrameShape(QFrame::NoFrame);}
virtual ~GraphTab() {}
virtual QString label() const = 0;
virtual void loadData(const Data &data, const QList<PathItem *> &paths) = 0;

View File

@ -81,12 +81,12 @@ GraphView::~GraphView()
void GraphView::createXLabel()
{
_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel).arg(_xUnits));
_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel, _xUnits));
}
void GraphView::createYLabel()
{
_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel).arg(_yUnits));
_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel, _yUnits));
}
void GraphView::setYLabel(const QString &label)

View File

@ -82,6 +82,10 @@ GUI::GUI()
_sliderPos = 0;
_dataDir = QDir::homePath();
_mapDir = QDir::homePath();
_poiDir = QDir::homePath();
readSettings();
updateGraphTabs();
@ -425,7 +429,7 @@ void GUI::createActions()
void GUI::createMenus()
{
QMenu *fileMenu = menuBar()->addMenu(tr("File"));
QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
fileMenu->addAction(_openFileAction);
fileMenu->addSeparator();
fileMenu->addAction(_printFileAction);
@ -439,7 +443,7 @@ void GUI::createMenus()
fileMenu->addAction(_exitAction);
#endif // Q_OS_MAC
_mapMenu = menuBar()->addMenu(tr("Map"));
_mapMenu = menuBar()->addMenu(tr("&Map"));
_mapMenu->addActions(_mapActions);
_mapsEnd = _mapMenu->addSeparator();
_mapMenu->addAction(_loadMapAction);
@ -447,7 +451,7 @@ void GUI::createMenus()
_mapMenu->addSeparator();
_mapMenu->addAction(_showMapAction);
QMenu *graphMenu = menuBar()->addMenu(tr("Graph"));
QMenu *graphMenu = menuBar()->addMenu(tr("&Graph"));
graphMenu->addAction(_distanceGraphAction);
graphMenu->addAction(_timeGraphAction);
graphMenu->addSeparator();
@ -456,7 +460,7 @@ void GUI::createMenus()
graphMenu->addSeparator();
graphMenu->addAction(_showGraphsAction);
QMenu *poiMenu = menuBar()->addMenu(tr("POI"));
QMenu *poiMenu = menuBar()->addMenu(tr("&POI"));
_poiFilesMenu = poiMenu->addMenu(tr("POI files"));
_poiFilesMenu->addActions(_poiFilesActions);
poiMenu->addSeparator();
@ -468,7 +472,7 @@ void GUI::createMenus()
poiMenu->addSeparator();
poiMenu->addAction(_showPOIAction);
QMenu *dataMenu = menuBar()->addMenu(tr("Data"));
QMenu *dataMenu = menuBar()->addMenu(tr("&Data"));
QMenu *displayMenu = dataMenu->addMenu(tr("Display"));
displayMenu->addAction(_showWaypointLabelsAction);
displayMenu->addAction(_showRouteWaypointsAction);
@ -477,7 +481,7 @@ void GUI::createMenus()
dataMenu->addAction(_showRoutesAction);
dataMenu->addAction(_showWaypointsAction);
QMenu *settingsMenu = menuBar()->addMenu(tr("Settings"));
QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings"));
QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
timeMenu->addAction(_totalTimeAction);
timeMenu->addAction(_movingTimeAction);
@ -495,7 +499,7 @@ void GUI::createMenus()
settingsMenu->addSeparator();
settingsMenu->addAction(_openOptionsAction);
QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(_pathsAction);
helpMenu->addAction(_keysAction);
helpMenu->addSeparator();
@ -660,11 +664,13 @@ void GUI::paths()
void GUI::openFile()
{
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open file"),
QString(), Data::formats());
_dataDir, Data::formats());
QStringList list = files;
for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
openFile(*it);
if (!list.isEmpty())
_dataDir = QFileInfo(list.first()).path();
}
bool GUI::openFile(const QString &fileName)
@ -749,11 +755,13 @@ bool GUI::loadFile(const QString &fileName)
void GUI::openPOIFile()
{
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open POI file"),
QString(), Data::formats());
_poiDir, Data::formats());
QStringList list = files;
for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
openPOIFile(*it);
if (!list.isEmpty())
_poiDir = QFileInfo(list.first()).path();
}
bool GUI::openPOIFile(const QString &fileName)
@ -1125,11 +1133,13 @@ void GUI::showGraphSliderInfo(bool show)
void GUI::loadMap()
{
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open map file"),
QString(), MapList::formats());
_mapDir, MapList::formats());
QStringList list = files;
for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
loadMap(*it);
if (!list.isEmpty())
_mapDir = QFileInfo(list.first()).path();
}
bool GUI::loadMap(const QString &fileName)

View File

@ -224,6 +224,8 @@ private:
Export _export;
Options _options;
QString _dataDir, _mapDir, _poiDir;
};
#endif // GUI_H

View File

@ -23,7 +23,7 @@ void InfoItem::updateBoundingRect()
for (i = _list.constBegin(); i != _list.constEnd(); i++) {
width += fm.width(i->key + ": ");
width += fm.width(i->value) + ((i == _list.end() - 1) ? 0 : PADDING);
width += fm.width(i->value) + ((i == _list.constEnd() - 1) ? 0 : PADDING);
}
_boundingRect = QRectF(0, 0, width, _list.isEmpty() ? 0 : fm.height());
@ -49,8 +49,8 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->drawText(width, fm.height() - fm.descent(), i->key + ": ");
width += fm.width(i->key + ": ");
painter->drawText(width, fm.height() - fm.descent(), i->value);
width += fm.width(i->value) + ((i == _list.end() - 1) ? 0 : PADDING);
if (i != _list.end() - 1) {
width += fm.width(i->value) + ((i == _list.constEnd() - 1) ? 0 : PADDING);
if (i != _list.constEnd() - 1) {
painter->save();
painter->setPen(Qt::gray);
painter->drawLine(width - PADDING/2, fm.descent(),

View File

@ -76,6 +76,7 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
_digitalZoom = 0;
_map->setBackgroundColor(_backgroundColor);
_res = _map->resolution(_map->bounds());
_scene->setSceneRect(_map->bounds());
centerOn(_scene->sceneRect().center());
@ -84,18 +85,8 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
void MapView::centerOn(const QPointF &pos)
{
QGraphicsView::centerOn(pos);
/* Fix the offset caused by QGraphicsView::centerOn() approximation */
QPointF center = mapToScene(viewport()->rect().center());
QPoint offset((int)(pos.x() - center.x()), (int)(pos.y() - center.y()));
if (qAbs(offset.x()) == 1)
horizontalScrollBar()->setValue(horizontalScrollBar()->value()
+ offset.x());
if (qAbs(offset.y()) == 1)
verticalScrollBar()->setValue(verticalScrollBar()->value()
+ offset.y());
_res = _map->resolution(pos);
QRectF vr(mapToScene(viewport()->rect()).boundingRect());
_res = _map->resolution(vr);
_mapScale->setResolution(_res);
}
@ -159,7 +150,7 @@ void MapView::addWaypoints(const QList<Waypoint> &waypoints)
WaypointItem *wi = new WaypointItem(w, _map);
_waypoints.append(wi);
_wr.unite(wi->waypoint().coordinates());
_wr = _wr.united(wi->waypoint().coordinates());
wi->setZValue(1);
wi->setSize(_waypointSize);
wi->setColor(_waypointColor);
@ -177,7 +168,7 @@ void MapView::addWaypoints(const QList<Waypoint> &waypoints)
QList<PathItem *> MapView::loadData(const Data &data)
{
QList<PathItem *> paths;
qreal zoom = _map->zoom();
int zoom = _map->zoom();
for (int i = 0; i < data.tracks().count(); i++)
paths.append(addTrack(*(data.tracks().at(i))));
@ -188,7 +179,7 @@ QList<PathItem *> MapView::loadData(const Data &data)
if (_tracks.empty() && _routes.empty() && _waypoints.empty())
return paths;
if (mapZoom() != zoom)
if (fitMapZoom() != zoom)
rescale();
else
updatePOIVisibility();
@ -198,13 +189,13 @@ QList<PathItem *> MapView::loadData(const Data &data)
return paths;
}
qreal MapView::mapZoom() const
int MapView::fitMapZoom() const
{
RectC br = _tr | _rr | _wr;
return _map->zoomFit(viewport()->size() - QSize(2*MARGIN, 2*MARGIN),
br.isNull() ? RectC(_map->xy2ll(sceneRect().topLeft()),
_map->xy2ll(sceneRect().bottomRight())) : br);
br.isNull() ? RectC(_map->xy2ll(_map->bounds().topLeft()),
_map->xy2ll(_map->bounds().bottomRight())) : br);
}
QPointF MapView::contentCenter() const
@ -267,9 +258,9 @@ void MapView::setPalette(const Palette &palette)
void MapView::setMap(Map *map)
{
QPointF pos = mapToScene(viewport()->rect().center());
Coordinates center = _map->xy2ll(pos);
qreal resolution = _map->resolution(pos);
QRectF vr(mapToScene(viewport()->rect()).boundingRect()
.intersected(_map->bounds()));
RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
_map->unload();
disconnect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
@ -281,7 +272,7 @@ void MapView::setMap(Map *map)
digitalZoom(0);
_map->zoomFit(resolution, center);
_map->zoomFit(viewport()->rect().size(), cr);
_scene->setSceneRect(_map->bounds());
for (int i = 0; i < _tracks.size(); i++)
@ -296,7 +287,10 @@ void MapView::setMap(Map *map)
it.value()->setMap(_map);
updatePOIVisibility();
centerOn(_map->ll2xy(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();
QPixmapCache::clear();
@ -398,7 +392,10 @@ void MapView::setCoordinatesFormat(CoordinatesFormat format)
void MapView::clearMapCache()
{
_map->clearCache();
resetCachedContent();
fitMapZoom();
rescale();
centerOn(contentCenter());
}
void MapView::digitalZoom(int zoom)
@ -499,9 +496,9 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
bool hires)
{
QRect orig, adj;
qreal ratio, diff, origRes, q;
qreal ratio, diff, q;
QPointF origScene, origPos;
Coordinates origLL;
RectC origC;
// Enter plot mode
@ -526,9 +523,9 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
// Adjust the view for printing
if (hires) {
origScene = mapToScene(orig.center());
origLL = _map->xy2ll(origScene);
origRes = _map->resolution(origScene);
QRectF vr(mapToScene(orig).boundingRect());
origC = RectC(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
origScene = vr.center();
QPointF s(painter->device()->logicalDpiX()
/ (qreal)metric(QPaintDevice::PdmDpiX),
@ -558,7 +555,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
// Revert view changes to display mode
if (hires) {
_map->zoomFit(origRes, origLL);
_map->zoomFit(orig.size(), origC);
rescale();
centerOn(origScene);
}
@ -761,25 +758,22 @@ void MapView::setBackgroundColor(const QColor &color)
void MapView::drawBackground(QPainter *painter, const QRectF &rect)
{
painter->fillRect(rect, _backgroundColor);
if (_showMap) {
QRectF ir = rect.intersected(_map->bounds());
if (_opacity < 1.0 || ir != rect)
painter->fillRect(rect, _backgroundColor);
if (_opacity < 1.0)
painter->setOpacity(_opacity);
_map->draw(painter, ir);
} else
painter->fillRect(rect, _backgroundColor);
}
}
void MapView::resizeEvent(QResizeEvent *event)
{
QGraphicsView::resizeEvent(event);
qreal zoom = _map->zoom();
if (mapZoom() != zoom)
int zoom = _map->zoom();
if (fitMapZoom() != zoom)
rescale();
centerOn(contentCenter());
@ -800,8 +794,8 @@ void MapView::scrollContentsBy(int dx, int dy)
{
QGraphicsView::scrollContentsBy(dx, dy);
QPointF center = mapToScene(viewport()->rect().center());
qreal res = _map->resolution(center);
QRectF sr(mapToScene(viewport()->rect()).boundingRect());
qreal res = _map->resolution(sr);
if (qMax(res, _res) / qMin(res, _res) > 1.1) {
_mapScale->setResolution(res);

View File

@ -80,7 +80,7 @@ private:
void loadPOI();
void clearPOI();
qreal mapZoom() const;
int fitMapZoom() const;
QPointF contentCenter() const;
void rescale();
void centerOn(const QPointF &pos);

View File

@ -1,16 +1,18 @@
#include "data/data.h"
#include "config.h"
#include "tooltip.h"
#include "format.h"
#include "speedgraphitem.h"
#include "speedgraph.h"
SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
{
_units = Metric;
_timeType = Total;
_showTracks = true;
setYUnits(Metric);
setYUnits();
setYLabel(tr("Speed"));
setSliderPrecision(1);
@ -19,10 +21,15 @@ SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
void SpeedGraph::setInfo()
{
if (_showTracks) {
QString pace = Format::timeSpan((3600.0 / (avg() * yScale())), false);
QString pu = (_units == Metric) ? tr("min/km") : (_units == Imperial) ?
tr("min/mi") : tr("min/nmi");
GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f',
1) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
1) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Pace"), pace + UNIT_SPACE + pu);
} else
clearInfo();
}
@ -77,12 +84,12 @@ void SpeedGraph::clear()
GraphView::clear();
}
void SpeedGraph::setYUnits(Units units)
void SpeedGraph::setYUnits()
{
if (units == Nautical) {
if (_units == Nautical) {
GraphView::setYUnits(tr("kn"));
setYScale(MS2KN);
} else if (units == Imperial) {
} else if (_units == Imperial) {
GraphView::setYUnits(tr("mi/h"));
setYScale(MS2MIH);
} else {
@ -93,7 +100,9 @@ void SpeedGraph::setYUnits(Units units)
void SpeedGraph::setUnits(Units units)
{
setYUnits(units);
_units = units;
setYUnits();
setInfo();
GraphView::setUnits(units);

View File

@ -21,13 +21,14 @@ public:
private:
qreal avg() const;
qreal max() const {return bounds().bottom();}
void setYUnits(Units units);
void setYUnits();
void setInfo();
QList<QPointF> _avg;
QList<QPointF> _mavg;
enum TimeType _timeType;
Units _units;
TimeType _timeType;
bool _showTracks;
};

View File

@ -1,4 +1,5 @@
#include "tooltip.h"
#include "format.h"
#include "speedgraphitem.h"
SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type,
@ -20,11 +21,16 @@ QString SpeedGraphItem::toolTip() const
? MS2KN : MS2KMH;
QString su = (_units == Imperial) ? tr("mi/h") : (_units == Nautical)
? tr("kn") : tr("km/h");
QString pace = Format::timeSpan((3600.0 / ((_timeType == Total)
? avg() * scale : mavg() * scale)), false);
QString pu = (_units == Metric) ? tr("min/km") : (_units == Imperial) ?
tr("min/mi") : tr("min/nmi");
tt.insert(tr("Maximum"), QString::number(max() * scale, 'f', 1)
+ UNIT_SPACE + su);
tt.insert(tr("Average"), QString::number((_timeType == Total)
? avg() * scale : mavg() * scale, 'f', 1) + UNIT_SPACE + su);
tt.insert(tr("Pace"), pace + UNIT_SPACE + pu);
return tt.toString();
}

View File

@ -1,50 +1,16 @@
#include "wgs84.h"
#include "coordinates.h"
#define MIN_LAT deg2rad(-90.0)
#define MAX_LAT deg2rad(90.0)
#define MIN_LON deg2rad(-180.0)
#define MAX_LON deg2rad(180.0)
qreal Coordinates::distanceTo(const Coordinates &c) const
double Coordinates::distanceTo(const Coordinates &c) const
{
qreal dLat = deg2rad(c.lat() - _lat);
qreal dLon = deg2rad(c.lon() - _lon);
qreal a = pow(sin(dLat / 2.0), 2.0)
double dLat = deg2rad(c.lat() - _lat);
double dLon = deg2rad(c.lon() - _lon);
double a = pow(sin(dLat / 2.0), 2.0)
+ cos(deg2rad(_lat)) * cos(deg2rad(c.lat())) * pow(sin(dLon / 2.0), 2.0);
return (WGS84_RADIUS * (2.0 * atan2(sqrt(a), sqrt(1.0 - a))));
}
QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const
{
qreal radDist = distance / WGS84_RADIUS;
qreal minLat = deg2rad(_lat) - radDist;
qreal maxLat = deg2rad(_lat) + radDist;
qreal minLon, maxLon;
if (minLat > MIN_LAT && maxLat < MAX_LAT) {
qreal deltaLon = asin(sin(radDist) / cos(_lat));
minLon = deg2rad(_lon) - deltaLon;
if (minLon < MIN_LON)
minLon += 2.0 * M_PI;
maxLon = deg2rad(_lon) + deltaLon;
if (maxLon > MAX_LON)
maxLon -= 2.0 * M_PI;
} else {
// a pole is within the distance
minLat = qMax(minLat, MIN_LAT);
maxLat = qMin(maxLat, MAX_LAT);
minLon = MIN_LON;
maxLon = MAX_LON;
}
return QPair<Coordinates, Coordinates>(Coordinates(rad2deg(qMin(minLon,
maxLon)), rad2deg(qMin(minLat, maxLat))), Coordinates(rad2deg(qMax(minLon,
maxLon)), rad2deg(qMax(minLat, maxLat))));
}
#ifndef QT_NO_DEBUG
QDebug operator<<(QDebug dbg, const Coordinates &c)
{

View File

@ -2,7 +2,6 @@
#define COORDINATES_H
#include <cmath>
#include <QPair>
#include <QDebug>
#ifndef M_PI
@ -15,15 +14,14 @@ class Coordinates
{
public:
Coordinates() {_lon = NAN; _lat = NAN;}
Coordinates(const Coordinates &c) {_lon = c._lon; _lat = c._lat;}
Coordinates(qreal lon, qreal lat) {_lon = lon; _lat = lat;}
Coordinates(double lon, double lat) {_lon = lon; _lat = lat;}
qreal &rlon() {return _lon;}
qreal &rlat() {return _lat;}
void setLon(qreal lon) {_lon = lon;}
void setLat(qreal lat) {_lat = lat;}
qreal lon() const {return _lon;}
qreal lat() const {return _lat;}
double &rlon() {return _lon;}
double &rlat() {return _lat;}
void setLon(double lon) {_lon = lon;}
void setLat(double lat) {_lat = lat;}
double lon() const {return _lon;}
double lat() const {return _lat;}
bool isNull() const
{return std::isnan(_lon) && std::isnan(_lat);}
@ -31,11 +29,10 @@ public:
{return (_lon >= -180.0 && _lon <= 180.0
&& _lat >= -90.0 && _lat <= 90.0);}
qreal distanceTo(const Coordinates &c) const;
QPair<Coordinates, Coordinates> boundingRect(qreal distance) const;
double distanceTo(const Coordinates &c) const;
private:
qreal _lat, _lon;
double _lat, _lon;
};
inline bool operator==(const Coordinates &c1, const Coordinates &c2)

View File

@ -8,6 +8,15 @@ void RangeF::resize(qreal size)
_max += adj;
}
RangeF RangeF::operator&(const RangeF &r) const
{
if (isNull() || r.isNull())
return RangeF();
RangeF tmp(qMax(this->_min, r._min), qMin(this->_max, r._max));
return tmp.isValid() ? tmp : RangeF();
}
#ifndef QT_NO_DEBUG
QDebug operator<<(QDebug dbg, const Range &range)
{

View File

@ -14,6 +14,11 @@ public:
int max() const {return _max;}
int size() const {return (_max - _min);}
bool isValid() const {return size() >= 0;}
void setMin(int min) {_min = min;}
void setMax(int max) {_max = max;}
private:
int _min, _max;
};
@ -24,10 +29,19 @@ public:
RangeF() {_min = 0; _max = 0;}
RangeF(qreal min, qreal max) {_min = min, _max = max;}
RangeF operator&(const RangeF &r) const;
RangeF &operator&=(const RangeF &r) {*this = *this & r; return *this;}
qreal min() const {return _min;}
qreal max() const {return _max;}
qreal size() const {return (_max - _min);}
bool isNull() const {return _min == 0 && _max == 0;}
bool isValid() const {return size() >= 0;}
void setMin(qreal min) {_min = min;}
void setMax(qreal max) {_max = max;}
void resize(qreal size);
private:

View File

@ -1,5 +1,41 @@
#include "wgs84.h"
#include "rectc.h"
#define MIN_LAT deg2rad(-90.0)
#define MAX_LAT deg2rad(90.0)
#define MIN_LON deg2rad(-180.0)
#define MAX_LON deg2rad(180.0)
RectC::RectC(const Coordinates &center, double radius)
{
double radDist = radius / WGS84_RADIUS;
double radLon = deg2rad(center.lon());
double radlat = deg2rad(center.lat());
double minLat = radlat - radDist;
double maxLat = radlat + radDist;
double minLon, maxLon;
if (minLat > MIN_LAT && maxLat < MAX_LAT) {
double deltaLon = asin(sin(radDist) / cos(radlat));
minLon = radLon - deltaLon;
if (minLon < MIN_LON)
minLon += 2.0 * M_PI;
maxLon = radLon + deltaLon;
if (maxLon > MAX_LON)
maxLon -= 2.0 * M_PI;
} else {
// a pole is within the distance
minLat = qMax(minLat, MIN_LAT);
maxLat = qMin(maxLat, MAX_LAT);
minLon = MIN_LON;
maxLon = MAX_LON;
}
_tl = Coordinates(rad2deg(minLon), rad2deg(maxLat));
_br = Coordinates(rad2deg(maxLon), rad2deg(minLat));
}
RectC RectC::operator|(const RectC &r) const
{
if (isNull())
@ -7,64 +43,119 @@ RectC RectC::operator|(const RectC &r) const
if (r.isNull())
return *this;
qreal l1 = _tl.lon();
qreal r1 = _tl.lon();
if (_br.lon() - _tl.lon() < 0)
double l1 = _tl.lon();
double r1 = _tl.lon();
if (_br.lon() < _tl.lon())
l1 = _br.lon();
else
r1 = _br.lon();
qreal l2 = r._tl.lon();
qreal r2 = r._tl.lon();
if (r._br.lon() - r._tl.lon() < 0)
double l2 = r._tl.lon();
double r2 = r._tl.lon();
if (r._br.lon() < r._tl.lon())
l2 = r._br.lon();
else
r2 = r._br.lon();
qreal t1 = _tl.lat();
qreal b1 = _tl.lat();
if (_br.lat() - _tl.lat() < 0)
double t1 = _tl.lat();
double b1 = _tl.lat();
if (_br.lat() > _tl.lat())
t1 = _br.lat();
else
b1 = _br.lat();
qreal t2 = r._tl.lat();
qreal b2 = r._tl.lat();
if (r._br.lat() - r._tl.lat() < 0)
double t2 = r._tl.lat();
double b2 = r._tl.lat();
if (r._br.lat() > r._tl.lat())
t2 = r._br.lat();
else
b2 = r._br.lat();
RectC tmp;
tmp._tl.setLon(qMin(l1, l2));
tmp._br.setLon(qMax(r1, r2));
tmp._tl.setLat(qMin(t1, t2));
tmp._br.setLat(qMax(b1, b2));
return tmp;
return RectC(Coordinates(qMin(l1, l2), qMax(t1, t2)),
Coordinates(qMax(r1, r2), qMin(b1, b2)));
}
void RectC::unite(const Coordinates &c)
RectC RectC::operator&(const RectC &r) const
{
if (isNull()) {
_tl = c;
_br = c;
} else {
if (c.lon() < _tl.lon())
_tl.setLon(c.lon());
if (c.lon() > _br.lon())
_br.setLon(c.lon());
if (c.lat() > _br.lat())
_br.setLat(c.lat());
if (c.lat() < _tl.lat())
_tl.setLat(c.lat());
}
if (isNull() || r.isNull())
return RectC();
double l1 = _tl.lon();
double r1 = _tl.lon();
if (_br.lon() < _tl.lon())
l1 = _br.lon();
else
r1 = _br.lon();
double l2 = r._tl.lon();
double r2 = r._tl.lon();
if (r._br.lon() < r._tl.lon())
l2 = r._br.lon();
else
r2 = r._br.lon();
if (l1 > r2 || l2 > r1)
return RectC();
double t1 = _tl.lat();
double b1 = _tl.lat();
if (_br.lat() > _tl.lat())
t1 = _br.lat();
else
b1 = _br.lat();
double t2 = r._tl.lat();
double b2 = r._tl.lat();
if (r._br.lat() > r._tl.lat())
t2 = r._br.lat();
else
b2 = r._br.lat();
if (b1 > t2 || b2 > t1)
return RectC();
return RectC(Coordinates(qMax(l1, l2), qMin(t1, t2)),
Coordinates(qMin(r1, r2), qMax(b1, b2)));
}
RectC RectC::united(const Coordinates &c) const
{
if (c.isNull())
return *this;
if (isNull())
return RectC(c, c);
double l = _tl.lon();
double r = _tl.lon();
if (_br.lon() < _tl.lon())
l = _br.lon();
else
r = _br.lon();
double t = _tl.lat();
double b = _tl.lat();
if (_br.lat() > _tl.lat())
t = _br.lat();
else
b = _br.lat();
if (c.lon() < l)
l = c.lon();
if (c.lon() > r)
r = c.lon();
if (c.lat() < b)
b = c.lat();
if (c.lat() > t)
t = c.lat();
return RectC(Coordinates(l, t), Coordinates(r, b));
}
#ifndef QT_NO_DEBUG
QDebug operator<<(QDebug dbg, const RectC &rect)
{
dbg.nospace() << "RectC(" << rect.topLeft() << ", " << rect.size() << ")";
dbg.nospace() << "RectC(" << rect.topLeft() << ", " << rect.bottomRight()
<< ")";
return dbg.space();
}
#endif // QT_NO_DEBUG

View File

@ -2,7 +2,6 @@
#define RECTC_H
#include <QDebug>
#include <QSizeF>
#include "coordinates.h"
class RectC
@ -11,6 +10,7 @@ public:
RectC() {}
RectC(const Coordinates &topLeft, const Coordinates &bottomRight)
: _tl(topLeft), _br(bottomRight) {}
RectC(const Coordinates &center, double radius);
bool isNull() const
{return _tl.isNull() && _br.isNull();}
@ -19,19 +19,16 @@ public:
Coordinates topLeft() const {return _tl;}
Coordinates bottomRight() const {return _br;}
Coordinates center() const
{return Coordinates((_tl.lon() + _br.lon()) / 2.0,
(_tl.lat() + _br.lat()) / 2.0);}
qreal width() const {return _br.lon() - _tl.lon();}
qreal height() const {return _br.lat() - _tl.lat();}
QSizeF size() const {return QSizeF(width(), height());}
RectC operator|(const RectC &r) const;
RectC &operator|=(const RectC &r) {*this = *this | r; return *this;}
RectC operator&(const RectC &r) const;
RectC &operator&=(const RectC &r) {*this = *this & r; return *this;}
void unite(const Coordinates &c);
RectC united(const Coordinates &c) const;
private:
Coordinates _tl, _br;

View File

@ -1,9 +1,9 @@
#include "csvparser.h"
bool CSVParser::parse(QFile *file, QList<TrackData> &track,
bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
QList<RouteData> &routes, QList<Waypoint> &waypoints)
{
Q_UNUSED(track);
Q_UNUSED(tracks);
Q_UNUSED(routes);
bool res;

View File

@ -8,7 +8,7 @@ class CSVParser : public Parser
public:
CSVParser() : _errorLine(0) {}
bool parse(QFile *file, QList<TrackData> &track, QList<RouteData> &routes,
bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
QList<Waypoint> &waypoints);
QString errorString() const {return _errorString;}
int errorLine() const {return _errorLine;}

View File

@ -8,6 +8,7 @@
#include "fitparser.h"
#include "igcparser.h"
#include "nmeaparser.h"
#include "oziparsers.h"
#include "data.h"
@ -18,18 +19,24 @@ static FITParser fit;
static CSVParser csv;
static IGCParser igc;
static NMEAParser nmea;
static PLTParser plt;
static WPTParser wpt;
static RTEParser rte;
static QHash<QString, Parser*> parsers()
{
QHash<QString, Parser*> hash;
hash.insert("gpx", &gpx);
hash.insert("tcx", &tcx);
hash.insert("kml", &kml);
hash.insert("fit", &fit);
hash.insert("csv", &csv);
hash.insert("igc", &igc);
hash.insert("nmea", &nmea);
hash.insert("gpx", &gpx);
hash.insert("tcx", &tcx);
hash.insert("kml", &kml);
hash.insert("fit", &fit);
hash.insert("csv", &csv);
hash.insert("igc", &igc);
hash.insert("nmea", &nmea);
hash.insert("plt", &plt);
hash.insert("wpt", &wpt);
hash.insert("rte", &rte);
return hash;
}
@ -100,11 +107,13 @@ bool Data::loadFile(const QString &fileName)
QString Data::formats()
{
return
tr("Supported files") + " (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx);;"
tr("Supported files")
+ " (*.csv *.fit *.gpx *.igc *.kml *.nmea *.plt *.rte *.tcx *.wpt);;"
+ tr("CSV files") + " (*.csv);;" + tr("FIT files") + " (*.fit);;"
+ tr("GPX files") + " (*.gpx);;" + tr("IGC files") + " (*.igc);;"
+ tr("KML files") + " (*.kml);;" + tr("NMEA files") + " (*.nmea);;"
+ tr("TCX files") + " (*.tcx);;" + tr("All files") + "(*)";
+ tr("OziExplorer files") + " (*.plt *.rte *.wpt);;"
+ tr("TCX files") + " (*.tcx);;" + tr("All files") + " (*)";
}
QStringList Data::filter()

273
src/data/oziparsers.cpp Normal file
View File

@ -0,0 +1,273 @@
#include "map/gcs.h"
#include "oziparsers.h"
static qint64 delphi2unixMS(double date)
{
return (qint64)((date - 25569.0) * 86400000);
}
bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
QList<RouteData> &routes, QList<Waypoint> &waypoints)
{
Q_UNUSED(waypoints);
Q_UNUSED(routes);
bool res;
const GCS *gcs = 0;
_errorLine = 1;
_errorString.clear();
tracks.append(TrackData());
TrackData &track = tracks.last();
while (!file->atEnd()) {
QByteArray line = file->readLine();
if (_errorLine == 1) {
if (!line.trimmed().startsWith("OziExplorer Track Point File")) {
_errorString = "Not a PLT file";
return false;
}
} else if (_errorLine == 2) {
if (!(gcs = GCS::gcs(QString(line.trimmed())))) {
_errorString = "Invalid/unknown datum";
return false;
}
} else if (_errorLine == 5) {
QList<QByteArray> list = line.split(',');
if (list.size() >= 4)
track.setName(list.at(3));
} else if (_errorLine > 6) {
QList<QByteArray> list = line.split(',');
if (list.size() < 2) {
_errorString = "Parse error";
return false;
}
qreal lat = list.at(0).trimmed().toDouble(&res);
if (!res || (lat < -90.0 || lat > 90.0)) {
_errorString = "Invalid latitude";
return false;
}
qreal lon = list.at(1).trimmed().toDouble(&res);
if (!res || (lon < -180.0 || lon > 180.0)) {
_errorString = "Invalid longitude";
return false;
}
Trackpoint tp(gcs->toWGS84(Coordinates(lon, lat)));
if (list.size() >= 4) {
QByteArray field(list.at(3).trimmed());
if (!field.isEmpty()) {
double elevation = field.toDouble(&res);
if (!res) {
_errorString = "Invalid elevation";
return false;
}
if (elevation != -777)
tp.setElevation(elevation * 0.3048);
}
}
if (list.size() >= 5) {
QByteArray field(list.at(4).trimmed());
if (!field.isEmpty()) {
double date = field.toDouble(&res);
if (!res) {
_errorString = "Invalid date";
return false;
}
tp.setTimestamp(QDateTime::fromMSecsSinceEpoch(
delphi2unixMS(date)));
}
}
track.append(tp);
}
_errorLine++;
}
return true;
}
bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
QList<RouteData> &routes, QList<Waypoint> &waypoints)
{
Q_UNUSED(waypoints);
Q_UNUSED(tracks);
bool res, record = false;
const GCS *gcs = 0;
_errorLine = 1;
_errorString.clear();
while (!file->atEnd()) {
QByteArray line = file->readLine();
if (_errorLine == 1) {
if (!line.trimmed().startsWith("OziExplorer Route File")) {
_errorString = "Not a RTE file";
return false;
}
} else if (_errorLine == 2) {
if (!(gcs = GCS::gcs(QString(line.trimmed())))) {
_errorString = "Invalid/unknown datum";
return false;
}
} else if (_errorLine > 4) {
QList<QByteArray> list = line.split(',');
if (list.size() < 2) {
_errorString = "Parse error";
return false;
}
if (list.at(0).trimmed() == "R") {
routes.append(RouteData());
record = true;
if (list.size() >= 3)
routes.last().setName(list.at(2).trimmed()
.replace('\xD1', ','));
if (list.size() >= 4)
routes.last().setDescription(list.at(3).trimmed()
.replace('\xD1', ','));
} else if (list.at(0).trimmed() == "W") {
if (!record || list.size() < 7) {
_errorString = "Parse error";
return false;
}
qreal lat = list.at(5).trimmed().toDouble(&res);
if (!res || (lat < -90.0 || lat > 90.0)) {
_errorString = "Invalid latitude";
return false;
}
qreal lon = list.at(6).trimmed().toDouble(&res);
if (!res || (lon < -180.0 || lon > 180.0)) {
_errorString = "Invalid longitude";
return false;
}
Waypoint wp(gcs->toWGS84(Coordinates(lon, lat)));
QString name(list.at(4).trimmed().replace('\xD1', ','));
if (!name.isEmpty())
wp.setName(name);
if (list.size() >= 8) {
QByteArray field(list.at(7).trimmed());
if (!field.isEmpty()) {
double date = field.toDouble(&res);
if (!res) {
_errorString = "Invalid date";
return false;
}
wp.setTimestamp(QDateTime::fromMSecsSinceEpoch(
delphi2unixMS(date)));
}
}
if (list.size() >= 14) {
QString desc(list.at(13).trimmed().replace('\xD1', ','));
if (!desc.isEmpty())
wp.setDescription(desc);
}
routes.last().append(wp);
} else {
_errorString = "Parse error";
return false;
}
}
_errorLine++;
}
return true;
}
bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
QList<RouteData> &routes, QList<Waypoint> &waypoints)
{
Q_UNUSED(tracks);
Q_UNUSED(routes);
bool res;
const GCS *gcs = 0;
_errorLine = 1;
_errorString.clear();
while (!file->atEnd()) {
QByteArray line = file->readLine();
if (_errorLine == 1) {
if (!line.trimmed().startsWith("OziExplorer Waypoint File")) {
_errorString = "Not a WPT file";
return false;
}
} else if (_errorLine == 2) {
if (!(gcs = GCS::gcs(QString(line.trimmed())))) {
_errorString = "Invalid/unknown datum";
return false;
}
} else if (_errorLine > 4) {
QList<QByteArray> list = line.split(',');
if (list.size() < 4) {
_errorString = "Parse error";
return false;
}
qreal lat = list.at(2).trimmed().toDouble(&res);
if (!res || (lat < -90.0 || lat > 90.0)) {
_errorString = "Invalid latitude";
return false;
}
qreal lon = list.at(3).trimmed().toDouble(&res);
if (!res || (lon < -180.0 || lon > 180.0)) {
_errorString = "Invalid longitude";
return false;
}
Waypoint wp(gcs->toWGS84(Coordinates(lon, lat)));
QString name(list.at(1).trimmed().replace('\xD1', ','));
if (!name.isEmpty())
wp.setName(name);
if (list.size() >= 5) {
QByteArray field(list.at(4).trimmed());
if (!field.isEmpty()) {
double date = field.toDouble(&res);
if (!res) {
_errorString = "Invalid date";
return false;
}
wp.setTimestamp(QDateTime::fromMSecsSinceEpoch(
delphi2unixMS(date)));
}
}
if (list.size() >= 11) {
QString desc(list.at(10).trimmed().replace('\xD1', ','));
if (!desc.isEmpty())
wp.setDescription(desc);
}
if (list.size() >= 15) {
QByteArray field(list.at(14).trimmed());
if (!field.isEmpty()) {
double elevation = list.at(14).trimmed().toDouble(&res);
if (!res) {
_errorString = "Invalid elevation";
return false;
}
if (elevation != -777)
wp.setElevation(elevation * 0.3048);
}
}
waypoints.append(wp);
}
_errorLine++;
}
return true;
}

51
src/data/oziparsers.h Normal file
View File

@ -0,0 +1,51 @@
#ifndef OZIPARSERS_H
#define OZIPARSERS_H
#include "parser.h"
class PLTParser : public Parser
{
public:
PLTParser() : _errorLine(0) {}
bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
QList<Waypoint> &waypoints);
QString errorString() const {return _errorString;}
int errorLine() const {return _errorLine;}
private:
QString _errorString;
int _errorLine;
};
class RTEParser : public Parser
{
public:
RTEParser() : _errorLine(0) {}
bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
QList<Waypoint> &waypoints);
QString errorString() const {return _errorString;}
int errorLine() const {return _errorLine;}
private:
QString _errorString;
int _errorLine;
};
class WPTParser : public Parser
{
public:
WPTParser() : _errorLine(0) {}
bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
QList<Waypoint> &waypoints);
QString errorString() const {return _errorString;}
int errorLine() const {return _errorLine;}
private:
QString _errorString;
int _errorLine;
};
#endif // OZIPARSERS_H

View File

@ -8,7 +8,7 @@ RectC Path::boundingRect() const
return ret;
for (int i = 0; i < size(); i++)
ret.unite(at(i).coordinates());
ret = ret.united(at(i).coordinates());
return ret;
}

View File

@ -1,5 +1,6 @@
#include <QFile>
#include <QDir>
#include "common/rectc.h"
#include "data.h"
#include "poi.h"
@ -101,12 +102,11 @@ QList<Waypoint> POI::points(const Path &path) const
QSet<int>::const_iterator it;
for (int i = 0; i < path.count(); i++) {
const Coordinates &c = path.at(i).coordinates();
QPair<Coordinates, Coordinates> br = c.boundingRect(_radius);
min[0] = br.first.lon();
min[1] = br.first.lat();
max[0] = br.second.lon();
max[1] = br.second.lat();
RectC br(path.at(i).coordinates(), _radius);
min[0] = br.topLeft().lon();
min[1] = br.bottomRight().lat();
max[0] = br.bottomRight().lon();
max[1] = br.topLeft().lat();
_tree.Search(min, max, cb, &set);
}
@ -124,13 +124,11 @@ QList<Waypoint> POI::points(const Waypoint &point) const
qreal min[2], max[2];
QSet<int>::const_iterator it;
const Coordinates &c = point.coordinates();
QPair<Coordinates, Coordinates> br = c.boundingRect(_radius);
min[0] = br.first.lon();
min[1] = br.first.lat();
max[0] = br.second.lon();
max[1] = br.second.lat();
RectC br(point.coordinates(), _radius);
min[0] = br.topLeft().lon();
min[1] = br.bottomRight().lat();
max[0] = br.bottomRight().lon();
max[1] = br.topLeft().lat();
_tree.Search(min, max, cb, &set);

View File

@ -41,6 +41,7 @@ Defense.
*/
#include "ellipsoid.h"
#include "albersequal.h"
@ -69,7 +70,6 @@ AlbersEqual::AlbersEqual(const Ellipsoid *ellipsoid, double standardParallel1,
double sp1, sp2;
_e = ellipsoid;
_latitudeOrigin = deg2rad(latitudeOrigin);
_longitudeOrigin = deg2rad(longitudeOrigin);
_falseEasting = falseEasting;
@ -78,7 +78,9 @@ AlbersEqual::AlbersEqual(const Ellipsoid *ellipsoid, double standardParallel1,
sp1 = deg2rad(standardParallel1);
sp2 = deg2rad(standardParallel2);
_es2 = 2 * _e->flattening() - _e->flattening() * _e->flattening();
_a2 = ellipsoid->radius() * ellipsoid->radius();
_es2 = 2 * ellipsoid->flattening() - ellipsoid->flattening()
* ellipsoid->flattening();
_es = sqrt(_es2);
_one_minus_es2 = 1 - _es2;
_two_es = 2 * _es;
@ -108,12 +110,12 @@ AlbersEqual::AlbersEqual(const Ellipsoid *ellipsoid, double standardParallel1,
_n = sin_lat1;
_C = sqr_m1 + _n * q1;
_a_over_n = _e->radius() / _n;
_a_over_n = ellipsoid->radius() / _n;
nq0 = _n * q0;
_rho0 = (_C < nq0) ? 0 : _a_over_n * sqrt(_C - nq0);
}
QPointF AlbersEqual::ll2xy(const Coordinates &c) const
PointD AlbersEqual::ll2xy(const Coordinates &c) const
{
double dlam;
double sin_lat;
@ -137,11 +139,11 @@ QPointF AlbersEqual::ll2xy(const Coordinates &c) const
rho = (_C < nq) ? 0 : _a_over_n * sqrt(_C - nq);
theta = _n * dlam;
return QPointF(rho * sin(theta) + _falseEasting,
return PointD(rho * sin(theta) + _falseEasting,
_rho0 - rho * cos(theta) + _falseNorthing);
}
Coordinates AlbersEqual::xy2ll(const QPointF &p) const
Coordinates AlbersEqual::xy2ll(const PointD &p) const
{
double dy, dx;
double rho0_minus_dy;
@ -171,7 +173,7 @@ Coordinates AlbersEqual::xy2ll(const QPointF &p) const
if (rho != 0.0)
theta = atan2(dx, rho0_minus_dy);
rho_n = rho * _n;
q = (_C - (rho_n * rho_n) / (_e->radius() * _e->radius())) / _n;
q = (_C - (rho_n * rho_n) / _a2) / _n;
qc = 1 - ((_one_minus_es2) / (_two_es)) * log((1.0 - _es) / (1.0 + _es));
if (fabs(fabs(qc) - fabs(q)) > 1.0e-6) {
q_over_2 = q / 2.0;

View File

@ -1,9 +1,10 @@
#ifndef ALBERSEQUAL_H
#define ALBERSEQUAL_H
#include "ellipsoid.h"
#include "ct.h"
class Ellipsoid;
class AlbersEqual : public CT
{
public:
@ -13,17 +14,16 @@ public:
virtual CT *clone() const {return new AlbersEqual(*this);}
virtual QPointF ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const QPointF &p) const;
virtual PointD ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const PointD &p) const;
private:
const Ellipsoid *_e;
double _latitudeOrigin;
double _longitudeOrigin;
double _falseEasting;
double _falseNorthing;
double _a2;
double _rho0;
double _C;
double _n;

View File

@ -8,7 +8,8 @@ static double sDMS2deg(double val)
const char *decimal;
QString qstr(QString::number(qAbs(val), 'f', 7));
const char *str = qstr.toLatin1().constData();
QByteArray ba = qstr.toLatin1();
const char *str = ba.constData();
decimal = strrchr(str, '.');
int deg = str2int(str, decimal - str);
int min = str2int(decimal + 1, 2);

View File

@ -2,6 +2,7 @@
#include <QtAlgorithms>
#include <QPainter>
#include "common/rectc.h"
#include "offlinemap.h"
#include "tar.h"
#include "atlas.h"
@ -15,8 +16,8 @@ static bool resCmp(const OfflineMap *m1, const OfflineMap *m2)
{
qreal r1, r2;
r1 = m1->resolution(m1->bounds().center());
r2 = m2->resolution(m2->bounds().center());
r1 = m1->resolution(m1->bounds());
r2 = m2->resolution(m2->bounds());
return r1 > r2;
}
@ -37,8 +38,8 @@ void Atlas::computeZooms()
_zooms.append(QPair<int, int>(0, _maps.count() - 1));
for (int i = 1; i < _maps.count(); i++) {
qreal last = _maps.at(i-1)->resolution(_maps.at(i)->bounds().center());
qreal cur = _maps.at(i)->resolution(_maps.at(i)->bounds().center());
qreal last = _maps.at(i-1)->resolution(_maps.at(i)->bounds());
qreal cur = _maps.at(i)->resolution(_maps.at(i)->bounds());
if (cur < last * ZOOM_THRESHOLD) {
_zooms.last().second = i-1;
_zooms.append(QPair<int, int>(i, _maps.count() - 1));
@ -74,25 +75,24 @@ void Atlas::computeBounds()
}
for (int i = 0; i < _maps.count(); i++)
_bounds.append(QPair<QRectF, QRectF>(QRectF(TL(_maps.at(i)),
BR(_maps.at(i))), QRectF(offsets.at(i), _maps.at(i)->bounds().size())));
_bounds.append(QPair<QRectF, QRectF>(QRectF(TL(_maps.at(i)).toPointF(),
BR(_maps.at(i)).toPointF()), QRectF(offsets.at(i),
_maps.at(i)->bounds().size())));
}
Atlas::Atlas(const QString &fileName, QObject *parent) : Map(parent)
Atlas::Atlas(const QString &fileName, QObject *parent)
: Map(parent), _zoom(0), _mapIndex(-1), _valid(false)
{
QFileInfo fi(fileName);
QByteArray ba;
QString suffix = fi.suffix().toLower();
Tar tar;
Tar tar(fileName);
_valid = false;
_zoom = 0;
_name = fi.dir().dirName();
_ci = -1; _cz = -1;
if (suffix == "tar") {
if (!tar.load(fileName)) {
if (!tar.open()) {
_errorString = "Error reading tar file";
return;
}
@ -112,7 +112,6 @@ Atlas::Atlas(const QString &fileName, QObject *parent) : Map(parent)
return;
}
QDir dir(fi.absolutePath());
QFileInfoList layers = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
for (int n = 0; n < layers.count(); n++) {
@ -149,12 +148,6 @@ Atlas::Atlas(const QString &fileName, QObject *parent) : Map(parent)
_valid = true;
}
Atlas::~Atlas()
{
for (int i = 0; i < _maps.size(); i++)
delete _maps.at(i);
}
QRectF Atlas::bounds() const
{
QSizeF s(0, 0);
@ -169,28 +162,25 @@ QRectF Atlas::bounds() const
return QRectF(QPointF(0, 0), s);
}
qreal Atlas::resolution(const QPointF &p) const
qreal Atlas::resolution(const QRectF &rect) const
{
int idx = _zooms.at(_zoom).first;
for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
if (_bounds.at(i).second.contains(_maps.at(i)->xy2pp(p))) {
if (_bounds.at(i).second.contains(_maps.at(i)->xy2pp(rect.center())
.toPointF())) {
idx = i;
break;
}
}
return _maps.at(idx)->resolution(p);
return _maps.at(idx)->resolution(rect);
}
qreal Atlas::zoom() const
{
return _zoom;
}
qreal Atlas::zoomFit(const QSize &size, const RectC &br)
int Atlas::zoomFit(const QSize &size, const RectC &br)
{
_zoom = 0;
_mapIndex = -1;
if (!br.isValid()) {
_zoom = _zooms.size() - 1;
@ -199,7 +189,8 @@ qreal Atlas::zoomFit(const QSize &size, const RectC &br)
for (int z = 0; z < _zooms.count(); z++) {
for (int i = _zooms.at(z).first; i <= _zooms.at(z).second; i++) {
if (!_bounds.at(i).first.contains(_maps.at(i)->ll2pp(br.center())))
if (!_bounds.at(i).first.contains(_maps.at(i)->ll2pp(br.center())
.toPointF()))
continue;
QRect sbr = QRectF(_maps.at(i)->ll2xy(br.topLeft()),
@ -217,35 +208,19 @@ qreal Atlas::zoomFit(const QSize &size, const RectC &br)
return _zoom;
}
qreal Atlas::zoomFit(qreal resolution, const Coordinates &c)
{
_zoom = 0;
for (int z = 0; z < _zooms.count(); z++) {
for (int i = _zooms.at(z).first; i <= _zooms.at(z).second; i++) {
if (!_bounds.at(i).first.contains(_maps.at(i)->ll2pp(c)))
continue;
if (_maps.at(i)->resolution(_maps.at(i)->ll2xy(c)) < resolution)
return _zoom;
_zoom = z;
break;
}
}
return _zoom;
}
qreal Atlas::zoomIn()
int Atlas::zoomIn()
{
_zoom = qMin(_zoom + 1, _zooms.size() - 1);
_mapIndex = -1;
return _zoom;
}
qreal Atlas::zoomOut()
int Atlas::zoomOut()
{
_zoom = qMax(_zoom - 1, 0);
_mapIndex = -1;
return _zoom;
}
@ -253,26 +228,21 @@ QPointF Atlas::ll2xy(const Coordinates &c)
{
QPointF pp;
if (_cz != _zoom) {
_ci = -1;
_cz = _zoom;
}
if (_ci >= 0)
pp = _maps.at(_ci)->ll2pp(c);
if (_ci < 0 || !_bounds.at(_ci).first.contains(pp)) {
_ci = _zooms.at(_zoom).first;
if (_mapIndex >= 0)
pp = _maps.at(_mapIndex)->ll2pp(c).toPointF();
if (_mapIndex < 0 || !_bounds.at(_mapIndex).first.contains(pp)) {
_mapIndex = _zooms.at(_zoom).first;
for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
pp = _maps.at(i)->ll2pp(c);
pp = _maps.at(i)->ll2pp(c).toPointF();
if (_bounds.at(i).first.contains(pp)) {
_ci = i;
_mapIndex = i;
break;
}
}
}
QPointF p = _maps.at(_ci)->pp2xy(pp);
return p + _bounds.at(_ci).second.topLeft();
QPointF p = _maps.at(_mapIndex)->pp2xy(pp);
return p + _bounds.at(_mapIndex).second.topLeft();
}
Coordinates Atlas::xy2ll(const QPointF &p)
@ -280,7 +250,7 @@ Coordinates Atlas::xy2ll(const QPointF &p)
int idx = _zooms.at(_zoom).first;
for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
if (_bounds.at(i).second.contains(_maps.at(i)->xy2pp(p))) {
if (_bounds.at(i).second.contains(_maps.at(i)->xy2pp(p).toPointF())) {
idx = i;
break;
}
@ -332,10 +302,10 @@ bool Atlas::isAtlas(const QString &path)
{
QFileInfo fi(path);
QString suffix = fi.suffix().toLower();
Tar tar;
Tar tar(path);
if (suffix == "tar") {
if (!tar.load(path))
if (!tar.open())
return false;
QString tbaFileName = fi.completeBaseName() + ".tba";
return tar.contains(tbaFileName);

View File

@ -1,10 +1,9 @@
#ifndef ATLAS_H
#define ATLAS_H
#include <QFileInfoList>
#include "map.h"
#include "offlinemap.h"
class OfflineMap;
class Atlas : public Map
{
@ -12,18 +11,16 @@ class Atlas : public Map
public:
Atlas(const QString &fileName, QObject *parent = 0);
~Atlas();
const QString &name() const {return _name;}
QRectF bounds() const;
qreal resolution(const QPointF &p) const;
qreal resolution(const QRectF &rect) const;
qreal zoom() const;
qreal zoomFit(const QSize &size, const RectC &br);
qreal zoomFit(qreal resolution, const Coordinates &c);
qreal zoomIn();
qreal zoomOut();
int zoom() const {return _zoom;}
int zoomFit(const QSize &size, const RectC &br);
int zoomIn();
int zoomOut();
QPointF ll2xy(const Coordinates &c);
Coordinates xy2ll(const QPointF &p);
@ -33,7 +30,7 @@ public:
void unload();
bool isValid() const {return _valid;}
const QString &errorString() const {return _errorString;}
QString errorString() const {return _errorString;}
static bool isAtlas(const QString &path);
@ -43,15 +40,15 @@ private:
void computeBounds();
QString _name;
bool _valid;
QString _errorString;
QList<OfflineMap*> _maps;
QVector<QPair<int, int> > _zooms;
QVector<QPair<QRectF, QRectF> > _bounds;
int _zoom;
int _mapIndex;
int _ci, _cz;
bool _valid;
QString _errorString;
};
#endif // ATLAS_H

View File

@ -0,0 +1,56 @@
#include "coordinatesystem.h"
CoordinateSystem::CoordinateSystem(int code)
{
switch (code) {
case 1024:
case 1035:
case 1039:
case 4400:
case 4409:
case 4463:
case 4464:
case 4465:
case 4466:
case 4467:
case 4469:
case 4470:
case 4495:
case 4496:
case 4497:
case 4498:
case 4499:
_axisOrder = XY;
break;
case 4500:
case 4530:
case 4531:
case 4532:
_axisOrder = YX;
break;
default:
_axisOrder = Unknown;
break;
}
}
#ifndef QT_NO_DEBUG
QDebug operator<<(QDebug dbg, const CoordinateSystem &cs)
{
QString ao;
switch (cs.axisOrder()) {
case CoordinateSystem::XY:
ao = "XY";
break;
case CoordinateSystem::YX:
ao = "YX";
break;
default:
ao = "Unknown";
}
dbg.nospace() << "CoordinateSystem(" << ao << ")";
return dbg.space();
}
#endif // QT_NO_DEBUG

View File

@ -0,0 +1,27 @@
#ifndef COORDINATESYSTEM_H
#define COORDINATESYSTEM_H
#include <QDebug>
class CoordinateSystem
{
public:
enum AxisOrder {Unknown, XY, YX};
CoordinateSystem() : _axisOrder(Unknown) {}
CoordinateSystem(AxisOrder axisOrder) : _axisOrder(axisOrder) {}
CoordinateSystem(int code);
bool isValid() const {return (_axisOrder != Unknown);}
AxisOrder axisOrder() const {return _axisOrder;}
private:
AxisOrder _axisOrder;
};
#ifndef QT_NO_DEBUG
QDebug operator<<(QDebug dbg, const CoordinateSystem &cs);
#endif // QT_NO_DEBUG
#endif // COORDINATESYSTEM_H

45
src/map/crs.cpp Normal file
View File

@ -0,0 +1,45 @@
#include <QStringList>
#include "pcs.h"
#include "crs.h"
Projection CRS::projection(const QString &crs)
{
QStringList list(crs.split(':'));
QString authority, code;
bool res;
int epsg;
const PCS *pcs;
const GCS *gcs;
switch (list.size()) {
case 2:
authority = list.at(0);
code = list.at(1);
break;
case 7:
authority = list.at(4);
code = list.at(6);
break;
default:
return Projection();
}
if (authority == "EPSG") {
epsg = code.toInt(&res);
if (!res)
return Projection();
if ((pcs = PCS::pcs(epsg)))
return Projection(pcs);
else if ((gcs = GCS::gcs(epsg)))
return Projection(gcs);
else
return Projection();
} else if (authority == "OGC") {
if (code == "CRS84")
return Projection(GCS::gcs(4326), CoordinateSystem::XY);
else
return Projection();
} else
return Projection();
}

11
src/map/crs.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef CRS_H
#define CRS_H
#include "projection.h"
namespace CRS
{
Projection projection(const QString &crs);
}
#endif // CRS_H

View File

@ -1,8 +1,8 @@
#ifndef CT_H
#define CT_H
#include <QPointF>
#include "common/coordinates.h"
#include "pointd.h"
class CT {
public:
@ -10,8 +10,8 @@ public:
virtual CT *clone() const = 0;
virtual QPointF ll2xy(const Coordinates &c) const = 0;
virtual Coordinates xy2ll(const QPointF &p) const = 0;
virtual PointD ll2xy(const Coordinates &c) const = 0;
virtual Coordinates xy2ll(const PointD &p) const = 0;
};
#endif // CT_H

View File

@ -2,6 +2,7 @@
#include <QFileInfo>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QBasicTimer>
#include "config.h"
#include "downloader.h"
@ -25,15 +26,68 @@
#define ATTR_LEVEL (QNetworkRequest::Attribute)(QNetworkRequest::User + 2)
#define MAX_REDIRECT_LEVEL 5
#define TIMEOUT 30 /* s */
Authorization::Authorization(const QString &username, const QString &password)
{
QString concatenated = username + ":" + password;
QByteArray data = concatenated.toLocal8Bit().toBase64();
_header = "Basic " + data;
}
class Downloader::ReplyTimeout : public QObject
{
public:
static void setTimeout(QNetworkReply *reply, int timeout)
{
Q_ASSERT(reply);
new ReplyTimeout(reply, timeout);
}
private:
ReplyTimeout(QNetworkReply *reply, int timeout) : QObject(reply)
{
_timer.start(timeout * 1000, this);
}
void timerEvent(QTimerEvent *ev)
{
if (!_timer.isActive() || ev->timerId() != _timer.timerId())
return;
QNetworkReply *reply = static_cast<QNetworkReply*>(parent());
if (reply->isRunning())
reply->close();
_timer.stop();
}
QBasicTimer _timer;
};
class Downloader::Redirect
{
public:
Redirect() : _level(0) {}
Redirect(const QUrl &origin, int level) :
_origin(origin), _level(level) {}
const QUrl &origin() const {return _origin;}
int level() const {return _level;}
private:
QUrl _origin;
int _level;
};
Downloader::Downloader(QObject *parent) : QObject(parent)
{
connect(&_manager, SIGNAL(finished(QNetworkReply*)),
SLOT(downloadFinished(QNetworkReply*)));
SLOT(downloadFinished(QNetworkReply*)));
}
bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
bool Downloader::doDownload(const Download &dl,
const QByteArray &authorization, const Redirect *redirect)
{
QUrl url(dl.url());
@ -44,14 +98,20 @@ bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
QNetworkRequest request(url);
request.setAttribute(ATTR_FILE, QVariant(dl.file()));
if (!redirect.isNull()) {
request.setAttribute(ATTR_ORIGIN, QVariant(redirect.origin()));
request.setAttribute(ATTR_LEVEL, QVariant(redirect.level()));
if (redirect) {
request.setAttribute(ATTR_ORIGIN, QVariant(redirect->origin()));
request.setAttribute(ATTR_LEVEL, QVariant(redirect->level()));
}
request.setRawHeader("User-Agent", USER_AGENT);
QNetworkReply *reply = _manager.get(request);
if (!authorization.isNull())
request.setRawHeader("Authorization", authorization);
_currentDownloads.insert(url, reply);
QNetworkReply *reply = _manager.get(request);
if (reply) {
_currentDownloads.insert(url);
ReplyTimeout::setTimeout(reply, TIMEOUT);
} else
return false;
return true;
}
@ -61,7 +121,7 @@ bool Downloader::saveToDisk(const QString &filename, QIODevice *data)
QFile file(filename);
if (!file.open(QIODevice::WriteOnly)) {
qWarning("Error writing map tile: %s: %s\n",
qWarning("Error writing file: %s: %s\n",
qPrintable(filename), qPrintable(file.errorString()));
return false;
}
@ -80,11 +140,11 @@ void Downloader::downloadFinished(QNetworkReply *reply)
QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
if (origin.isEmpty()) {
_errorDownloads.insert(url);
qWarning("Error downloading map tile: %s: %s\n",
qWarning("Error downloading file: %s: %s\n",
url.toEncoded().constData(), qPrintable(reply->errorString()));
} else {
_errorDownloads.insert(origin);
qWarning("Error downloading map tile: %s -> %s: %s\n",
qWarning("Error downloading file: %s -> %s: %s\n",
origin.toEncoded().constData(), url.toEncoded().constData(),
qPrintable(reply->errorString()));
}
@ -99,17 +159,18 @@ void Downloader::downloadFinished(QNetworkReply *reply)
if (location == url) {
_errorDownloads.insert(url);
qWarning("Error downloading map tile: %s: "
qWarning("Error downloading file: %s: "
"redirect loop\n", url.toEncoded().constData());
} else if (level >= MAX_REDIRECT_LEVEL) {
_errorDownloads.insert(origin);
qWarning("Error downloading map tile: %s: "
qWarning("Error downloading file: %s: "
"redirect level limit reached\n",
origin.toEncoded().constData());
} else {
Redirect redirect(origin.isEmpty() ? url : origin, level + 1);
Download dl(location, filename);
doDownload(dl, redirect);
doDownload(dl, reply->request().rawHeader("Authorization"),
&redirect);
}
} else
if (!saveToDisk(filename, reply))
@ -123,12 +184,13 @@ void Downloader::downloadFinished(QNetworkReply *reply)
emit finished();
}
bool Downloader::get(const QList<Download> &list)
bool Downloader::get(const QList<Download> &list,
const Authorization &authorization)
{
bool finishEmitted = false;
for (int i = 0; i < list.count(); i++)
finishEmitted |= doDownload(list.at(i));
finishEmitted |= doDownload(list.at(i), authorization.header());
return finishEmitted;
}

View File

@ -1,20 +1,18 @@
#ifndef DOWNLOADER_H
#ifndef DOWNLOADER_H
#define DOWNLOADER_H
#include <QNetworkAccessManager>
#include <QUrl>
#include <QList>
#include <QMap>
#include <QSet>
class QNetworkReply;
class Download
{
public:
Download(const QUrl &url, const QString &file)
{_url = url; _file = file;}
Download(const QUrl &url, const QString &file) : _url(url), _file(file) {}
const QUrl& url() const {return _url;}
const QString& file() const {return _file;}
@ -23,6 +21,17 @@ private:
QString _file;
};
class Authorization
{
public:
Authorization() {}
Authorization(const QString &username, const QString &password);
const QByteArray &header() const {return _header;}
private:
QByteArray _header;
};
class Downloader : public QObject
{
@ -31,7 +40,9 @@ class Downloader : public QObject
public:
Downloader(QObject *parent = 0);
bool get(const QList<Download> &list);
bool get(const QList<Download> &list, const Authorization &authorization
= Authorization());
void clearErrors() {_errorDownloads.clear();}
signals:
void finished();
@ -40,28 +51,15 @@ private slots:
void downloadFinished(QNetworkReply *reply);
private:
class Redirect
{
public:
Redirect() : _level(0) {}
Redirect(const QUrl &origin, int level) :
_origin(origin), _level(level) {}
class Redirect;
class ReplyTimeout;
const QUrl &origin() const {return _origin;}
int level() const {return _level;}
bool isNull() const {return (_level == 0);}
private:
QUrl _origin;
int _level;
};
bool doDownload(const Download &dl, const Redirect &redirect = Redirect());
bool doDownload(const Download &dl, const QByteArray &authorization,
const Redirect *redirect = 0);
bool saveToDisk(const QString &filename, QIODevice *data);
QNetworkAccessManager _manager;
QMap<QUrl, QNetworkReply *> _currentDownloads;
QSet<QUrl> _currentDownloads;
QSet<QUrl> _errorDownloads;
};

View File

@ -14,9 +14,9 @@ QMap<int, Ellipsoid> Ellipsoid::WGS84()
const Ellipsoid *Ellipsoid::ellipsoid(int id)
{
QMap<int, Ellipsoid>::const_iterator it = _ellipsoids.find(id);
QMap<int, Ellipsoid>::const_iterator it(_ellipsoids.find(id));
if (it == _ellipsoids.end())
if (it == _ellipsoids.constEnd())
return 0;
else
return &(it.value());

View File

@ -6,8 +6,9 @@
#include "emptymap.h"
#define SCALE_MIN 0.5
#define SCALE_MAX 1.0E-6
#define ZOOM_MIN 0
#define ZOOM_MAX 19
#define TILE_SIZE 256
static QPointF ll2m(const Coordinates &c)
{
@ -19,10 +20,30 @@ static Coordinates m2ll(const QPointF &p)
return Coordinates(p.x(), rad2deg(2 * atan(exp(deg2rad(p.y()))) - M_PI/2));
}
static qreal zoom2scale(int zoom)
{
return (360.0/(qreal)((1<<zoom) * TILE_SIZE));
}
static int scale2zoom(qreal scale)
{
return (int)log2(360.0/(scale * (qreal)TILE_SIZE));
}
static int limitZoom(int zoom)
{
if (zoom < ZOOM_MIN)
return ZOOM_MIN;
if (zoom > ZOOM_MAX)
return ZOOM_MAX;
return zoom;
}
EmptyMap::EmptyMap(QObject *parent) : Map(parent)
{
_scale = SCALE_MAX;
_zoom = ZOOM_MAX;
}
QRectF EmptyMap::bounds() const
@ -30,49 +51,38 @@ QRectF EmptyMap::bounds() const
return QRectF(ll2xy(Coordinates(-180, 85)), ll2xy(Coordinates(180, -85)));
}
qreal EmptyMap::zoomFit(const QSize &size, const RectC &br)
int EmptyMap::zoomFit(const QSize &size, const RectC &rect)
{
if (!br.isValid())
_scale = SCALE_MAX;
if (!rect.isValid())
_zoom = ZOOM_MAX;
else {
QRectF tbr(ll2m(br.topLeft()), ll2m(br.bottomRight()));
QRectF tbr(ll2m(rect.topLeft()), ll2m(rect.bottomRight()));
QPointF sc(tbr.width() / size.width(), tbr.height() / size.height());
_scale = qMax(sc.x(), sc.y());
_zoom = limitZoom(scale2zoom(qMax(sc.x(), -sc.y())));
}
_scale = qMax(_scale, SCALE_MAX);
_scale = qMin(_scale, SCALE_MIN);
return _scale;
return _zoom;
}
qreal EmptyMap::zoomFit(qreal resolution, const Coordinates &c)
qreal EmptyMap::resolution(const QRectF &rect) const
{
_scale = (360.0 * resolution) / (WGS84_RADIUS * 2 * M_PI
* cos(deg2rad(c.lat())));
qreal scale = zoom2scale(_zoom);
_scale = qMax(_scale, SCALE_MAX);
_scale = qMin(_scale, SCALE_MIN);
return _scale;
return (WGS84_RADIUS * 2.0 * M_PI * scale / 360.0
* cos(2.0 * atan(exp(deg2rad(-rect.center().y() * scale))) - M_PI/2));
}
qreal EmptyMap::resolution(const QPointF &p) const
int EmptyMap::zoomIn()
{
return (WGS84_RADIUS * 2 * M_PI * _scale / 360.0
* cos(2.0 * atan(exp(deg2rad(-p.y() * _scale))) - M_PI/2));
_zoom = qMin(_zoom + 1, ZOOM_MAX);
return _zoom;
}
qreal EmptyMap::zoomIn()
int EmptyMap::zoomOut()
{
_scale = qMax(_scale / 2.0, SCALE_MAX);
return _scale;
}
qreal EmptyMap::zoomOut()
{
_scale = qMin(_scale * 2.0, SCALE_MIN);
return _scale;
_zoom = qMax(_zoom - 1, ZOOM_MIN);
return _zoom;
}
void EmptyMap::draw(QPainter *painter, const QRectF &rect)
@ -82,12 +92,13 @@ void EmptyMap::draw(QPainter *painter, const QRectF &rect)
QPointF EmptyMap::ll2xy(const Coordinates &c) const
{
qreal scale = zoom2scale(_zoom);
QPointF m = ll2m(c);
return QPointF(m.x() / _scale, m.y() / -_scale);
return QPointF(m.x() / scale, m.y() / -scale);
}
Coordinates EmptyMap::xy2ll(const QPointF &p) const
{
QPointF m(p.x() * _scale, -p.y() * _scale);
return m2ll(QPointF(p.x() * _scale, -p.y() * _scale));
qreal scale = zoom2scale(_zoom);
return m2ll(QPointF(p.x() * scale, -p.y() * scale));
}

View File

@ -1,7 +1,6 @@
#ifndef EMPTYMAP_H
#define EMPTYMAP_H
#include "common/coordinates.h"
#include "map.h"
class EmptyMap : public Map
@ -14,13 +13,12 @@ public:
const QString &name() const {return _name;}
QRectF bounds() const;
qreal resolution(const QPointF &p) const;
qreal resolution(const QRectF &rect) const;
qreal zoom() const {return _scale;}
qreal zoomFit(const QSize &size, const RectC &br);
qreal zoomFit(qreal resolution, const Coordinates &c);
qreal zoomIn();
qreal zoomOut();
int zoom() const {return _zoom;}
int zoomFit(const QSize &size, const RectC &rect);
int zoomIn();
int zoomOut();
QPointF ll2xy(const Coordinates &c)
{return static_cast<const EmptyMap &>(*this).ll2xy(c);}
@ -34,7 +32,7 @@ private:
Coordinates xy2ll(const QPointF &p) const;
QString _name;
qreal _scale;
int _zoom;
};
#endif // EMPTYMAP_H

View File

@ -92,62 +92,62 @@ void GCS::loadList(const QString &path)
QByteArray line = file.readLine();
QList<QByteArray> list = line.split(',');
if (list.size() < 10) {
qWarning("%s: %d: Format error", qPrintable(path), ln);
qWarning("%s:%d: Format error", qPrintable(path), ln);
continue;
}
int id = parameter(list[1], &res);
if (!res) {
qWarning("%s: %d: Invalid GCS code", qPrintable(path), ln);
qWarning("%s:%d: Invalid GCS code", qPrintable(path), ln);
continue;
}
int gd = parameter(list[2], &res);
if (!res) {
qWarning("%s: %d: Invalid geodetic datum code", qPrintable(path),
qWarning("%s:%d: Invalid geodetic datum code", qPrintable(path),
ln);
continue;
}
int au = list[3].trimmed().toInt(&res);
if (!res) {
qWarning("%s: %d: Invalid angular units code", qPrintable(path),
qWarning("%s:%d: Invalid angular units code", qPrintable(path),
ln);
continue;
}
int el = list[4].trimmed().toInt(&res);
if (!res) {
qWarning("%s: %d: Invalid ellipsoid code", qPrintable(path), ln);
qWarning("%s:%d: Invalid ellipsoid code", qPrintable(path), ln);
continue;
}
int pm = list[5].trimmed().toInt(&res);
if (!res) {
qWarning("%s: %d: Invalid prime meridian code", qPrintable(path),
qWarning("%s:%d: Invalid prime meridian code", qPrintable(path),
ln);
continue;
}
int ct = list[6].trimmed().toInt(&res);
if (!res) {
qWarning("%s: %d: Invalid coordinates transformation code",
qWarning("%s:%d: Invalid coordinates transformation code",
qPrintable(path), ln);
continue;
}
double dx = list[7].trimmed().toDouble(&res);
if (!res) {
qWarning("%s: %d: Invalid dx", qPrintable(path), ln);
qWarning("%s:%d: Invalid dx", qPrintable(path), ln);
continue;
}
double dy = list[8].trimmed().toDouble(&res);
if (!res) {
qWarning("%s: %d: Invalid dy", qPrintable(path), ln);
qWarning("%s:%d: Invalid dy", qPrintable(path), ln);
continue;
}
double dz = list[9].trimmed().toDouble(&res);
if (!res) {
qWarning("%s: %d: Invalid dz", qPrintable(path), ln);
qWarning("%s:%d: Invalid dz", qPrintable(path), ln);
continue;
}
if (!(e = Ellipsoid::ellipsoid(el))) {
qWarning("%s: %d: Unknown ellipsoid code", qPrintable(path), ln);
qWarning("%s:%d: Unknown ellipsoid code", qPrintable(path), ln);
continue;
}
@ -157,7 +157,7 @@ void GCS::loadList(const QString &path)
datum = Datum(e, dx, dy, dz);
break;
default:
qWarning("%s: %d: Unknown coordinates transformation method",
qWarning("%s:%d: Unknown coordinates transformation method",
qPrintable(path), ln);
continue;
}
@ -166,7 +166,7 @@ void GCS::loadList(const QString &path)
if (gcs.isValid())
_gcss.append(Entry(id, gd, list[0].trimmed(), gcs));
else
qWarning("%s: %d: Unknown prime meridian/angular units code",
qWarning("%s:%d: Unknown prime meridian/angular units code",
qPrintable(path), ln);
}
}

View File

@ -25,7 +25,6 @@ public:
Coordinates toWGS84(const Coordinates &c) const;
Coordinates fromWGS84(const Coordinates &c) const;
static const GCS *gcs(int id);
static const GCS *gcs(int geodeticDatum, int primeMeridian,
int angularUnits);

View File

@ -1,7 +1,7 @@
#include <QFileInfo>
#include <QtEndian>
#include "pcs.h"
#include "latlon.h"
#include "tifffile.h"
#include "geotiff.h"
@ -9,41 +9,53 @@
#define TIFF_SHORT 3
#define TIFF_LONG 4
#define ModelPixelScaleTag 33550
#define ModelTiepointTag 33922
#define ModelTransformationTag 34264
#define GeoKeyDirectoryTag 34735
#define GeoDoubleParamsTag 34736
#define ImageWidth 256
#define ImageHeight 257
#define ModelPixelScaleTag 33550
#define ModelTiepointTag 33922
#define ModelTransformationTag 34264
#define GeoKeyDirectoryTag 34735
#define GeoDoubleParamsTag 34736
#define GTModelTypeGeoKey 1024
#define GTRasterTypeGeoKey 1025
#define GeographicTypeGeoKey 2048
#define GeogGeodeticDatumGeoKey 2050
#define GeogPrimeMeridianGeoKey 2051
#define GeogAngularUnitsGeoKey 2054
#define ProjectedCSTypeGeoKey 3072
#define ProjectionGeoKey 3074
#define ProjCoordTransGeoKey 3075
#define ProjLinearUnitsGeoKey 3076
#define ProjStdParallel1GeoKey 3078
#define ProjStdParallel2GeoKey 3079
#define ProjNatOriginLongGeoKey 3080
#define ProjNatOriginLatGeoKey 3081
#define ProjFalseEastingGeoKey 3082
#define ProjFalseNorthingGeoKey 3083
#define ProjScaleAtNatOriginGeoKey 3092
#define GTModelTypeGeoKey 1024
#define GTRasterTypeGeoKey 1025
#define GeographicTypeGeoKey 2048
#define GeogGeodeticDatumGeoKey 2050
#define GeogPrimeMeridianGeoKey 2051
#define GeogAngularUnitsGeoKey 2054
#define GeogEllipsoidGeoKey 2056
#define GeogAzimuthUnitsGeoKey 2060
#define ProjectedCSTypeGeoKey 3072
#define ProjectionGeoKey 3074
#define ProjCoordTransGeoKey 3075
#define ProjLinearUnitsGeoKey 3076
#define ProjStdParallel1GeoKey 3078
#define ProjStdParallel2GeoKey 3079
#define ProjNatOriginLongGeoKey 3080
#define ProjNatOriginLatGeoKey 3081
#define ProjFalseEastingGeoKey 3082
#define ProjFalseNorthingGeoKey 3083
#define ProjCenterLongGeoKey 3088
#define ProjCenterLatGeoKey 3089
#define ProjScaleAtNatOriginGeoKey 3092
#define ProjScaleAtCenterGeoKey 3093
#define ProjAzimuthAngleGeoKey 3094
#define ProjRectifiedGridAngleGeoKey 3096
#define ModelTypeProjected 1
#define ModelTypeGeographic 2
#define ModelTypeGeocentric 3
#define CT_TransverseMercator 1
#define CT_ObliqueMercator 3
#define CT_Mercator 7
#define CT_LambertConfConic_2SP 8
#define CT_LambertConfConic_1SP 9
#define CT_LambertAzimEqualArea 10
#define CT_AlbersEqualArea 11
#define ModelTypeProjected 1
#define ModelTypeGeographic 2
#define ModelTypeGeocentric 3
#define IS_SET(map, key) \
((map).contains(key) && (map).value(key).SHORT != 32767)
#define ARRAY_SIZE(a) \
(sizeof(a) / sizeof(*a))
typedef struct {
quint16 KeyDirectoryVersion;
@ -126,7 +138,7 @@ bool GeoTIFF::readIFD(TIFFFile &file, quint32 &offset, Ctx &ctx) const
return true;
}
bool GeoTIFF::readScale(TIFFFile &file, quint32 offset, QPointF &scale) const
bool GeoTIFF::readScale(TIFFFile &file, quint32 offset, PointD &scale) const
{
if (!file.seek(offset))
return false;
@ -143,7 +155,7 @@ bool GeoTIFF::readTiepoints(TIFFFile &file, quint32 offset, quint32 count,
QList<ReferencePoint> &points) const
{
double z, pz;
QPointF xy, pp;
PointD xy, pp;
if (!file.seek(offset))
return false;
@ -163,10 +175,7 @@ bool GeoTIFF::readTiepoints(TIFFFile &file, quint32 offset, quint32 count,
if (!file.readValue(pz))
return false;
ReferencePoint p;
p.xy = xy.toPoint();
p.pp = pp;
points.append(p);
points.append(ReferencePoint(xy, pp));
}
return true;
@ -219,10 +228,12 @@ bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const
case GeogGeodeticDatumGeoKey:
case GeogPrimeMeridianGeoKey:
case GeogAngularUnitsGeoKey:
case GeogAzimuthUnitsGeoKey:
case ProjectedCSTypeGeoKey:
case ProjectionGeoKey:
case ProjCoordTransGeoKey:
case ProjLinearUnitsGeoKey:
case GeogEllipsoidGeoKey:
if (entry.TIFFTagLocation != 0 || entry.Count != 1)
return false;
value.SHORT = entry.ValueOffset;
@ -235,6 +246,11 @@ bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const
case ProjFalseNorthingGeoKey:
case ProjStdParallel1GeoKey:
case ProjStdParallel2GeoKey:
case ProjCenterLongGeoKey:
case ProjCenterLatGeoKey:
case ProjScaleAtCenterGeoKey:
case ProjAzimuthAngleGeoKey:
case ProjRectifiedGridAngleGeoKey:
if (!readGeoValue(file, ctx.values, entry.ValueOffset,
value.DOUBLE))
return false;
@ -272,13 +288,20 @@ const GCS *GeoTIFF::gcs(QMap<quint16, Value> &kv)
if (!(gcs = GCS::gcs(kv.value(GeographicTypeGeoKey).SHORT)))
_errorString = QString("%1: unknown GCS")
.arg(kv.value(GeographicTypeGeoKey).SHORT);
} else if (IS_SET(kv, GeogGeodeticDatumGeoKey)) {
} else if (IS_SET(kv, GeogGeodeticDatumGeoKey)
|| kv.value(GeogEllipsoidGeoKey).SHORT == 7019
|| kv.value(GeogEllipsoidGeoKey).SHORT == 7030) {
int pm = IS_SET(kv, GeogPrimeMeridianGeoKey)
? kv.value(GeogPrimeMeridianGeoKey).SHORT : 8901;
int au = IS_SET(kv, GeogAngularUnitsGeoKey)
? kv.value(GeogAngularUnitsGeoKey).SHORT : 9102;
if (!(gcs = GCS::gcs(kv.value(GeogGeodeticDatumGeoKey).SHORT, pm, au)))
// If only the ellipsoid is defined and it is GRS80 or WGS84, handle
// such definition as a WGS84 geodetic datum.
int gd = IS_SET(kv, GeogGeodeticDatumGeoKey)
? kv.value(GeogGeodeticDatumGeoKey).SHORT : 6326;
if (!(gcs = GCS::gcs(gd, pm, au)))
_errorString = QString("%1+%2: unknown geodetic datum + prime"
" meridian combination")
.arg(kv.value(GeogGeodeticDatumGeoKey).SHORT)
@ -297,17 +320,19 @@ Projection::Method GeoTIFF::method(QMap<quint16, Value> &kv)
}
switch (kv.value(ProjCoordTransGeoKey).SHORT) {
case 1:
case CT_TransverseMercator:
return Projection::Method(9807);
case 7:
case CT_ObliqueMercator:
return Projection::Method(9815);
case CT_Mercator:
return Projection::Method(1024);
case 8:
return Projection::Method(9801);
case 9:
case CT_LambertConfConic_2SP:
return Projection::Method(9802);
case 10:
case CT_LambertConfConic_1SP:
return Projection::Method(9801);
case CT_LambertAzimEqualArea:
return Projection::Method(9820);
case 11:
case CT_AlbersEqualArea:
return Projection::Method(9822);
default:
_errorString = QString("%1: unknown coordinate transformation method")
@ -325,8 +350,7 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
.arg(kv.value(ProjectedCSTypeGeoKey).SHORT);
return false;
}
_projection = Projection(pcs->gcs(), pcs->method(), pcs->setup(),
pcs->units());
_projection = Projection(pcs);
} else if (IS_SET(kv, ProjectionGeoKey)) {
const GCS *g = gcs(kv);
if (!g)
@ -338,9 +362,10 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
.arg(kv.value(ProjectionGeoKey).SHORT);
return false;
}
_projection = Projection(pcs->gcs(), pcs->method(), pcs->setup(),
pcs->units());
_projection = Projection(pcs);
} else {
double lat0, lon0, scale, fe, fn, sp1, sp2;
const GCS *g = gcs(kv);
if (!g)
return false;
@ -350,6 +375,8 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
AngularUnits au(IS_SET(kv, GeogAngularUnitsGeoKey)
? kv.value(GeogAngularUnitsGeoKey).SHORT : 9102);
AngularUnits zu(IS_SET(kv, GeogAzimuthUnitsGeoKey)
? kv.value(GeogAzimuthUnitsGeoKey).SHORT : 9102);
LinearUnits lu(IS_SET(kv, ProjLinearUnitsGeoKey)
? kv.value(ProjLinearUnitsGeoKey).SHORT : 9001);
if (lu.isNull()) {
@ -358,17 +385,48 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
return false;
}
Projection::Setup setup(
au.toDegrees(kv.value(ProjNatOriginLatGeoKey).DOUBLE),
au.toDegrees(kv.value(ProjNatOriginLongGeoKey).DOUBLE),
kv.value(ProjScaleAtNatOriginGeoKey).DOUBLE,
lu.toMeters(kv.value(ProjFalseEastingGeoKey).DOUBLE),
lu.toMeters(kv.value(ProjFalseNorthingGeoKey).DOUBLE),
au.toDegrees(kv.value(ProjStdParallel1GeoKey).DOUBLE),
au.toDegrees(kv.value(ProjStdParallel2GeoKey).DOUBLE)
);
if (kv.contains(ProjNatOriginLatGeoKey))
lat0 = au.toDegrees(kv.value(ProjNatOriginLatGeoKey).DOUBLE);
else if (kv.contains(ProjCenterLatGeoKey))
lat0 = au.toDegrees(kv.value(ProjCenterLatGeoKey).DOUBLE);
else
lat0 = NAN;
if (kv.contains(ProjNatOriginLongGeoKey))
lon0 = au.toDegrees(kv.value(ProjNatOriginLongGeoKey).DOUBLE);
else if (kv.contains(ProjCenterLongGeoKey))
lon0 = au.toDegrees(kv.value(ProjCenterLongGeoKey).DOUBLE);
else
lon0 = NAN;
if (kv.contains(ProjScaleAtNatOriginGeoKey))
scale = kv.value(ProjScaleAtNatOriginGeoKey).DOUBLE;
else if (kv.contains(ProjScaleAtCenterGeoKey))
scale = kv.value(ProjScaleAtCenterGeoKey).DOUBLE;
else
scale = NAN;
if (kv.contains(ProjStdParallel1GeoKey))
sp1 = au.toDegrees(kv.value(ProjStdParallel1GeoKey).DOUBLE);
else if (kv.contains(ProjAzimuthAngleGeoKey))
sp1 = zu.toDegrees(kv.value(ProjAzimuthAngleGeoKey).DOUBLE);
else
sp1 = NAN;
if (kv.contains(ProjStdParallel2GeoKey))
sp2 = au.toDegrees(kv.value(ProjStdParallel2GeoKey).DOUBLE);
else if (kv.contains(ProjRectifiedGridAngleGeoKey))
sp2 = au.toDegrees(kv.value(ProjRectifiedGridAngleGeoKey).DOUBLE);
else
sp2 = NAN;
if (kv.contains(ProjFalseNorthingGeoKey))
fn = lu.toMeters(kv.value(ProjFalseNorthingGeoKey).DOUBLE);
else
fn = NAN;
if (kv.contains(ProjFalseEastingGeoKey))
fe = lu.toMeters(kv.value(ProjFalseEastingGeoKey).DOUBLE);
else
fe = NAN;
_projection = Projection(g, m, setup, lu);
Projection::Setup setup(lat0, lon0, scale, fe, fn, sp1, sp2);
PCS pcs(g, m, setup, lu, CoordinateSystem());
_projection = Projection(&pcs);
}
return true;
@ -385,11 +443,11 @@ bool GeoTIFF::geographicModel(QMap<quint16, Value> &kv)
return true;
}
bool GeoTIFF::load(const QString &path)
GeoTIFF::GeoTIFF(const QString &path)
{
quint32 ifd;
QList<ReferencePoint> points;
QPointF scale;
PointD scale;
QMap<quint16, Value> kv;
Ctx ctx;
TIFFFile file;
@ -399,86 +457,76 @@ bool GeoTIFF::load(const QString &path)
if (!file.open(QIODevice::ReadOnly)) {
_errorString = QString("Error opening TIFF file: %1")
.arg(file.errorString());
return false;
return;
}
if (!file.readHeader(ifd)) {
_errorString = "Invalid TIFF header";
return false;
return;
}
while (ifd) {
if (!readIFD(file, ifd, ctx)) {
_errorString = "Invalid IFD";
return false;
return;
}
}
if (!ctx.keys) {
_errorString = "Not a GeoTIFF file";
return false;
return;
}
if (ctx.scale) {
if (!readScale(file, ctx.scale, scale)) {
_errorString = "Error reading model pixel scale";
return false;
return;
}
}
if (ctx.tiepoints) {
if (!readTiepoints(file, ctx.tiepoints, ctx.tiepointCount, points)) {
_errorString = "Error reading raster->model tiepoint pairs";
return false;
return;
}
}
if (!readKeys(file, ctx, kv)) {
_errorString = "Error reading Geo key/value";
return false;
return;
}
switch (kv.value(GTModelTypeGeoKey).SHORT) {
case ModelTypeProjected:
if (!projectedModel(kv))
return false;
return;
break;
case ModelTypeGeographic:
if (!geographicModel(kv))
return false;
return;
break;
case ModelTypeGeocentric:
_errorString = "Geocentric models are not supported";
return false;
return;
default:
_errorString = "Unknown/missing model type";
return false;
return;
}
if (ctx.scale && ctx.tiepoints) {
const ReferencePoint &p = points.first();
_transform = QTransform(scale.x(), 0, 0, -scale.y(), p.pp.x() - p.xy.x()
/ scale.x(), p.pp.y() + p.xy.x() / scale.y()).inverted();
} else if (ctx.tiepointCount > 1) {
Transform t(points);
if (t.isNull()) {
_errorString = t.errorString();
return false;
}
_transform = t.transform();
} else if (ctx.matrix) {
double m[16];
if (!readMatrix(file, ctx.matrix, m)) {
if (ctx.scale && ctx.tiepoints)
_transform = Transform(points.first(), scale);
else if (ctx.tiepointCount > 1)
_transform = Transform(points);
else if (ctx.matrix) {
double matrix[16];
if (!readMatrix(file, ctx.matrix, matrix)) {
_errorString = "Error reading transformation matrix";
return false;
return;
}
if (m[2] != 0.0 || m[6] != 0.0 || m[8] != 0.0 || m[9] != 0.0
|| m[10] != 0.0 || m[11] != 0.0) {
_errorString = "Not a baseline transformation matrix";
}
_transform = QTransform(m[0], m[1], m[4], m[5], m[3], m[7]).inverted();
_transform = Transform(matrix);
} else {
_errorString = "Incomplete/missing model transformation info";
return false;
return;
}
return true;
if (!_transform.isValid())
_errorString = _transform.errorString();
}

View File

@ -1,23 +1,24 @@
#ifndef GEOTIFF_H
#define GEOTIFF_H
#include <QTransform>
#include <QFile>
#include <QMap>
#include "gcs.h"
#include "projection.h"
#include "tifffile.h"
#include <QList>
#include "transform.h"
#include "linearunits.h"
#include "projection.h"
class TIFFFile;
class GCS;
class GeoTIFF
{
public:
bool load(const QString &path);
GeoTIFF(const QString &path);
bool isValid() const {return _projection.isValid() && _transform.isValid();}
const QString &errorString() const {return _errorString;}
const Projection &projection() const {return _projection;}
const QTransform &transform() const {return _transform;}
const Transform &transform() const {return _transform;}
private:
union Value {
@ -39,7 +40,7 @@ private:
bool readEntry(TIFFFile &file, Ctx &ctx) const;
bool readIFD(TIFFFile &file, quint32 &offset, Ctx &ctx) const;
bool readScale(TIFFFile &file, quint32 offset, QPointF &scale) const;
bool readScale(TIFFFile &file, quint32 offset, PointD &scale) const;
bool readTiepoints(TIFFFile &file, quint32 offset, quint32 count,
QList<ReferencePoint> &points) const;
bool readMatrix(TIFFFile &file, quint32 offset, double matrix[16]) const;
@ -52,7 +53,7 @@ private:
bool geographicModel(QMap<quint16, Value> &kv);
bool projectedModel(QMap<quint16, Value> &kv);
QTransform _transform;
Transform _transform;
Projection _projection;
QString _errorString;

View File

@ -1,193 +1,72 @@
/*
* Based on libgeotrans with the following Source Code Disclaimer:
1. The GEOTRANS source code ("the software") is provided free of charge by
the National Imagery and Mapping Agency (NIMA) of the United States
Department of Defense. Although NIMA makes no copyright claim under Title 17
U.S.C., NIMA claims copyrights in the source code under other legal regimes.
NIMA hereby grants to each user of the software a license to use and
distribute the software, and develop derivative works.
2. Warranty Disclaimer: The software was developed to meet only the internal
requirements of the U.S. National Imagery and Mapping Agency. The software
is provided "as is," and no warranty, express or implied, including but not
limited to the implied warranties of merchantability and fitness for
particular purpose or arising by statute or otherwise in law or from a
course of dealing or usage in trade, is made by NIMA as to the accuracy and
functioning of the software.
3. NIMA and its personnel are not required to provide technical support or
general assistance with respect to the software.
4. Neither NIMA nor its personnel will be liable for any claims, losses, or
damages arising from or connected with the use of the software. The user
agrees to hold harmless the United States National Imagery and Mapping
Agency. The user's sole and exclusive remedy is to stop using the software.
5. NIMA requests that products developed using the software credit the
source of the software with the following statement, "The product was
developed using GEOTRANS, a product of the National Imagery and Mapping
Agency and U.S. Army Engineering Research and Development Center."
6. For any products developed using the software, NIMA requires a disclaimer
that use of the software does not indicate endorsement or approval of the
product by the Secretary of Defense or the National Imagery and Mapping
Agency. Pursuant to the United States Code, 10 U.S.C. Sec. 2797, the name of
the National Imagery and Mapping Agency, the initials "NIMA", the seal of
the National Imagery and Mapping Agency, or any colorable imitation thereof
shall not be used to imply approval, endorsement, or authorization of a
product without prior written permission from United States Secretary of
Defense.
*/
#include <cmath>
#include "ellipsoid.h"
#include "lambertazimuthal.h"
#ifndef M_PI_2
#define M_PI_2 1.57079632679489661923
#endif // M_PI_2
#define sin2(x) (sin(x) * sin(x))
#define sqr(x) ((x) * (x))
LambertAzimuthal::LambertAzimuthal(const Ellipsoid *ellipsoid,
double latitudeOrigin, double longitudeOrigin, double falseEasting,
double falseNorthing)
{
double es2, es4, es6;
double lat0 = deg2rad(latitudeOrigin);
es2 = 2 * ellipsoid->flattening() - ellipsoid->flattening()
* ellipsoid->flattening();
es4 = es2 * es2;
es6 = es4 * es2;
_ra = ellipsoid->radius() * (1.0 - es2 / 6.0 - 17.0 * es4 / 360.0 - 67.0
* es6 / 3024.0);
_latOrigin = deg2rad(latitudeOrigin);
_sinLatOrigin = sin(_latOrigin);
_cosLatOrigin = cos(_latOrigin);
_absLatOrigin = fabs(_latOrigin);
_lonOrigin = deg2rad(longitudeOrigin);
if (_lonOrigin > M_PI)
_lonOrigin -= 2.0 * M_PI;
_falseNorthing = falseNorthing;
_falseEasting = falseEasting;
_falseNorthing = falseNorthing;
_lon0 = deg2rad(longitudeOrigin);
_a = ellipsoid->radius();
_es2 = 2.0 * ellipsoid->flattening() - ellipsoid->flattening()
* ellipsoid->flattening();
_es = sqrt(_es2);
double q0 = (1.0 - _es2) * ((sin(lat0) / (1.0 - _es2 * sin2(lat0)))
- ((1.0/(2.0*_es)) * log((1.0 - _es * sin(lat0)) / (1.0 + _es
* sin(lat0)))));
_qP = (1.0 - _es2) * ((1.0 / (1.0 - _es2)) - ((1.0/(2.0*_es))
* log((1.0 - _es) / (1.0 + _es))));
_beta0 = asin(q0 / _qP);
_Rq = _a * sqrt(_qP / 2.0);
_D = _a * (cos(lat0) / sqrt(1.0 - _es2 * sin2(lat0))) / (_Rq * cos(_beta0));
}
QPointF LambertAzimuthal::ll2xy(const Coordinates &c) const
PointD LambertAzimuthal::ll2xy(const Coordinates &c) const
{
double dlam;
double k_prime;
double cd;
double rlat = deg2rad(c.lat());
double slat = sin(rlat);
double clat = cos(rlat);
double cos_c;
double sin_dlam, cos_dlam;
double Ra_kprime;
double Ra_PI_OVER_2_Lat;
QPointF p;
double lon = deg2rad(c.lon());
double lat = deg2rad(c.lat());
double q = (1.0 - _es2) * ((sin(lat) / (1.0 - _es2 * sin2(lat)))
- ((1.0/(2.0*_es)) * log((1.0 - _es * sin(lat)) / (1.0 + _es
* sin(lat)))));
double beta = asin(q / _qP);
double B = _Rq * sqrt(2.0 / (1.0 + sin(_beta0) * sin(beta) + (cos(_beta0)
* cos(beta) * cos(lon - _lon0))));
dlam = deg2rad(c.lon()) - _lonOrigin;
if (dlam > M_PI)
dlam -= 2.0 * M_PI;
if (dlam < -M_PI)
dlam += 2.0 * M_PI;
double x = _falseEasting + ((B * _D) * (cos(beta) * sin(lon - _lon0)));
double y = _falseNorthing + (B / _D) * ((cos(_beta0) * sin(beta))
- (sin(_beta0) * cos(beta) * cos(lon - _lon0)));
sin_dlam = sin(dlam);
cos_dlam = cos(dlam);
if (fabs(_absLatOrigin - M_PI_2) < 1.0e-10) {
if (_latOrigin >= 0.0) {
Ra_PI_OVER_2_Lat = _ra * (M_PI_2 - rlat);
p.rx() = Ra_PI_OVER_2_Lat * sin_dlam + _falseEasting;
p.ry() = -1.0 * (Ra_PI_OVER_2_Lat * cos_dlam) + _falseNorthing;
} else {
Ra_PI_OVER_2_Lat = _ra * (M_PI_2 + rlat);
p.rx() = Ra_PI_OVER_2_Lat * sin_dlam + _falseEasting;
p.ry() = Ra_PI_OVER_2_Lat * cos_dlam + _falseNorthing;
}
} else if (_absLatOrigin <= 1.0e-10) {
cos_c = clat * cos_dlam;
if (fabs(fabs(cos_c) - 1.0) < 1.0e-14) {
if (cos_c >= 0.0) {
p.rx() = _falseEasting;
p.ry() = _falseNorthing;
} else
return QPointF(NAN, NAN);
} else {
cd = acos(cos_c);
k_prime = cd / sin(cd);
Ra_kprime = _ra * k_prime;
p.rx() = Ra_kprime * clat * sin_dlam + _falseEasting;
p.ry() = Ra_kprime * slat + _falseNorthing;
}
} else {
cos_c = (_sinLatOrigin * slat) + (_cosLatOrigin * clat * cos_dlam);
if (fabs(fabs(cos_c) - 1.0) < 1.0e-14) {
if (cos_c >= 0.0) {
p.rx() = _falseEasting;
p.ry() = _falseNorthing;
} else
return QPointF(NAN, NAN);
} else {
cd = acos(cos_c);
k_prime = cd / sin(cd);
Ra_kprime = _ra * k_prime;
p.rx() = Ra_kprime * clat * sin_dlam + _falseEasting;
p.ry() = Ra_kprime * (_cosLatOrigin * slat - _sinLatOrigin * clat
* cos_dlam) + _falseNorthing;
}
}
return p;
return PointD(x, y);
}
Coordinates LambertAzimuthal::xy2ll(const QPointF &p) const
Coordinates LambertAzimuthal::xy2ll(const PointD &p) const
{
double dx, dy;
double rho;
double cd;
double sin_c, cos_c, dy_sinc;
double lat, lon;
double es4 = _es2 * _es2;
double es6 = _es2 * es4;
double rho = sqrt(sqr((p.x() - _falseEasting) / _D) + sqr(_D * (p.y()
- _falseNorthing)));
double C = 2.0 * asin(rho / (2.0*_Rq));
double betaS = asin((cos(C) * sin(_beta0)) + ((_D * (p.y() -_falseNorthing)
* sin(C) * cos(_beta0)) / rho));
dy = p.y() - _falseNorthing;
dx = p.x() - _falseEasting;
rho = sqrt(dx * dx + dy * dy);
if (fabs(rho) <= 1.0e-10) {
lat = _latOrigin;
lon = _lonOrigin;
} else {
cd = rho / _ra;
sin_c = sin(cd);
cos_c = cos(cd);
dy_sinc = dy * sin_c;
lat = asin((cos_c * _sinLatOrigin) + ((dy_sinc * _cosLatOrigin) / rho));
if (fabs(_absLatOrigin - M_PI_2) < 1.0e-10) {
if (_latOrigin >= 0.0)
lon = _lonOrigin + atan2(dx, -dy);
else
lon = _lonOrigin + atan2(dx, dy);
}
else
lon = _lonOrigin + atan2((dx * sin_c), ((rho * _cosLatOrigin
* cos_c) - (dy_sinc * _sinLatOrigin)));
}
if (lat > M_PI_2)
lat = M_PI_2;
else if (lat < -M_PI_2)
lat = -M_PI_2;
if (lon > M_PI)
lon -= 2.0 * M_PI;
if (lon < -M_PI)
lon += 2.0 * M_PI;
if (lon > M_PI)
lon = M_PI;
else if (lon < -M_PI)
lon = -M_PI;
double lon = _lon0 + atan((p.x() - _falseEasting) * sin(C) / (_D * rho
* cos(_beta0) * cos(C) - sqr(_D) * (p.y() - _falseNorthing) * sin(_beta0)
* sin(C)));
double lat = betaS + ((_es2/3.0 + 31.0*es4/180.0 + 517.0*es6/5040.0)
* sin(2.0*betaS)) + ((23.0*es4/360.0 + 251.0*es6/3780.0) * sin(4.0*betaS))
+ ((761.0*es6/45360.0)*sin(6.0*betaS));
return Coordinates(rad2deg(lon), rad2deg(lat));
}

View File

@ -1,9 +1,10 @@
#ifndef LAMBERTAZIMUTHAL_H
#define LAMBERTAZIMUTHAL_H
#include "ellipsoid.h"
#include "ct.h"
class Ellipsoid;
class LambertAzimuthal : public CT
{
public:
@ -12,19 +13,14 @@ public:
virtual CT *clone() const {return new LambertAzimuthal(*this);}
virtual QPointF ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const QPointF &p) const;
virtual PointD ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const PointD &p) const;
private:
double _ra;
double _sinLatOrigin;
double _cosLatOrigin;
double _absLatOrigin;
double _latOrigin;
double _lonOrigin;
double _lon0;
double _falseNorthing;
double _falseEasting;
double _a, _es, _es2, _qP, _beta0, _Rq, _D;
};
#endif // LAMBERTAZIMUTHAL_H

View File

@ -42,6 +42,7 @@ Defense.
*/
#include <cmath>
#include "ellipsoid.h"
#include "lambertconic.h"
#ifndef M_PI_2
@ -92,7 +93,7 @@ LambertConic1::LambertConic1(const Ellipsoid *ellipsoid, double latitudeOrigin,
_rho_olat = _rho0;
}
QPointF LambertConic1::ll2xy(const Coordinates &c) const
PointD LambertConic1::ll2xy(const Coordinates &c) const
{
double t;
double rho;
@ -116,11 +117,11 @@ QPointF LambertConic1::ll2xy(const Coordinates &c) const
theta = _n * dlam;
return QPointF(rho * sin(theta) + _falseEasting, _rho_olat - rho
return PointD(rho * sin(theta) + _falseEasting, _rho_olat - rho
* cos(theta) + _falseNorthing);
}
Coordinates LambertConic1::xy2ll(const QPointF &p) const
Coordinates LambertConic1::xy2ll(const PointD &p) const
{
double dx;
double dy;
@ -265,12 +266,12 @@ LambertConic2::LambertConic2(const Ellipsoid *ellipsoid,
falseEasting, falseNorthing);
}
QPointF LambertConic2::ll2xy(const Coordinates &c) const
PointD LambertConic2::ll2xy(const Coordinates &c) const
{
return _lc1.ll2xy(c);
}
Coordinates LambertConic2::xy2ll(const QPointF &p) const
Coordinates LambertConic2::xy2ll(const PointD &p) const
{
return _lc1.xy2ll(p);
}

View File

@ -1,9 +1,10 @@
#ifndef LAMBERTCONIC_H
#define LAMBERTCONIC_H
#include "ellipsoid.h"
#include "ct.h"
class Ellipsoid;
class LambertConic1 : public CT
{
public:
@ -14,8 +15,8 @@ public:
virtual CT *clone() const {return new LambertConic1(*this);}
virtual QPointF ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const QPointF &p) const;
virtual PointD ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const PointD &p) const;
private:
double _longitudeOrigin;
@ -39,8 +40,8 @@ public:
virtual CT *clone() const {return new LambertConic2(*this);}
virtual QPointF ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const QPointF &p) const;
virtual PointD ll2xy(const Coordinates &c) const;
virtual Coordinates xy2ll(const PointD &p) const;
private:
LambertConic1 _lc1;

View File

@ -11,9 +11,9 @@ public:
virtual CT *clone() const {return new LatLon(*this);}
virtual QPointF ll2xy(const Coordinates &c) const
{return QPointF(_au.fromDegrees(c.lon()), _au.fromDegrees(c.lat()));}
virtual Coordinates xy2ll(const QPointF &p) const
virtual PointD ll2xy(const Coordinates &c) const
{return PointD(_au.fromDegrees(c.lon()), _au.fromDegrees(c.lat()));}
virtual Coordinates xy2ll(const PointD &p) const
{return Coordinates(_au.toDegrees(p.x()), _au.toDegrees(p.y()));}
private:

Some files were not shown because too many files have changed in this diff Show More