mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-13 10:25:10 +02:00
Compare commits
107 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ce3de119b | |||
| 872ecdfa58 | |||
| 121a262ea1 | |||
| 06c9fbd849 | |||
| aa928d96e0 | |||
| 004e9bfef3 | |||
| 34de55cf0c | |||
| c0e458a437 | |||
| 33739acafe | |||
| fe4eed8aa2 | |||
| f5ca757348 | |||
| 476f26752f | |||
| 588859ca3a | |||
| cc8d237786 | |||
| 5dde297210 | |||
| d1469290cf | |||
| 51d4284ebe | |||
| 531eb256f1 | |||
| 79388aa753 | |||
| 2980299a2a | |||
| 796e61ada4 | |||
| 90473300e0 | |||
| 5706cdcfa1 | |||
| d794ee4b22 | |||
| 262ee5bb5f | |||
| 5547cf668e | |||
| dd9e42ad27 | |||
| e192116191 | |||
| 67c8602efd | |||
| a324698a67 | |||
| 23bf3397b8 | |||
| db2d0b63e8 | |||
| e7cfeb0d1a | |||
| 366e84c9fc | |||
| 3424b3e265 | |||
| cb80389d74 | |||
| 40276e8b95 | |||
| 106904a763 | |||
| e21d89e998 | |||
| a432ff3461 | |||
| 201256d882 | |||
| b2a34bd10f | |||
| 63cf4c039a | |||
| ca97ca392e | |||
| ec5ad67a3e | |||
| 569ded1e25 | |||
| 8e713a1f06 | |||
| f07173ab22 | |||
| cf6d27b1f5 | |||
| fc18283172 | |||
| 1cd726691e | |||
| 24835db090 | |||
| 2352827d9b | |||
| c5a060ed6b | |||
| 026cc68bf2 | |||
| ec247d5d1d | |||
| 815cb6cb91 | |||
| ca7016176f | |||
| 2c816a509b | |||
| 58e752a022 | |||
| 7d412a274d | |||
| 6bee2a46f1 | |||
| eeab6a399e | |||
| 9e04bf0fa7 | |||
| 2842c6c125 | |||
| bafd0b6af2 | |||
| eb89ef2f2b | |||
| f9822b7c78 | |||
| e4feeae064 | |||
| 31ff81576c | |||
| 0d879e61a9 | |||
| ba7074f902 | |||
| f371500570 | |||
| 7324535bfc | |||
| 59c95e53c4 | |||
| a66ca7b3a8 | |||
| 273a918ed9 | |||
| 7198d610c5 | |||
| a6389f0174 | |||
| d9c922aa47 | |||
| 0156d2fbc0 | |||
| 650eb1c302 | |||
| 33919c501c | |||
| be9da5aabe | |||
| f341219613 | |||
| a486f9e78d | |||
| b3940283a8 | |||
| 74aebce357 | |||
| 0cd6a82a0f | |||
| 81a5c712c6 | |||
| 025a403c73 | |||
| a762445bce | |||
| e1a87c84f3 | |||
| 5f47383648 | |||
| 7a702be012 | |||
| abfb0c637a | |||
| c9cedebeb0 | |||
| be1c7fa4c2 | |||
| 2b421f3b63 | |||
| 80f13d7057 | |||
| ab05014896 | |||
| c8433f7b55 | |||
| bb52003743 | |||
| 22ea1b0bca | |||
| adb407dcf5 | |||
| 3b0a4a30bb | |||
| 792ec17a20 |
@ -1,14 +1,14 @@
|
||||
version: 5.10.{build}
|
||||
version: 5.16.{build}
|
||||
configuration: Release
|
||||
platform: Any CPU
|
||||
environment:
|
||||
NSISDIR: C:\Program Files (x86)\NSIS
|
||||
matrix:
|
||||
- QTDIR: C:\Qt\5.9\msvc2015
|
||||
- QTDIR: C:\Qt\5.11\msvc2015
|
||||
PLATFORM: x86
|
||||
NSI: gpxsee.nsi
|
||||
OPENSSLDIR: C:\OpenSSL-Win32\bin
|
||||
- QTDIR: C:\Qt\5.9\msvc2015_64
|
||||
- QTDIR: C:\Qt\5.11\msvc2015_64
|
||||
PLATFORM: x86_amd64
|
||||
NSI: gpxsee64.nsi
|
||||
OPENSSLDIR: C:\OpenSSL-Win64\bin
|
||||
|
||||
@ -4,8 +4,8 @@ KML, FIT, IGC, NMEA and OziExplorer files.
|
||||
|
||||
## Features
|
||||
* 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.
|
||||
* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
|
||||
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
|
||||
* Support for multiple tracks in one view.
|
||||
* Support for POI files.
|
||||
* Print/export to PDF.
|
||||
|
||||
42
gpxsee.pro
42
gpxsee.pro
@ -1,12 +1,16 @@
|
||||
TARGET = GPXSee
|
||||
VERSION = 5.10
|
||||
VERSION = 5.16
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
network
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
|
||||
lessThan(QT_VERSION, 5.4): QT += opengl
|
||||
macx: QT += opengl
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT += widgets
|
||||
QT += printsupport
|
||||
}
|
||||
lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
|
||||
equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
|
||||
|
||||
INCLUDEPATH += ./src
|
||||
HEADERS += src/config.h \
|
||||
src/common/staticassert.h \
|
||||
@ -15,6 +19,7 @@ HEADERS += src/config.h \
|
||||
src/common/rectc.h \
|
||||
src/common/wgs84.h \
|
||||
src/common/str2int.h \
|
||||
src/common/rtree.h \
|
||||
src/GUI/app.h \
|
||||
src/GUI/icons.h \
|
||||
src/GUI/gui.h \
|
||||
@ -48,6 +53,7 @@ HEADERS += src/config.h \
|
||||
src/GUI/format.h \
|
||||
src/GUI/cadencegraph.h \
|
||||
src/GUI/powergraph.h \
|
||||
src/GUI/gearratiograph.h \
|
||||
src/GUI/optionsdialog.h \
|
||||
src/GUI/colorbox.h \
|
||||
src/GUI/stylecombobox.h \
|
||||
@ -60,6 +66,7 @@ HEADERS += src/config.h \
|
||||
src/GUI/temperaturegraphitem.h \
|
||||
src/GUI/cadencegraphitem.h \
|
||||
src/GUI/powergraphitem.h \
|
||||
src/GUI/gearratiographitem.h \
|
||||
src/GUI/oddspinbox.h \
|
||||
src/GUI/settings.h \
|
||||
src/GUI/nicenum.h \
|
||||
@ -69,7 +76,7 @@ HEADERS += src/config.h \
|
||||
src/map/projection.h \
|
||||
src/map/ellipsoid.h \
|
||||
src/map/datum.h \
|
||||
src/map/mercator.h \
|
||||
src/map/webmercator.h \
|
||||
src/map/transversemercator.h \
|
||||
src/map/latlon.h \
|
||||
src/map/utm.h \
|
||||
@ -117,7 +124,6 @@ HEADERS += src/config.h \
|
||||
src/data/trackdata.h \
|
||||
src/data/routedata.h \
|
||||
src/data/path.h \
|
||||
src/data/rtree.h \
|
||||
src/data/gpxparser.h \
|
||||
src/data/tcxparser.h \
|
||||
src/data/csvparser.h \
|
||||
@ -126,7 +132,12 @@ HEADERS += src/config.h \
|
||||
src/data/igcparser.h \
|
||||
src/data/nmeaparser.h \
|
||||
src/data/oziparsers.h \
|
||||
src/map/rectd.h
|
||||
src/map/rectd.h \
|
||||
src/map/geocentric.h \
|
||||
src/map/mercator.h \
|
||||
src/map/jnxmap.h \
|
||||
src/map/krovak.h \
|
||||
src/GUI/kv.h
|
||||
SOURCES += src/main.cpp \
|
||||
src/common/coordinates.cpp \
|
||||
src/common/rectc.cpp \
|
||||
@ -160,6 +171,7 @@ SOURCES += src/main.cpp \
|
||||
src/GUI/format.cpp \
|
||||
src/GUI/cadencegraph.cpp \
|
||||
src/GUI/powergraph.cpp \
|
||||
src/GUI/gearratiograph.cpp \
|
||||
src/GUI/optionsdialog.cpp \
|
||||
src/GUI/colorbox.cpp \
|
||||
src/GUI/stylecombobox.cpp \
|
||||
@ -171,6 +183,7 @@ SOURCES += src/main.cpp \
|
||||
src/GUI/temperaturegraphitem.cpp \
|
||||
src/GUI/cadencegraphitem.cpp \
|
||||
src/GUI/powergraphitem.cpp \
|
||||
src/GUI/gearratiographitem.cpp \
|
||||
src/GUI/nicenum.cpp \
|
||||
src/GUI/mapview.cpp \
|
||||
src/map/maplist.cpp \
|
||||
@ -184,7 +197,7 @@ SOURCES += src/main.cpp \
|
||||
src/map/matrix.cpp \
|
||||
src/map/ellipsoid.cpp \
|
||||
src/map/datum.cpp \
|
||||
src/map/mercator.cpp \
|
||||
src/map/webmercator.cpp \
|
||||
src/map/transversemercator.cpp \
|
||||
src/map/utm.cpp \
|
||||
src/map/lambertconic.cpp \
|
||||
@ -220,7 +233,13 @@ SOURCES += src/main.cpp \
|
||||
src/data/fitparser.cpp \
|
||||
src/data/igcparser.cpp \
|
||||
src/data/nmeaparser.cpp \
|
||||
src/data/oziparsers.cpp
|
||||
src/data/oziparsers.cpp \
|
||||
src/map/geocentric.cpp \
|
||||
src/map/mercator.cpp \
|
||||
src/map/jnxmap.cpp \
|
||||
src/map/krovak.cpp \
|
||||
src/map/map.cpp
|
||||
|
||||
RESOURCES += gpxsee.qrc
|
||||
TRANSLATIONS = lang/gpxsee_cs.ts \
|
||||
lang/gpxsee_sv.ts \
|
||||
@ -229,6 +248,7 @@ TRANSLATIONS = lang/gpxsee_cs.ts \
|
||||
lang/gpxsee_fi.ts \
|
||||
lang/gpxsee_fr.ts \
|
||||
lang/gpxsee_pl.ts
|
||||
|
||||
macx {
|
||||
ICON = icons/gpxsee.icns
|
||||
QMAKE_INFO_PLIST = pkg/Info.plist
|
||||
@ -267,5 +287,7 @@ win32 {
|
||||
icons/plt.ico \
|
||||
icons/rte.ico \
|
||||
icons/wpt.ico
|
||||
DEFINES += _USE_MATH_DEFINES
|
||||
}
|
||||
|
||||
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -106,7 +106,7 @@
|
||||
<translation>Korkeus</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="122"/>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="125"/>
|
||||
<source>m</source>
|
||||
<translation>m</translation>
|
||||
</message>
|
||||
@ -126,7 +126,7 @@
|
||||
<translation>Minimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="125"/>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="128"/>
|
||||
<source>ft</source>
|
||||
<translation>ft</translation>
|
||||
</message>
|
||||
@ -306,49 +306,49 @@
|
||||
<context>
|
||||
<name>GUI</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="593"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="595"/>
|
||||
<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="667"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="669"/>
|
||||
<source>Open file</source>
|
||||
<translation>Avaa tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="758"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="774"/>
|
||||
<source>Open POI file</source>
|
||||
<translation>Avaa POI-tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="200"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="196"/>
|
||||
<source>Quit</source>
|
||||
<translation>Lopeta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="209"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="610"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="611"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="205"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="612"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="613"/>
|
||||
<source>Keyboard controls</source>
|
||||
<translation>Näppäimistön säätimet</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="234"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="230"/>
|
||||
<source>Close</source>
|
||||
<translation>Sulje</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="240"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="236"/>
|
||||
<source>Reload</source>
|
||||
<translation>Lataa uudelleen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="522"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="523"/>
|
||||
<source>Show</source>
|
||||
<translation>Näytä</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="516"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="517"/>
|
||||
<source>File</source>
|
||||
<translation>Tiedosto</translation>
|
||||
</message>
|
||||
@ -383,17 +383,22 @@
|
||||
<translation>Tyhjennä välimuisti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="218"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="214"/>
|
||||
<source>Open...</source>
|
||||
<translation>Avaa...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="207"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="644"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="645"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="203"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="646"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="647"/>
|
||||
<source>Paths</source>
|
||||
<translation>Tiedostopolut</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="241"/>
|
||||
<source>Statistics...</source>
|
||||
<translation>Tilasto...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="248"/>
|
||||
<source>Load POI file...</source>
|
||||
@ -407,7 +412,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="285"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="289"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="627"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="629"/>
|
||||
<source>Next map</source>
|
||||
<translation>Seuraava kartta</translation>
|
||||
</message>
|
||||
@ -458,7 +463,8 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="363"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="937"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="955"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1020"/>
|
||||
<source>Moving time</source>
|
||||
<translation>Liikkumisaika</translation>
|
||||
</message>
|
||||
@ -523,83 +529,107 @@
|
||||
<translation>Ensimmäinen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="465"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="466"/>
|
||||
<source>POI files</source>
|
||||
<translation>POI-tiedostot</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="477"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="478"/>
|
||||
<source>Display</source>
|
||||
<translation>Näytä</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="489"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="490"/>
|
||||
<source>Units</source>
|
||||
<translation>Yksiköt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="493"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="494"/>
|
||||
<source>Coordinates format</source>
|
||||
<translation>Koordinaattien muoto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="620"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="622"/>
|
||||
<source>Append file</source>
|
||||
<translation>Lisää tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="621"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="623"/>
|
||||
<source>Next/Previous</source>
|
||||
<translation>Next/Previous</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="623"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="625"/>
|
||||
<source>Toggle graph type</source>
|
||||
<translation>Vaihda kaaviokuvan tyyppi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="625"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="627"/>
|
||||
<source>Toggle time type</source>
|
||||
<translation>Vaihda ajan tyyppi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="629"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="631"/>
|
||||
<source>Previous map</source>
|
||||
<translation>Edellinen kartta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="630"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="632"/>
|
||||
<source>Zoom in</source>
|
||||
<translation>Lähennä</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="632"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="634"/>
|
||||
<source>Zoom out</source>
|
||||
<translation>Loitonna</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="634"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="636"/>
|
||||
<source>Digital zoom</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="635"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="637"/>
|
||||
<source>Zoom</source>
|
||||
<translation>Zoom</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1138"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="650"/>
|
||||
<source>Global</source>
|
||||
<translation>Globaaliset</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="654"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="660"/>
|
||||
<source>GCS/PCS directory:</source>
|
||||
<translation>GCS/PCS:n hakemisto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="656"/>
|
||||
<source>User-specific</source>
|
||||
<translation>Käyttäjäkohtaiset</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="976"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="977"/>
|
||||
<source>Statistics</source>
|
||||
<translation>Tilasto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1219"/>
|
||||
<source>Open map file</source>
|
||||
<translation>Avaa karttatiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1178"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1259"/>
|
||||
<source>No files loaded</source>
|
||||
<translation>Yhtään tiedostoja ei ladattu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="923"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="926"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="939"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="943"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1006"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1009"/>
|
||||
<source>Date</source>
|
||||
<translation>Päivämäärä</translation>
|
||||
</message>
|
||||
@ -609,77 +639,60 @@
|
||||
<translation>&Tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="447"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="448"/>
|
||||
<source>&Map</source>
|
||||
<translation>&Kartat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="455"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="456"/>
|
||||
<source>&Graph</source>
|
||||
<translation>Kaa&viokuva</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="464"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="465"/>
|
||||
<source>&POI</source>
|
||||
<translation>&POI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="476"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="477"/>
|
||||
<source>&Data</source>
|
||||
<translation>Tie&dot</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="485"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="486"/>
|
||||
<source>&Settings</source>
|
||||
<translation>&Asetukset</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="503"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="504"/>
|
||||
<source>&Help</source>
|
||||
<translation>&Ohje</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="648"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="650"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="657"/>
|
||||
<source>Map directory:</source>
|
||||
<translation>Karttojen hakemisto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="650"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="652"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="658"/>
|
||||
<source>POI directory:</source>
|
||||
<translation>POI:n hakemisto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="652"/>
|
||||
<source>GCS file:</source>
|
||||
<translation>GCS-tiedosto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="653"/>
|
||||
<source>PCS file:</source>
|
||||
<translation>PCS-tiedosto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="655"/>
|
||||
<source>Ellipsoids file:</source>
|
||||
<translation>Ellipsoids-tiedosto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="658"/>
|
||||
<source>User override directory:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="915"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="930"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="998"/>
|
||||
<source>Routes</source>
|
||||
<translation>Reitit</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1167"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1248"/>
|
||||
<source>Error loading map:</source>
|
||||
<translation>Virhe ladattaessa karttaa:</translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/GUI/gui.cpp" line="1182"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1263"/>
|
||||
<source>%n files</source>
|
||||
<translation>
|
||||
<numerusform>%n tiedosto</numerusform>
|
||||
@ -687,32 +700,33 @@
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="614"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="616"/>
|
||||
<source>Next file</source>
|
||||
<translation>Seuraava tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="590"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="592"/>
|
||||
<source>Version </source>
|
||||
<translation>Versio </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="223"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="219"/>
|
||||
<source>Print...</source>
|
||||
<translation>Tulosta...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="228"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="224"/>
|
||||
<source>Export to PDF...</source>
|
||||
<translation>Vie PDF:ksi...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="917"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="933"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1000"/>
|
||||
<source>Waypoints</source>
|
||||
<translation>Reittipisteet</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="615"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="617"/>
|
||||
<source>Previous file</source>
|
||||
<translation>Edellinen tiedosto</translation>
|
||||
</message>
|
||||
@ -722,117 +736,167 @@
|
||||
<translation>Reittipisteet</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="617"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="619"/>
|
||||
<source>First file</source>
|
||||
<translation>Ensimmäinen tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="619"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="621"/>
|
||||
<source>Last file</source>
|
||||
<translation>Viimeinen tiedosto</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="747"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="763"/>
|
||||
<source>Error loading data file:</source>
|
||||
<translation>Virhe ladattaessa datatiedostoa:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="750"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="777"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="766"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="793"/>
|
||||
<source>Line: %1</source>
|
||||
<translation>Rivi: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="774"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="790"/>
|
||||
<source>Error loading POI file:</source>
|
||||
<translation>Virhe ladattaessa POI-tiedostoa:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="909"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="992"/>
|
||||
<source>Name</source>
|
||||
<translation>Nimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="913"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="927"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="996"/>
|
||||
<source>Tracks</source>
|
||||
<translation>Jäljet</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="212"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="589"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="208"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="591"/>
|
||||
<source>About GPXSee</source>
|
||||
<translation>Tietoja GPXSee:stä</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="527"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="528"/>
|
||||
<source>Navigation</source>
|
||||
<translation>Navigointi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="330"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="933"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="950"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1016"/>
|
||||
<source>Distance</source>
|
||||
<translation>Etäisyys</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="336"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="486"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="935"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="487"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="953"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1018"/>
|
||||
<source>Time</source>
|
||||
<translation>Aika</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GearRatioGraph</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="11"/>
|
||||
<location filename="../src/GUI/gearratiograph.h" line="14"/>
|
||||
<source>Gear ratio</source>
|
||||
<translation>Välityssuhde</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="19"/>
|
||||
<source>Most used</source>
|
||||
<translation>Eniten käytetty</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="21"/>
|
||||
<source>Minimum</source>
|
||||
<translation>Minimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="23"/>
|
||||
<source>Maximum</source>
|
||||
<translation>Maksimi</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GearRatioGraphItem</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiographitem.cpp" line="34"/>
|
||||
<source>Minimum</source>
|
||||
<translation>Minimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiographitem.cpp" line="35"/>
|
||||
<source>Maximum</source>
|
||||
<translation>Maksimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiographitem.cpp" line="36"/>
|
||||
<source>Most used</source>
|
||||
<translation>Eniten käytetty</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GraphView</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="125"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="127"/>
|
||||
<source>m</source>
|
||||
<translation>m</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="128"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="130"/>
|
||||
<source>km</source>
|
||||
<translation>km</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="109"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="117"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="111"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="119"/>
|
||||
<source>ft</source>
|
||||
<translation>ft</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="112"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="46"/>
|
||||
<source>Data not available</source>
|
||||
<translation>Tietoja ei ole saatavilla</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="114"/>
|
||||
<source>mi</source>
|
||||
<translation>mi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="120"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="122"/>
|
||||
<source>nmi</source>
|
||||
<translation>mpk</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="134"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="136"/>
|
||||
<source>s</source>
|
||||
<translation>s</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="137"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="139"/>
|
||||
<source>min</source>
|
||||
<translation>min</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="140"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="142"/>
|
||||
<source>h</source>
|
||||
<translation>t</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="61"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="172"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="66"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="181"/>
|
||||
<source>Distance</source>
|
||||
<translation>Etäisyys</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="174"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="183"/>
|
||||
<source>Time</source>
|
||||
<translation>Aika</translation>
|
||||
</message>
|
||||
@ -883,27 +947,32 @@
|
||||
<context>
|
||||
<name>MapList</name>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="130"/>
|
||||
<location filename="../src/map/maplist.cpp" line="111"/>
|
||||
<source>Supported files</source>
|
||||
<translation>Tuetut tiedostot</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="131"/>
|
||||
<location filename="../src/map/maplist.cpp" line="112"/>
|
||||
<source>Garmin JNX maps</source>
|
||||
<translation>Garmin JNX -kartat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="113"/>
|
||||
<source>OziExplorer maps</source>
|
||||
<translation>OziExplorer -kartat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="132"/>
|
||||
<location filename="../src/map/maplist.cpp" line="114"/>
|
||||
<source>TrekBuddy maps/atlases</source>
|
||||
<translation>TrekBuddy -kartat/kartastot</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="133"/>
|
||||
<location filename="../src/map/maplist.cpp" line="115"/>
|
||||
<source>GeoTIFF images</source>
|
||||
<translation>GeoTIFF -kuvat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="134"/>
|
||||
<location filename="../src/map/maplist.cpp" line="116"/>
|
||||
<source>Online map sources</source>
|
||||
<translation>Online-karttojen lähteet</translation>
|
||||
</message>
|
||||
@ -998,13 +1067,13 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="225"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="418"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="434"/>
|
||||
<source>Graphs</source>
|
||||
<translation>Kaaviokuvat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="55"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="473"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="489"/>
|
||||
<source>General</source>
|
||||
<translation>Yleinen</translation>
|
||||
</message>
|
||||
@ -1139,7 +1208,7 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="303"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="437"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="453"/>
|
||||
<source>s</source>
|
||||
<translation>s</translation>
|
||||
</message>
|
||||
@ -1153,150 +1222,165 @@
|
||||
<source>Minimal duration:</source>
|
||||
<translation>Minimikesto:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="314"/>
|
||||
<source>Computed from distance/time</source>
|
||||
<translation>Laskettu etäisyydestä/ajasta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="315"/>
|
||||
<source>Recorded by device</source>
|
||||
<translation>Tallennettu laitteella</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="330"/>
|
||||
<source>Filtering</source>
|
||||
<translation>Suodatus</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="316"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="331"/>
|
||||
<source>Pause detection</source>
|
||||
<translation>Pysähdysten havaitseminen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="328"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="332"/>
|
||||
<source>Speed</source>
|
||||
<translation>Vauhti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="344"/>
|
||||
<source>mi</source>
|
||||
<translation>mi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="331"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="347"/>
|
||||
<source>nmi</source>
|
||||
<translation>mpk</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="334"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="350"/>
|
||||
<source>km</source>
|
||||
<translation>km</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="338"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="354"/>
|
||||
<source>POI radius:</source>
|
||||
<translation>POI:n säde:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="344"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="477"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="360"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="493"/>
|
||||
<source>POI</source>
|
||||
<translation>POI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="351"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="367"/>
|
||||
<source>WYSIWYG</source>
|
||||
<translation>WYSIWYG</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="352"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="368"/>
|
||||
<source>High-Resolution</source>
|
||||
<translation>Korkea erotuskyky</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="357"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="373"/>
|
||||
<source>The printed area is approximately the display area. The map zoom level does not change.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="359"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="375"/>
|
||||
<source>The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="381"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="397"/>
|
||||
<source>Name</source>
|
||||
<translation>Nimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="383"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="399"/>
|
||||
<source>Date</source>
|
||||
<translation>Päivämäärä</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="385"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="401"/>
|
||||
<source>Distance</source>
|
||||
<translation>Etäisyys</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="387"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="403"/>
|
||||
<source>Time</source>
|
||||
<translation>Aika</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="389"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="405"/>
|
||||
<source>Moving time</source>
|
||||
<translation>Liikkumisaika</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="391"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="407"/>
|
||||
<source>Item count (>1)</source>
|
||||
<translation>Kohteiden määrä (>1)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="406"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="422"/>
|
||||
<source>Separate graph page</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="416"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="432"/>
|
||||
<source>Print mode</source>
|
||||
<translation>Tulostustila</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="417"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="433"/>
|
||||
<source>Header</source>
|
||||
<translation>Otsikko</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="425"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="441"/>
|
||||
<source>Use OpenGL</source>
|
||||
<translation>Käytä OpenGL</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="431"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="447"/>
|
||||
<source>MB</source>
|
||||
<translation>MT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="441"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="457"/>
|
||||
<source>Image cache size:</source>
|
||||
<translation>Kuvavälimuistin koko:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="442"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="458"/>
|
||||
<source>Connection timeout:</source>
|
||||
<translation>Yhteyden aikakatkaisu:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="455"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="480"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="471"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="496"/>
|
||||
<source>System</source>
|
||||
<translation>Järjestelmä</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="474"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="490"/>
|
||||
<source>Appearance</source>
|
||||
<translation>Ulkoasu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="476"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="492"/>
|
||||
<source>Data</source>
|
||||
<translation>Tiedot</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="478"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="494"/>
|
||||
<source>Print & Export</source>
|
||||
<translation>Tulostus & vienti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="507"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="523"/>
|
||||
<source>Options</source>
|
||||
<translation>Valinnat</translation>
|
||||
</message>
|
||||
@ -1365,28 +1449,28 @@
|
||||
<context>
|
||||
<name>ScaleItem</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="83"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="111"/>
|
||||
<source>mi</source>
|
||||
<translation>mi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="84"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="87"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="112"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="115"/>
|
||||
<source>ft</source>
|
||||
<translation>ft</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="86"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="114"/>
|
||||
<source>nmi</source>
|
||||
<translation>mpk</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="89"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="117"/>
|
||||
<source>km</source>
|
||||
<translation>km</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="90"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="118"/>
|
||||
<source>m</source>
|
||||
<translation>m</translation>
|
||||
</message>
|
||||
@ -1400,7 +1484,7 @@
|
||||
<translation>Vauhti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="101"/>
|
||||
<source>km/h</source>
|
||||
<translation>km/t</translation>
|
||||
</message>
|
||||
@ -1435,12 +1519,12 @@
|
||||
<translation>Tahti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="95"/>
|
||||
<source>kn</source>
|
||||
<translation>kn</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="98"/>
|
||||
<source>mi/h</source>
|
||||
<translation>mph</translation>
|
||||
</message>
|
||||
@ -1517,12 +1601,12 @@
|
||||
<translation>Maksimi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="76"/>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="82"/>
|
||||
<source>C</source>
|
||||
<translation>C</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="80"/>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="86"/>
|
||||
<source>F</source>
|
||||
<translation>F</translation>
|
||||
</message>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -106,7 +106,7 @@
|
||||
<translation>Высота</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="122"/>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="125"/>
|
||||
<source>m</source>
|
||||
<translation>м</translation>
|
||||
</message>
|
||||
@ -126,7 +126,7 @@
|
||||
<translation>Минимум</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="125"/>
|
||||
<location filename="../src/GUI/elevationgraph.cpp" line="128"/>
|
||||
<source>ft</source>
|
||||
<translation>фт</translation>
|
||||
</message>
|
||||
@ -306,49 +306,49 @@
|
||||
<context>
|
||||
<name>GUI</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="593"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="595"/>
|
||||
<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="667"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="669"/>
|
||||
<source>Open file</source>
|
||||
<translation>Открыть файл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="758"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="774"/>
|
||||
<source>Open POI file</source>
|
||||
<translation>Открыть файл с точками POI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="200"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="196"/>
|
||||
<source>Quit</source>
|
||||
<translation>Выход</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="209"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="610"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="611"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="205"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="612"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="613"/>
|
||||
<source>Keyboard controls</source>
|
||||
<translation>Управление с помощью клавиатуры</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="234"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="230"/>
|
||||
<source>Close</source>
|
||||
<translation>Закрыть</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="240"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="236"/>
|
||||
<source>Reload</source>
|
||||
<translation>Обновить</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="522"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="523"/>
|
||||
<source>Show</source>
|
||||
<translation>Показать</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="516"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="517"/>
|
||||
<source>File</source>
|
||||
<translation>Файл</translation>
|
||||
</message>
|
||||
@ -383,17 +383,22 @@
|
||||
<translation>Очистить кэш</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="218"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="214"/>
|
||||
<source>Open...</source>
|
||||
<translation>Открыть...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="207"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="644"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="645"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="203"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="646"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="647"/>
|
||||
<source>Paths</source>
|
||||
<translation>Пути</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="241"/>
|
||||
<source>Statistics...</source>
|
||||
<translation>Статистика...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="248"/>
|
||||
<source>Load POI file...</source>
|
||||
@ -407,7 +412,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="285"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="289"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="627"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="629"/>
|
||||
<source>Next map</source>
|
||||
<translation>Следующая карта</translation>
|
||||
</message>
|
||||
@ -458,7 +463,8 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="363"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="937"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="955"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1020"/>
|
||||
<source>Moving time</source>
|
||||
<translation>Время движения</translation>
|
||||
</message>
|
||||
@ -523,83 +529,107 @@
|
||||
<translation>Первый</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="465"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="466"/>
|
||||
<source>POI files</source>
|
||||
<translation>Файлы с точками POI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="477"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="478"/>
|
||||
<source>Display</source>
|
||||
<translation>Отображать</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="489"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="490"/>
|
||||
<source>Units</source>
|
||||
<translation>Единицы</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="493"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="494"/>
|
||||
<source>Coordinates format</source>
|
||||
<translation>Формат координат</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="620"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="622"/>
|
||||
<source>Append file</source>
|
||||
<translation>Добавить файл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="621"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="623"/>
|
||||
<source>Next/Previous</source>
|
||||
<translation>Next/Previous</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="623"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="625"/>
|
||||
<source>Toggle graph type</source>
|
||||
<translation>Переключить тип графика</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="625"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="627"/>
|
||||
<source>Toggle time type</source>
|
||||
<translation>Переключить тип времени</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="629"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="631"/>
|
||||
<source>Previous map</source>
|
||||
<translation>Предыдущая карта</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="630"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="632"/>
|
||||
<source>Zoom in</source>
|
||||
<translation>Увеличить</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="632"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="634"/>
|
||||
<source>Zoom out</source>
|
||||
<translation>Уменьшить</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="634"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="636"/>
|
||||
<source>Digital zoom</source>
|
||||
<translation>Цифровой зум</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="635"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="637"/>
|
||||
<source>Zoom</source>
|
||||
<translation>Zoom</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1138"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="650"/>
|
||||
<source>Global</source>
|
||||
<translation>Глобальные</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="654"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="660"/>
|
||||
<source>GCS/PCS directory:</source>
|
||||
<translation>Директория с GCS/PCS:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="656"/>
|
||||
<source>User-specific</source>
|
||||
<translation>Пользовательские</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="976"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="977"/>
|
||||
<source>Statistics</source>
|
||||
<translation>Статистика</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1219"/>
|
||||
<source>Open map file</source>
|
||||
<translation>Открыть файл карты</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1178"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1259"/>
|
||||
<source>No files loaded</source>
|
||||
<translation>Нет загруженных файлов</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="923"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="926"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="939"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="943"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1006"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1009"/>
|
||||
<source>Date</source>
|
||||
<translation>Дата</translation>
|
||||
</message>
|
||||
@ -609,77 +639,60 @@
|
||||
<translation>&Файл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="447"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="448"/>
|
||||
<source>&Map</source>
|
||||
<translation>&Карты</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="455"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="456"/>
|
||||
<source>&Graph</source>
|
||||
<translation>&График</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="464"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="465"/>
|
||||
<source>&POI</source>
|
||||
<translation>&Точки POI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="476"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="477"/>
|
||||
<source>&Data</source>
|
||||
<translation>&Данные</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="485"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="486"/>
|
||||
<source>&Settings</source>
|
||||
<translation>&Параметры</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="503"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="504"/>
|
||||
<source>&Help</source>
|
||||
<translation>&Справка</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="648"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="650"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="657"/>
|
||||
<source>Map directory:</source>
|
||||
<translation>Директория с картами:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="650"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="652"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="658"/>
|
||||
<source>POI directory:</source>
|
||||
<translation>Директория с POI:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="652"/>
|
||||
<source>GCS file:</source>
|
||||
<translation>GCS файл:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="653"/>
|
||||
<source>PCS file:</source>
|
||||
<translation>PCS файл:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="655"/>
|
||||
<source>Ellipsoids file:</source>
|
||||
<translation>Ellipsoids файл:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="658"/>
|
||||
<source>User override directory:</source>
|
||||
<translation>Каталог пользовательских настроек:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="915"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="930"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="998"/>
|
||||
<source>Routes</source>
|
||||
<translation>Маршруты</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="1167"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1248"/>
|
||||
<source>Error loading map:</source>
|
||||
<translation>Ошибка загрузки карты:</translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/GUI/gui.cpp" line="1182"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1263"/>
|
||||
<source>%n files</source>
|
||||
<translation>
|
||||
<numerusform>%n файл</numerusform>
|
||||
@ -688,32 +701,33 @@
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="614"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="616"/>
|
||||
<source>Next file</source>
|
||||
<translation>Следующий файл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="590"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="592"/>
|
||||
<source>Version </source>
|
||||
<translation>Версия </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="223"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="219"/>
|
||||
<source>Print...</source>
|
||||
<translation>Печать...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="228"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="224"/>
|
||||
<source>Export to PDF...</source>
|
||||
<translation>Экспорт в PDF...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="917"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="933"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1000"/>
|
||||
<source>Waypoints</source>
|
||||
<translation>Точки</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="615"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="617"/>
|
||||
<source>Previous file</source>
|
||||
<translation>Предыдущий файл</translation>
|
||||
</message>
|
||||
@ -723,117 +737,167 @@
|
||||
<translation>Маршрутные точки</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="617"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="619"/>
|
||||
<source>First file</source>
|
||||
<translation>Первый файл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="619"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="621"/>
|
||||
<source>Last file</source>
|
||||
<translation>Последний файл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="747"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="763"/>
|
||||
<source>Error loading data file:</source>
|
||||
<translation>Ошибка загрузки файла данных:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="750"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="777"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="766"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="793"/>
|
||||
<source>Line: %1</source>
|
||||
<translation>Строка: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="774"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="790"/>
|
||||
<source>Error loading POI file:</source>
|
||||
<translation>Ошибка загрузки файла с точками POI:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="909"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="992"/>
|
||||
<source>Name</source>
|
||||
<translation>Имя</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="913"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="927"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="996"/>
|
||||
<source>Tracks</source>
|
||||
<translation>Треки</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="212"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="589"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="208"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="591"/>
|
||||
<source>About GPXSee</source>
|
||||
<translation>О GPXSee</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="527"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="528"/>
|
||||
<source>Navigation</source>
|
||||
<translation>Навигация</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="330"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="933"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="950"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1016"/>
|
||||
<source>Distance</source>
|
||||
<translation>Расстояние</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="336"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="486"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="935"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="487"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="953"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="1018"/>
|
||||
<source>Time</source>
|
||||
<translation>Время</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GearRatioGraph</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="11"/>
|
||||
<location filename="../src/GUI/gearratiograph.h" line="14"/>
|
||||
<source>Gear ratio</source>
|
||||
<translation>Передаточное отношение</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="19"/>
|
||||
<source>Most used</source>
|
||||
<translation>Чаще всего используемое</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="21"/>
|
||||
<source>Minimum</source>
|
||||
<translation>Минимум</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiograph.cpp" line="23"/>
|
||||
<source>Maximum</source>
|
||||
<translation>Максимум</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GearRatioGraphItem</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiographitem.cpp" line="34"/>
|
||||
<source>Minimum</source>
|
||||
<translation>Минимум</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiographitem.cpp" line="35"/>
|
||||
<source>Maximum</source>
|
||||
<translation>Максимум</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gearratiographitem.cpp" line="36"/>
|
||||
<source>Most used</source>
|
||||
<translation>Чаще всего используемое</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GraphView</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="125"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="127"/>
|
||||
<source>m</source>
|
||||
<translation>м</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="128"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="130"/>
|
||||
<source>km</source>
|
||||
<translation>км</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="109"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="117"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="111"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="119"/>
|
||||
<source>ft</source>
|
||||
<translation>фт</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="112"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="46"/>
|
||||
<source>Data not available</source>
|
||||
<translation>Данные отсутствуют</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="114"/>
|
||||
<source>mi</source>
|
||||
<translation>мл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="120"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="122"/>
|
||||
<source>nmi</source>
|
||||
<translation>мор. мл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="134"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="136"/>
|
||||
<source>s</source>
|
||||
<translation>с</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="137"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="139"/>
|
||||
<source>min</source>
|
||||
<translation>мин</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="140"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="142"/>
|
||||
<source>h</source>
|
||||
<translation>ч</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="61"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="172"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="66"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="181"/>
|
||||
<source>Distance</source>
|
||||
<translation>Расстояние</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/graphview.cpp" line="174"/>
|
||||
<location filename="../src/GUI/graphview.cpp" line="183"/>
|
||||
<source>Time</source>
|
||||
<translation>Время</translation>
|
||||
</message>
|
||||
@ -844,7 +908,7 @@
|
||||
<location filename="../src/GUI/heartrategraph.cpp" line="11"/>
|
||||
<location filename="../src/GUI/heartrategraph.h" line="13"/>
|
||||
<source>Heart rate</source>
|
||||
<translation>Частота сердечных сокращений</translation>
|
||||
<translation>Пульс</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/heartrategraph.cpp" line="10"/>
|
||||
@ -884,27 +948,32 @@
|
||||
<context>
|
||||
<name>MapList</name>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="130"/>
|
||||
<location filename="../src/map/maplist.cpp" line="111"/>
|
||||
<source>Supported files</source>
|
||||
<translation>Все поддерживаемые файлы</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="131"/>
|
||||
<location filename="../src/map/maplist.cpp" line="112"/>
|
||||
<source>Garmin JNX maps</source>
|
||||
<translation>Garmin JNX карты</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="113"/>
|
||||
<source>OziExplorer maps</source>
|
||||
<translation>OziExplorer карты</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="132"/>
|
||||
<location filename="../src/map/maplist.cpp" line="114"/>
|
||||
<source>TrekBuddy maps/atlases</source>
|
||||
<translation>TrekBuddy карты/атласы</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="133"/>
|
||||
<location filename="../src/map/maplist.cpp" line="115"/>
|
||||
<source>GeoTIFF images</source>
|
||||
<translation>GeoTIFF изображения</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/map/maplist.cpp" line="134"/>
|
||||
<location filename="../src/map/maplist.cpp" line="116"/>
|
||||
<source>Online map sources</source>
|
||||
<translation>Источники онлайн карт</translation>
|
||||
</message>
|
||||
@ -999,13 +1068,13 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="225"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="418"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="434"/>
|
||||
<source>Graphs</source>
|
||||
<translation>Графики</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="55"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="473"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="489"/>
|
||||
<source>General</source>
|
||||
<translation>Общие</translation>
|
||||
</message>
|
||||
@ -1091,7 +1160,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="254"/>
|
||||
<source>Heart rate:</source>
|
||||
<translation>Частота сердечных сокращений:</translation>
|
||||
<translation>Пульс:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="255"/>
|
||||
@ -1140,7 +1209,7 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="303"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="437"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="453"/>
|
||||
<source>s</source>
|
||||
<translation>с</translation>
|
||||
</message>
|
||||
@ -1154,150 +1223,165 @@
|
||||
<source>Minimal duration:</source>
|
||||
<translation>Минимальная продолжительность:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="314"/>
|
||||
<source>Computed from distance/time</source>
|
||||
<translation>Вычисленная из расстояния/времени</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="315"/>
|
||||
<source>Recorded by device</source>
|
||||
<translation>Записанная устройством</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="330"/>
|
||||
<source>Filtering</source>
|
||||
<translation>Фильтрация</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="316"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="331"/>
|
||||
<source>Pause detection</source>
|
||||
<translation>Обнаружение остановок</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="328"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="332"/>
|
||||
<source>Speed</source>
|
||||
<translation>Скорость</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="344"/>
|
||||
<source>mi</source>
|
||||
<translation>мл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="331"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="347"/>
|
||||
<source>nmi</source>
|
||||
<translation>мор. мл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="334"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="350"/>
|
||||
<source>km</source>
|
||||
<translation>км</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="338"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="354"/>
|
||||
<source>POI radius:</source>
|
||||
<translation>Радиус точки POI:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="344"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="477"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="360"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="493"/>
|
||||
<source>POI</source>
|
||||
<translation>Точки POI</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="351"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="367"/>
|
||||
<source>WYSIWYG</source>
|
||||
<translation>WYSIWYG</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="352"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="368"/>
|
||||
<source>High-Resolution</source>
|
||||
<translation>Высокое разрешение</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="357"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="373"/>
|
||||
<source>The printed area is approximately the display area. The map zoom level does not change.</source>
|
||||
<translation>Печатная область примерно совпадает с областью отображения. Уровень приближения карты не изменяется.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="359"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="375"/>
|
||||
<source>The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution.</source>
|
||||
<translation>Уровень приближения будет изменен так, чтобы всё содержимое (треки/точки) уместились в печатную область и разрешение карты было бы как можно ближе к разрешению печати.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="381"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="397"/>
|
||||
<source>Name</source>
|
||||
<translation>Имя</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="383"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="399"/>
|
||||
<source>Date</source>
|
||||
<translation>Дата</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="385"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="401"/>
|
||||
<source>Distance</source>
|
||||
<translation>Расстояние</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="387"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="403"/>
|
||||
<source>Time</source>
|
||||
<translation>Время</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="389"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="405"/>
|
||||
<source>Moving time</source>
|
||||
<translation>Время движения</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="391"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="407"/>
|
||||
<source>Item count (>1)</source>
|
||||
<translation>Количество объектов (>1)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="406"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="422"/>
|
||||
<source>Separate graph page</source>
|
||||
<translation>Отдельная страница с графиком</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="416"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="432"/>
|
||||
<source>Print mode</source>
|
||||
<translation>Режим печати</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="417"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="433"/>
|
||||
<source>Header</source>
|
||||
<translation>Заголовок</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="425"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="441"/>
|
||||
<source>Use OpenGL</source>
|
||||
<translation>Использовать OpenGL</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="431"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="447"/>
|
||||
<source>MB</source>
|
||||
<translation>МБ</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="441"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="457"/>
|
||||
<source>Image cache size:</source>
|
||||
<translation>Размер кэша изображений:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="442"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="458"/>
|
||||
<source>Connection timeout:</source>
|
||||
<translation>Таймаут соединения:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="455"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="480"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="471"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="496"/>
|
||||
<source>System</source>
|
||||
<translation>Система</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="474"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="490"/>
|
||||
<source>Appearance</source>
|
||||
<translation>Внешний вид</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="476"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="492"/>
|
||||
<source>Data</source>
|
||||
<translation>Данные</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="478"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="494"/>
|
||||
<source>Print & Export</source>
|
||||
<translation>Печать и экспорт</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="507"/>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="523"/>
|
||||
<source>Options</source>
|
||||
<translation>Параметры</translation>
|
||||
</message>
|
||||
@ -1366,28 +1450,28 @@
|
||||
<context>
|
||||
<name>ScaleItem</name>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="83"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="111"/>
|
||||
<source>mi</source>
|
||||
<translation>мл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="84"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="87"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="112"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="115"/>
|
||||
<source>ft</source>
|
||||
<translation>фт</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="86"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="114"/>
|
||||
<source>nmi</source>
|
||||
<translation>мор. мл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="89"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="117"/>
|
||||
<source>km</source>
|
||||
<translation>км</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="90"/>
|
||||
<location filename="../src/GUI/scaleitem.cpp" line="118"/>
|
||||
<source>m</source>
|
||||
<translation>м</translation>
|
||||
</message>
|
||||
@ -1401,7 +1485,7 @@
|
||||
<translation>Скорость</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="96"/>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="101"/>
|
||||
<source>km/h</source>
|
||||
<translation>км/ч</translation>
|
||||
</message>
|
||||
@ -1436,12 +1520,12 @@
|
||||
<translation>Темп</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="90"/>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="95"/>
|
||||
<source>kn</source>
|
||||
<translation>уз</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="93"/>
|
||||
<location filename="../src/GUI/speedgraph.cpp" line="98"/>
|
||||
<source>mi/h</source>
|
||||
<translation>мл/ч</translation>
|
||||
</message>
|
||||
@ -1518,12 +1602,12 @@
|
||||
<translation>Максимум</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="76"/>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="82"/>
|
||||
<source>C</source>
|
||||
<translation>C</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="80"/>
|
||||
<location filename="../src/GUI/temperaturegraph.cpp" line="86"/>
|
||||
<source>F</source>
|
||||
<translation>F</translation>
|
||||
</message>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,6 +3,7 @@ Modified Airy,7002,6377340.189,299.3249646
|
||||
Australian National,7003,6378160.0,298.25
|
||||
Bessel 1841,7004,6377397.155,299.1528128
|
||||
Bessel 1841 (Norway),7005,6377492.0176,299.1528
|
||||
Clarke 1858,7007,6378293.645,294.26
|
||||
Clarke 1866,7008,6378206.4,294.9786982
|
||||
Clarke 1880 (Palestine),7010,6378300.789,293.466
|
||||
Clarke 1880 (IGN),7011,6378249.2,293.466021
|
||||
@ -11,9 +12,17 @@ Everest 1830 (1937 Adjustment),7015,6377276.345,300.8017
|
||||
Everest 1830 Modified,7018,6377304.063,300.8017
|
||||
GRS 80,7019,6378137.0,298.257222101
|
||||
Helmert 1906,7020,6378200.0,298.3
|
||||
Indonesian National Spheroid,7021,6378160.0,298.247
|
||||
International 1924,7022,6378388.0,297.0
|
||||
Krassovsky 1940,7024,6378245.0,298.3
|
||||
War Office,7029,6378300.0,296.0
|
||||
South American 1969,7036,6378160.0,298.25
|
||||
WGS 72,7043,6378135.0,298.26
|
||||
Everest 1830 (1962 Definition),7044,6377301.243,300.8017255
|
||||
Everest 1830 (1975 Definition),7045,6377299.151,300.8017255
|
||||
Bessel 1841 (Namibia),7046,6377483.865,299.1528128
|
||||
GRS 1967 Modified,7050,6378160.0,298.25
|
||||
Danish 1876,7051,6377019.27,300.0
|
||||
Hough 1960,7053,6378270.0,297.0
|
||||
Clarke 1880 (international foot),7055,6378306.370,293.4663077
|
||||
PZ-90,7054,6378136.0,298.257839303
|
||||
|
||||
|
498
pkg/csv/gcs.csv
498
pkg/csv/gcs.csv
@ -1,124 +1,374 @@
|
||||
Adindan,4201,6201,9122,7012,8901,9603,-162,-12,206
|
||||
Afgooye,4205,6205,9122,7024,8901,9603,-43,-163,45
|
||||
Ain el Abd 1970,4204,6204,9122,7022,8901,9603,-150,-251,-2
|
||||
Anna 1 Astro 1965,4708,6708,9122,7003,8901,9603,-491,-22,435
|
||||
Arc 1950,4209,6209,9122,7012,8901,9603,-143,-90,-294
|
||||
Arc 1960,4210,6210,9122,7012,8901,9603,-160,-8,-300
|
||||
Ascension Island 1958,4712,6712,9122,7022,8901,9603,-207,107,52
|
||||
Astro B4 Sorol Atoll,4707,6707,9122,7022,8901,9603,114,-116,-333
|
||||
Astro Beacon 1945,4709,6709,9122,7022,8901,9603,145,75,-272
|
||||
Astro DOS 71/4,4710,6710,9122,7022,8901,9603,-320,550,-494
|
||||
Astronomic Stn 1952,4711,6711,9122,7022,8901,9603,124,-234,-25
|
||||
Australian Geodetic 1966,4202,6202,9122,7003,8901,9603,-133,-48,148
|
||||
Australian Geodetic 1984,4203,6203,9122,7003,8901,9603,-134,-48,149
|
||||
Australian Geocentric 1994 (GDA94),4283,6283,9122,7019,8901,9603,0,0,0
|
||||
Austrian,4312,6312,9122,7004,8901,9603,594,84,471
|
||||
Bellevue (IGN),4714,6714,9122,7022,8901,9603,-127,-769,472
|
||||
Bermuda 1957,4216,6216,9122,7008,8901,9603,-73,213,296
|
||||
Bogota Observatory,4218,6218,9122,7022,8901,9603,307,304,-318
|
||||
Campo Inchauspe,4221,6221,9122,7022,8901,9603,-148,136,90
|
||||
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.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
|
||||
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
|
||||
EST97,4180,6180,9122,7019,8901,9603,0,0,0
|
||||
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
|
||||
European 1979,4668,6668,9122,7022,8901,9603,-86,-98,-119
|
||||
Finland Hayford,4123,6123,9122,7022,8901,9603,-78,-231,-97
|
||||
Gandajika Base,4233,6233,9122,7022,8901,9603,-133,-321,50
|
||||
Geodetic Datum 1949,4272,6272,9122,7022,8901,9603,84,-22,209
|
||||
GGRS 87,4121,6121,9122,7019,8901,9603,-199.87,74.79,246.62
|
||||
Guam 1963,4675,6675,9122,7008,8901,9603,-100,-248,259
|
||||
GUX 1 Astro,4718,6718,9122,7022,8901,9603,252,-209,-751
|
||||
Hartebeeshoek94,4148,6148,9122,7030,8901,9603,0,0,0
|
||||
Hermannskogel,3906,1031,9122,7004,8901,9603,653,-212,449
|
||||
Hjorsey 1955,4658,6658,9122,7022,8901,9603,-73,46,-86
|
||||
Hong Kong 1963,4739,6739,9122,7022,8901,9603,-156,-271,-189
|
||||
Hu-Tzu-Shan,4236,6236,9122,7022,8901,9603,-634,-549,-201
|
||||
Indian Bangladesh,4682,6682,9122,7015,8901,9603,289,734,257
|
||||
Indian Thailand,4240,6240,9122,7015,8901,9603,214,836,303
|
||||
Israeli,4281,6281,9122,7010,8901,9603,-235,-85,264
|
||||
Ireland 1965,4299,6299,9122,7002,8901,9603,506,-122,611
|
||||
ISTS 073 Astro 1969,4724,6724,9122,7022,8901,9603,208,-435,-229
|
||||
Johnston Island,4725,6725,9122,7022,8901,9603,191,-77,-204
|
||||
Kandawala,4244,6244,9122,7015,8901,9603,-97,787,86
|
||||
Kerguelen Island,4698,6698,9122,7022,8901,9603,145,-187,103
|
||||
Kertau 1948,4245,6245,9122,7018,8901,9603,-11,851,5
|
||||
L.C. 5 Astro,4726,6726,9122,7008,8901,9603,42,124,147
|
||||
Liberia 1964,4251,6251,9122,7012,8901,9603,-90,40,88
|
||||
Luzon Mindanao,,,9122,7008,8901,9603,-133,-79,-72
|
||||
Luzon Philippines,4253,6253,9122,7008,8901,9603,-133,-77,-51
|
||||
Mahe 1971,4256,6256,9122,7012,8901,9603,41,-220,-134
|
||||
Marco Astro,4616,6616,9122,7022,8901,9603,-289,-124,60
|
||||
Massawa,4262,6262,9122,7004,8901,9603,639,405,60
|
||||
Merchich,4261,6261,9122,7012,8901,9603,31,146,47
|
||||
Midway Astro 1961,4727,6727,9122,7022,8901,9603,912,-58,1227
|
||||
Minna,4263,6263,9122,7012,8901,9603,-92,-93,122
|
||||
NAD27 Alaska,,,9122,7008,8901,9603,-5,135,172
|
||||
NAD27 Bahamas,,,9122,7008,8901,9603,-4,154,178
|
||||
NAD27 Canada,,,9122,7008,8901,9603,-10,158,187
|
||||
NAD27 Canal Zone,,,9122,7008,8901,9603,0,125,201
|
||||
NAD27 Caribbean,,,9122,7008,8901,9603,-3,142,183
|
||||
NAD27 Central,,,9122,7008,8901,9603,0,125,194
|
||||
NAD27 CONUS,4267,6267,9122,7008,8901,9603,-8,160,176
|
||||
NAD27 Cuba,,,9122,7008,8901,9603,-9,152,178
|
||||
NAD27 Greenland,,,9122,7008,8901,9603,11,114,195
|
||||
NAD27 Mexico,,,9122,7008,8901,9603,-12,130,190
|
||||
NAD27 San Salvador,,,9122,7008,8901,9603,1,140,165
|
||||
NAD83,4269,6269,9122,7019,8901,9603,0,0,0
|
||||
Nahrwn Masirah Ilnd,,,9122,7012,8901,9603,-247,-148,369
|
||||
Nahrwn Saudi Arbia,,,9122,7012,8901,9603,-231,-196,482
|
||||
Nahrwn United Arab,4270,6270,9122,7012,8901,9603,-249,-156,381
|
||||
Naparima BWI,4271,6271,9122,7022,8901,9603,-2,374,172
|
||||
NGO1948,4273,6273,9122,7005,8901,9603,315,-217,528
|
||||
NTF France,4275,6275,9122,7011,8901,9603,-168,-60,320
|
||||
Norsk,4817,6817,9122,7005,8913,9603,278,93,474
|
||||
NZGD1949,4272,6272,9122,7022,8901,9603,84,-22,209
|
||||
NZGD2000,4167,6167,9122,7030,8901,9603,0,0,0
|
||||
Observatorio 1966,4182,6182,9122,7022,8901,9603,-425,-169,81
|
||||
Old Egyptian,4229,6229,9122,7020,8901,9603,-130,110,-13
|
||||
Old Hawaiian,4135,6135,9122,7008,8901,9603,61,-285,-181
|
||||
Oman,4232,6232,9122,7012,8901,9603,-346,-1,224
|
||||
Ord Srvy Grt Britn,4277,6277,9122,7001,8901,9603,375,-111,431
|
||||
Pico De Las Nieves,4728,6728,9122,7022,8901,9603,-307,-92,127
|
||||
Pitcairn Astro 1967,4729,6729,9122,7022,8901,9603,185,165,42
|
||||
Potsdam Rauenberg DHDN,4314,6314,9122,7004,8901,9603,606,23,413
|
||||
Prov So Amrican 1956,4248,6248,9122,7022,8901,9603,-288,175,-376
|
||||
Prov So Chilean 1963,4254,6254,9122,7022,8901,9603,16,196,93
|
||||
Puerto Rico,4139,6139,9122,7008,8901,9603,11,72,-101
|
||||
Pulkovo 1942 (1),4284,6284,9122,7024,8901,9603,28,-130,-95
|
||||
Pulkovo 1942 (2),,,9122,7024,8901,9603,28,-130,-95
|
||||
Qatar National,4285,6285,9122,7022,8901,9603,-128,-283,22
|
||||
Qornoq,4287,6287,9108,7022,8901,9603,164,138,-189
|
||||
Reunion,4626,6626,9122,7022,8901,9603,94,-948,-1262
|
||||
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
|
||||
Schwarzeck,4293,6293,9122,7046,8901,9603,616,97,-251
|
||||
South American 1969,4291,6291,9108,7036,8901,9603,-57,1,-41
|
||||
Southeast Base,4615,6615,9122,7022,8901,9603,-499,-249,314
|
||||
Southwest Base,4183,6183,9122,7022,8901,9603,-104,167,-38
|
||||
Timbalai 1948,4298,6298,9122,7015,8901,9603,-689,691,-46
|
||||
Tokyo,4301,6301,9122,7004,8901,9603,-128,481,664
|
||||
Tristan Astro 1968,4734,6734,9122,7022,8901,9603,-632,438,-609
|
||||
Viti Levu 1916,4731,6731,9122,7012,8901,9603,51,391,-36
|
||||
Wake-Eniwetok 1960,4732,6732,9122,7053,8901,9603,101,52,-39
|
||||
WGS 72,4322,6322,9122,7043,8901,9603,0,0,5
|
||||
Yacare,4309,6309,9122,7022,8901,9603,-155,171,37
|
||||
Zanderij,4311,6311,9122,7022,8901,9603,-265,120,-358
|
||||
HD1909,3819,1024,9122,7004,8901,9607,595.48,121.69,515.35,-4.115,2.9383,-0.853,-3.408
|
||||
TWD97,3824,1026,9122,7019,8901,9603,0,0,0,,,,
|
||||
IGRS,3889,1029,9122,7019,8901,9603,0,0,0,,,,
|
||||
Hermannskogel,3906,1031,9122,7004,8901,9603,653,-212,449,,,,
|
||||
MOLDREF99,4023,1032,9122,7019,8901,9603,0,0,0,,,,
|
||||
RGRDC 2005,4046,1033,9122,7019,8901,9603,0,0,0,,,,
|
||||
SREF98,4075,1034,9122,7019,8901,9603,0,0,0,,,,
|
||||
REGCAN95,4081,1035,9122,7019,8901,9603,0,0,0,,,,
|
||||
GGRS 87,4121,6121,9122,7019,8901,9603,-199.87,74.79,246.62,,,,
|
||||
Finland Hayford,4123,6123,9122,7022,8901,9603,-78,-231,-97,,,,
|
||||
RT 90,4124,6124,9122,7004,8901,9603,498,-36,568,,,,
|
||||
Samboja,4125,6125,9108,7004,8901,9603,-404.78,685.68,45.47,,,,
|
||||
Tete,4127,6127,9122,7008,8901,9603,-80,-100,-228,,,,
|
||||
Observatario,4129,6129,9122,7008,8901,9603,-132,-110,-335,,,,
|
||||
Moznet,4130,6130,9122,7030,8901,9607,0,0,0,0,0,0,0
|
||||
Indian 1960,4131,6131,9122,7015,8901,9603,198,881,317,,,,
|
||||
FD58,4132,6132,9122,7012,8901,9603,-241.54,-163.64,396.06,,,,
|
||||
EST92,4133,6133,9122,7019,8901,9607,0.055,-0.541,-0.185,-0.0183,0.0003,0.007,-0.014
|
||||
PSD93,4134,6134,9122,7012,8901,9606,-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006
|
||||
Old Hawaiian,4135,6135,9122,7008,8901,9603,61,-285,-181,,,,
|
||||
Puerto Rico,4139,6139,9122,7008,8901,9603,11,72,-101,,,,
|
||||
NAD83(CSRS98),4140,6140,9108,7019,8901,9603,0,0,0,,,,
|
||||
Israel 1993,4141,6141,9122,7019,8901,9603,-48,55,52,,,,
|
||||
Locodjo 1965,4142,6142,9122,7012,8901,9603,-125,53,467,,,,
|
||||
Abidjan 1987,4143,6143,9122,7012,8901,9603,-124.76,53,466.79,,,,
|
||||
Kalianpur 1937,4144,6144,9122,7015,8901,9603,214,804,268,,,,
|
||||
Kalianpur 1962,4145,6145,9122,7044,8901,9603,283,682,231,,,,
|
||||
Kalianpur 1975,4146,6146,9122,7045,8901,9603,295,736,257,,,,
|
||||
Hanoi 1972,4147,6147,9122,7024,8901,9603,-17.51,-108.32,-62.39,,,,
|
||||
Hartebeeshoek94,4148,6148,9122,7030,8901,9603,0,0,0,,,,
|
||||
CH-1903,4149,6149,9122,7004,8901,9603,674.374,15.056,405.343,,,,
|
||||
CH1903+,4150,6150,9122,7004,8901,9603,674.374,15.056,405.346,,,,
|
||||
CHTRF95,4151,6151,9122,7019,8901,9603,0,0,0,,,,
|
||||
NAD83(HARN),4152,6152,9122,7019,8901,9603,0,0,0,,,,
|
||||
Rassadiran,4153,6153,9122,7022,8901,9603,-133.63,-157.5,-158.62,,,,
|
||||
ED50(ED77),4154,6154,9122,7022,8901,9603,-117,-132,-164,,,,
|
||||
Dabola 1981,4155,6155,9122,7011,8901,9603,-83,37,124,,,,
|
||||
S-JTSK,4156,6156,9122,7004,8901,9603,589,76,480,,,,
|
||||
Naparima 1955,4158,6158,9122,7022,8901,9603,-0.465,372.095,171.736,,,,
|
||||
ELD79,4159,6159,9122,7022,8901,9603,-115.8543,-99.0583,-152.4616,,,,
|
||||
Pampa del Castillo,4161,6161,9122,7022,8901,9603,27.5,14,186.4,,,,
|
||||
Yemen NGN96,4163,6163,9122,7030,8901,9603,0,0,0,,,,
|
||||
South Yemen,4164,6164,9122,7024,8901,9603,-76,-138,67,,,,
|
||||
Bissau,4165,6165,9122,7022,8901,9603,-173,253,27,,,,
|
||||
Korean 1995,4166,6166,9122,7030,8901,9603,0,0,0,,,,
|
||||
NZGD2000,4167,6167,9122,7030,8901,9603,0,0,0,,,,
|
||||
Accra,4168,6168,9122,7029,8901,9603,-199,32,322,,,,
|
||||
American Samoa 1962,4169,6169,9122,7008,8901,9603,-115,118,426,,,,
|
||||
SIRGAS 1995,4170,6170,9122,7019,8901,9603,0,0,0,,,,
|
||||
RGF93,4171,6171,9122,7019,8901,9603,0,0,0,,,,
|
||||
POSGAR,4172,6172,9108,7019,8901,9603,0,0,0,,,,
|
||||
IRENET95,4173,6173,9122,7019,8901,9603,0,0,0,,,,
|
||||
Sierra Leone 1968,4175,6175,9122,7012,8901,9603,-88,4,101,,,,
|
||||
Australian Antarctic,4176,6176,9122,7019,8901,9603,0,0,0,,,,
|
||||
S42 (83),4178,6178,9122,7024,8901,9603,26,-121,-78,,,,
|
||||
S42,4179,6179,9122,7024,8901,9603,28,-121,-77,,,,
|
||||
EST97,4180,6180,9122,7019,8901,9603,0,0,0,,,,
|
||||
Luxembourg 1930,4181,6181,9122,7022,8901,9607,-189.6806,18.3463,-42.7695,0.33746,3.09264,-2.53861,0.4598
|
||||
Observatorio 1966,4182,6182,9122,7022,8901,9603,-425,-169,81,,,,
|
||||
Southwest Base,4183,6183,9122,7022,8901,9603,-104,167,-38,,,,
|
||||
Sao Braz,4184,6184,9122,7022,8901,9603,-203,141,53,,,,
|
||||
OSNI 1952,4188,6188,9122,7001,8901,9606,482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15
|
||||
REGVEN,4189,6189,9122,7019,8901,9603,0,0,0,,,,
|
||||
POSGAR 98,4190,6190,9122,7019,8901,9603,0,0,0,,,,
|
||||
Albanian 1987,4191,6191,9122,7024,8901,9607,-44.183,-0.58,-38.489,-2.3867,-2.7072,3.5196,-8.2703
|
||||
Douala 1948,4192,6192,9122,7022,8901,9603,-206.1,-174.7,-87.7,,,,
|
||||
Manoca 1962,4193,6193,9122,7011,8901,9603,-70.9,-151.8,-41.4,,,,
|
||||
Qornoq 1927,4194,6194,9122,7022,8901,9603,164,138,-189,,,,
|
||||
Scoresbysund 1952,4195,6195,9122,7022,8901,9606,105,326,-102.5,0,0,0.814,-0.6
|
||||
Ammassalik 1958,4196,6196,9122,7022,8901,9606,-45,417,-3.5,0,0,0.814,-0.6
|
||||
Egypt,4199,6199,9122,7022,8901,9603,-130,-117,-151,,,,
|
||||
Pulkovo 1995,4200,6200,9122,7024,8901,9607,24.47,-130.89,-81.56,0,0,-0.13,-0.22
|
||||
Adindan,4201,6201,9122,7012,8901,9603,-162,-12,206,,,,
|
||||
Australian Geodetic 1966,4202,6202,9122,7003,8901,9603,-133,-48,148,,,,
|
||||
Australian Geodetic 1984,4203,6203,9122,7003,8901,9603,-134,-48,149,,,,
|
||||
Ain el Abd 1970,4204,6204,9122,7022,8901,9603,-150,-251,-2,,,,
|
||||
Afgooye,4205,6205,9122,7024,8901,9603,-43,-163,45,,,,
|
||||
Lisbon,4207,6207,9122,7022,8901,9603,-304.046,-60.576,103.64,,,,
|
||||
Aratu,4208,6208,9122,7022,8901,9603,-151.99,287.04,-147.45,,,,
|
||||
Arc 1950,4209,6209,9122,7012,8901,9603,-143,-90,-294,,,,
|
||||
Arc 1960,4210,6210,9122,7012,8901,9603,-160,-8,-300,,,,
|
||||
Djakarta (Batavia),4211,6211,9122,7004,8901,9603,-377,681,-50,,,,
|
||||
Barbados 1938,4212,6212,9122,7012,8901,9603,31.95,300.99,419.19,,,,
|
||||
Beduaram,4213,6213,9122,7011,8901,9603,-106,-87,188,,,,
|
||||
Beijing 1954,4214,6214,9122,7024,8901,9603,15.8,-154.4,-82.3,,,,
|
||||
Bermuda 1957,4216,6216,9122,7008,8901,9603,-73,213,296,,,,
|
||||
Bogota Observatory,4218,6218,9122,7022,8901,9603,307,304,-318,,,,
|
||||
Bukit Rimpah,4219,6219,9122,7004,8901,9603,-384,664,-48,,,,
|
||||
Camacupa,4220,6220,9122,7012,8901,9603,-50.9,-347.6,-231,,,,
|
||||
Campo Inchauspe,4221,6221,9122,7022,8901,9603,-148,136,90,,,,
|
||||
Cape,4222,6222,9122,7012,8901,9603,-136,-108,-292,,,,
|
||||
Carthage,4223,6223,9122,7012,8901,9603,-263,6,431,,,,
|
||||
Chua Astro,4224,6224,9122,7022,8901,9603,-134,229,-29,,,,
|
||||
Corrego Alegre,4225,6225,9122,7022,8901,9603,-206,172,-6,,,,
|
||||
Deir ez Zor,4227,6227,9122,7011,8901,9603,-190.421,8.532,238.69,,,,
|
||||
Old Egyptian,4229,6229,9122,7020,8901,9603,-130,110,-13,,,,
|
||||
European 1950,4230,6230,9122,7022,8901,9603,-87,-98,-121,,,,
|
||||
ED87,4231,6231,9122,7022,8901,9606,-83.11,-97.38,-117.22,0.005693,-0.044698,0.044285,0.1218
|
||||
Oman,4232,6232,9122,7012,8901,9603,-346,-1,224,,,,
|
||||
Gandajika Base,4233,6233,9122,7022,8901,9603,-133,-321,50,,,,
|
||||
Hu-Tzu-Shan,4236,6236,9122,7022,8901,9603,-634,-549,-201,,,,
|
||||
HD72,4237,6237,9122,7036,8901,9603,52.17,-71.82,-14.9,,,,
|
||||
ID74,4238,6238,9122,7021,8901,9603,-24,-15,5,,,,
|
||||
Indian 1954,4239,6239,9122,7015,8901,9603,217,823,299,,,,
|
||||
Indian Thailand,4240,6240,9122,7015,8901,9603,214,836,303,,,,
|
||||
JAD69,4242,6242,9122,7008,8901,9603,70,207,389.5,,,,
|
||||
Kandawala,4244,6244,9122,7015,8901,9603,-97,787,86,,,,
|
||||
Kertau 1948,4245,6245,9122,7018,8901,9603,-11,851,5,,,,
|
||||
KOC,4246,6246,9122,7012,8901,9603,-294.7,-200.1,525.5,,,,
|
||||
La Canoa,4247,6247,9122,7022,8901,9603,-273.5,110.6,-357.9,,,,
|
||||
Prov So Amrican 1956,4248,6248,9122,7022,8901,9603,-288,175,-376,,,,
|
||||
Leigon,4250,6250,9122,7012,8901,9603,-130,29,364,,,,
|
||||
Liberia 1964,4251,6251,9122,7012,8901,9603,-90,40,88,,,,
|
||||
Luzon Philippines,4253,6253,9122,7008,8901,9603,-133,-77,-51,,,,
|
||||
Prov So Chilean 1963,4254,6254,9122,7022,8901,9603,16,196,93,,,,
|
||||
Herat North,4255,6255,9122,7022,8901,9603,-333,-222,114,,,,
|
||||
Mahe 1971,4256,6256,9122,7012,8901,9603,41,-220,-134,,,,
|
||||
Makassar,4257,6257,9122,7004,8901,9603,-587.8,519.75,145.76,,,,
|
||||
ETRS 89,4258,6258,9122,7019,8901,9603,0,0,0,,,,
|
||||
Malongo 1987,4259,6259,9122,7022,8901,9603,-254.1,-5.36,-100.29,,,,
|
||||
Manoca,4260,6260,9108,7012,8901,9603,-70.9,-151.8,-41.4,,,,
|
||||
Merchich,4261,6261,9122,7012,8901,9603,31,146,47,,,,
|
||||
Massawa,4262,6262,9122,7004,8901,9603,639,405,60,,,,
|
||||
Minna,4263,6263,9122,7012,8901,9603,-92,-93,122,,,,
|
||||
Mhast,4264,6264,9122,7022,8901,9603,-252.95,-4.11,-96.38,,,,
|
||||
Monte Mario,4265,6265,9122,7022,8901,9606,-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68
|
||||
M'poraloko,4266,6266,9122,7011,8901,9603,-74,-130,42,,,,
|
||||
NAD27 CONUS,4267,6267,9122,7008,8901,9603,-8,160,176,,,,
|
||||
NAD83,4269,6269,9122,7019,8901,9603,0,0,0,,,,
|
||||
Nahrwn United Arab,4270,6270,9122,7012,8901,9603,-249,-156,381,,,,
|
||||
Naparima BWI,4271,6271,9122,7022,8901,9603,-2,374,172,,,,
|
||||
Geodetic Datum 1949,4272,6272,9122,7022,8901,9603,84,-22,209,,,,
|
||||
NZGD1949,4272,6272,9122,7022,8901,9603,84,-22,209,,,,
|
||||
NGO1948,4273,6273,9122,7005,8901,9603,315,-217,528,,,,
|
||||
Datum 73,4274,6274,9122,7022,8901,9603,-223.237,110.193,36.649,,,,
|
||||
NTF France,4275,6275,9122,7011,8901,9603,-168,-60,320,,,,
|
||||
Ord Srvy Grt Britn,4277,6277,9122,7001,8901,9603,375,-111,431,,,,
|
||||
Israeli,4281,6281,9122,7010,8901,9603,-235,-85,264,,,,
|
||||
Pointe Noire,4282,6282,9122,7011,8901,9603,-148,51,-291,,,,
|
||||
Australian Geocentric 1994 (GDA94),4283,6283,9122,7019,8901,9603,0,0,0,,,,
|
||||
Pulkovo 1942 (1),4284,6284,9122,7024,8901,9603,28,-130,-95,,,,
|
||||
Qatar National,4285,6285,9122,7022,8901,9603,-128,-283,22,,,,
|
||||
Qornoq,4287,6287,9108,7022,8901,9603,164,138,-189,,,,
|
||||
Rijksdriehoeksmeting,4289,6289,9122,7004,8901,9603,593,26,478,,,,
|
||||
South American 1969,4291,6291,9108,7036,8901,9603,-57,1,-41,,,,
|
||||
Sapper Hill 1943,4292,6292,9122,7022,8901,9603,-355,16,74,,,,
|
||||
Schwarzeck,4293,6293,9122,7046,8901,9603,616,97,-251,,,,
|
||||
Segora,4294,6294,9108,7004,8901,9603,-403,684,41,,,,
|
||||
Tananarive,4297,6297,9122,7022,8901,9603,-189,-242,-91,,,,
|
||||
Timbalai 1948,4298,6298,9122,7015,8901,9603,-689,691,-46,,,,
|
||||
Ireland 1965,4299,6299,9122,7002,8901,9603,506,-122,611,,,,
|
||||
TM75,4300,6300,9122,7002,8901,9606,482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15
|
||||
Tokyo,4301,6301,9122,7004,8901,9603,-128,481,664,,,,
|
||||
Trinidad 1903,4302,6302,9122,7007,8901,9603,-61.702,284.488,472.052,,,,
|
||||
Voirol 1875,4304,6304,9122,7011,8901,9603,-73,-247,227,,,,
|
||||
Nord Sahara 1959,4307,6307,9122,7012,8901,9606,-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547
|
||||
Yacare,4309,6309,9122,7022,8901,9603,-155,171,37,,,,
|
||||
Yoff,4310,6310,9122,7011,8901,9603,-30,190,89,,,,
|
||||
Zanderij,4311,6311,9122,7022,8901,9603,-265,120,-358,,,,
|
||||
Austrian,4312,6312,9122,7004,8901,9603,594,84,471,,,,
|
||||
Belge 1972,4313,6313,9122,7022,8901,9607,-106.8686,52.2978,-103.7239,-0.3366,0.457,-1.8422,-1.2747
|
||||
Potsdam Rauenberg DHDN,4314,6314,9122,7004,8901,9603,606,23,413,,,,
|
||||
Conakry 1905,4315,6315,9122,7011,8901,9603,-23,259,-9,,,,
|
||||
Dealul Piscului 1930,4316,6316,9122,7022,8901,9603,103.25,-100.4,-307.19,,,,
|
||||
Dealul Piscului 1970,4317,6317,9122,7024,8901,9603,28,-121,-77,,,,
|
||||
NGN,4318,6318,9122,7030,8901,9603,-3.2,-5.7,2.8,,,,
|
||||
KUDAMS,4319,6319,9122,7019,8901,9603,-20.8,11.3,2.4,,,,
|
||||
WGS 72,4322,6322,9122,7043,8901,9603,0,0,5,,,,
|
||||
WGS 72BE,4324,6324,9122,7043,8901,9606,0,0,1.9,0,0,0.814,-0.38
|
||||
RGSPM06,4463,1038,9122,7019,8901,9603,0,0,0,,,,
|
||||
RGM04,4470,1036,9122,7019,8901,9603,0,0,0,,,,
|
||||
Cadastre 1997,4475,1037,9122,7022,8901,9603,-381.788,-57.501,-256.673,,,,
|
||||
Mexico ITRF92,4483,1042,9122,7019,8901,9603,0,0,0,,,,
|
||||
RRAF 1991,4558,1047,9122,7019,8901,9603,0,0,0,,,,
|
||||
Antigua 1943,4601,6601,9122,7012,8901,9603,-255,-15,71,,,,
|
||||
Dominica 1945,4602,6602,9122,7012,8901,9603,725,685,536,,,,
|
||||
Grenada 1953,4603,6603,9122,7012,8901,9603,72,213.7,93,,,,
|
||||
Montserrat 1958,4604,6604,9122,7012,8901,9603,174,359,365,,,,
|
||||
St. Kitts 1955,4605,6605,9122,7012,8901,9603,9,183,236,,,,
|
||||
St. Lucia 1955,4606,6606,9122,7012,8901,9603,-149,128,296,,,,
|
||||
St. Vincent 1945,4607,6607,9122,7012,8901,9603,195.671,332.517,274.607,,,,
|
||||
Hong Kong 1980,4611,6611,9122,7022,8901,9606,-162.619,-276.959,-161.764,0.067753,-2.243649,-1.158827,-1.094246
|
||||
JGD2000,4612,6612,9122,7019,8901,9603,0,0,0,,,,
|
||||
Segara,4613,6613,9122,7004,8901,9603,-403,684,41,,,,
|
||||
QND95,4614,6614,9122,7022,8901,9606,-119.4248,-303.65872,-11.00061,1.164298,0.174458,1.096259,3.657065
|
||||
Southeast Base,4615,6615,9122,7022,8901,9603,-499,-249,314,,,,
|
||||
Marco Astro,4616,6616,9122,7022,8901,9603,-289,-124,60,,,,
|
||||
NAD83(CSRS),4617,6140,9122,7019,8901,9603,0,0,0,,,,
|
||||
SAD69,4618,6618,9122,7050,8901,9603,-66.87,4.37,-38.52,,,,
|
||||
SWEREF99,4619,6619,9122,7019,8901,9603,0,0,0,,,,
|
||||
Point 58,4620,6620,9122,7012,8901,9603,-106,-129,165,,,,
|
||||
Fort Marigot,4621,6621,9122,7022,8901,9603,137,248,-430,,,,
|
||||
Guadeloupe 1948,4622,6622,9122,7022,8901,9603,-467,-16,-300,,,,
|
||||
CSG67,4623,6623,9122,7022,8901,9603,-186,230,110,,,,
|
||||
RGFG95,4624,6624,9122,7019,8901,9603,0,0,0,,,,
|
||||
Martinique 1938,4625,6625,9122,7022,8901,9603,186,482,151,,,,
|
||||
Reunion,4626,6626,9122,7022,8901,9603,94,-948,-1262,,,,
|
||||
RGR92,4627,6627,9122,7019,8901,9603,0,0,0,,,,
|
||||
Tahiti 52,4628,6628,9122,7022,8901,9603,162,117,154,,,,
|
||||
Tahaa 54,4629,6629,9122,7022,8901,9607,72.438,345.918,79.486,-1.6045,-0.8823,-0.5565,1.3746
|
||||
IGN72 Nuku Hiva,4630,6630,9122,7022,8901,9603,84,274,65,,,,
|
||||
K0 1949,4631,6631,9122,7022,8901,9603,145,-187,103,,,,
|
||||
Combani 1950,4632,6632,9122,7022,8901,9603,-382,-59,-262,,,,
|
||||
IGN56 Lifou,4633,6633,9122,7022,8901,9603,335.47,222.58,-230.94,,,,
|
||||
IGN72 Grand Terre,4634,6634,9108,7022,8901,9603,-13,-348,292,,,,
|
||||
ST87 Ouvea,4635,6635,9122,7022,8901,9606,-122.383,-188.696,103.344,3.5107,-4.9668,-5.7047,4.4798
|
||||
Petrels 1972,4636,6636,9122,7022,8901,9603,365,194,166,,,,
|
||||
Perroud 1950,4637,6637,9122,7022,8901,9603,325,154,172,,,,
|
||||
Saint Pierre et Miquelon 1950,4638,6638,9122,7008,8901,9603,30,430,368,,,,
|
||||
MOP78,4639,6639,9122,7022,8901,9603,253,-132,-127,,,,
|
||||
RRAF 1991,4640,6640,9122,7030,8901,9603,0,0,0,,,,
|
||||
IGN53 Mare,4641,6641,9122,7022,8901,9603,287.58,177.78,-135.41,,,,
|
||||
ST84 Ile des Pins,4642,6642,9122,7022,8901,9603,-13,-348,292,,,,
|
||||
ST71 Belep,4643,6643,9122,7022,8901,9606,-480.26,-438.32,-643.429,16.3119,20.1721,-4.0349,-111.7002
|
||||
NEA74 Noumea,4644,6644,9122,7022,8901,9603,-10.18,-350.43,291.37,,,,
|
||||
RGNC 1991,4645,6645,9122,7022,8901,9603,0,0,0,,,,
|
||||
Grand Comoros,4646,6646,9122,7022,8901,9603,-963,510,-359,,,,
|
||||
Reykjavik 1900,4657,6657,9122,7051,8901,9603,-28,199,5,,,,
|
||||
Hjorsey 1955,4658,6658,9122,7022,8901,9603,-73,46,-86,,,,
|
||||
ISN93,4659,6659,9122,7019,8901,9603,0,0,0,,,,
|
||||
Helle 1954,4660,6660,9122,7022,8901,9606,982.6087,552.753,-540.873,6.6816266,-31.6114924,-19.84816,16.805
|
||||
LKS92,4661,6661,9122,7019,8901,9603,0,0,0,,,,
|
||||
IGN72 Grande Terre,4662,6634,9122,7022,8901,9603,-11.64,-348.6,291.98,,,,
|
||||
Porto Santo 1995,4663,6663,9122,7022,8901,9603,-502.862,-247.438,312.724,,,,
|
||||
Azores Oriental 1995,4664,6664,9122,7022,8901,9603,-204.619,140.176,55.226,,,,
|
||||
Azores Central 1995,4665,6665,9122,7022,8901,9603,-106.226,166.366,-37.893,,,,
|
||||
Lisbon 1890,4666,6666,9122,7004,8901,9603,508.088,-191.042,565.223,,,,
|
||||
IKBD-92,4667,6667,9122,7030,8901,9603,0,0,0,,,,
|
||||
European 1979,4668,6668,9122,7022,8901,9603,-86,-98,-119,,,,
|
||||
LKS94,4669,6126,9122,7019,8901,9603,0,0,0,,,,
|
||||
IGM95,4670,6670,9122,7030,8901,9603,0,0,0,,,,
|
||||
Chatham 1971,4672,6672,9122,7022,8901,9603,175,-38,113,,,,
|
||||
Chatham Islands 1979,4673,6673,9122,7022,8901,9607,174.05,-25.49,112.57,0,0,-0.554,0.2263
|
||||
SIRGAS 2000,4674,6674,9122,7019,8901,9603,0,0,0,,,,
|
||||
Guam 1963,4675,6675,9122,7008,8901,9603,-100,-248,259,,,,
|
||||
Lao 1997,4678,6678,9122,7024,8901,9603,44.585,-131.212,-39.544,,,,
|
||||
Jouik 1961,4679,6679,9122,7012,8901,9603,-80.01,253.26,291.19,,,,
|
||||
Nouakchott 1965,4680,6680,9122,7012,8901,9603,124.5,-63.5,-281,,,,
|
||||
Indian Bangladesh,4682,6682,9122,7015,8901,9603,289,734,257,,,,
|
||||
PRS92,4683,6683,9122,7008,8901,9607,-127.62,-67.24,-47.04,3.068,-4.903,-1.578,-1.06
|
||||
Gan 1970,4684,6684,9122,7022,8901,9603,-133,-321,50,,,,
|
||||
MAGNA-SIRGAS,4686,6686,9122,7019,8901,9603,0,0,0,,,,
|
||||
RGPF,4687,6687,9122,7019,8901,9607,0.072,-0.507,-0.245,0.0183,-0.0003,0.007,-0.0093
|
||||
Fatu Iva 72,4688,6688,9122,7022,8901,9607,347.103,1078.125,2623.922,33.8875,-70.6773,9.3943,186.074
|
||||
IGN63 Hiva Oa,4689,6689,9122,7022,8901,9607,410.721,55.049,80.746,-2.5779,-2.3514,-0.6664,17.3311
|
||||
Tahiti 79,4690,6690,9122,7022,8901,9607,221.525,152.948,176.768,2.3847,1.3896,0.877,11.4741
|
||||
Moorea 87,4691,6691,9122,7022,8901,9607,215.525,149.593,176.229,3.2624,1.692,1.1571,10.4773
|
||||
Maupiti 83,4692,6692,9122,7022,8901,9603,217.037,86.959,23.956,,,,
|
||||
Nakhl-e Ghanem,4693,6693,9122,7030,8901,9603,0,-0.15,0.68,,,,
|
||||
POSGAR 94,4694,6694,9122,7030,8901,9603,0,0,0,,,,
|
||||
Katanga 1955,4695,6695,9122,7008,8901,9603,-103.746,-9.614,-255.95,,,,
|
||||
Kerguelen Island,4698,6698,9122,7022,8901,9603,145,-187,103,,,,
|
||||
Le Pouce 1934,4699,6699,9122,7012,8901,9603,-770.1,158.4,-498.2,,,,
|
||||
IGCB 1955,4701,6701,9122,7012,8901,9603,-79.9,-158,-168.9,,,,
|
||||
Mauritania 1999,4702,6702,9122,7019,8901,9603,0,0,0,,,,
|
||||
Egypt Gulf of Suez S-650 TL,4706,6706,9122,7020,8901,9603,-146.21,112.63,4.05,,,,
|
||||
Astro B4 Sorol Atoll,4707,6707,9122,7022,8901,9603,114,-116,-333,,,,
|
||||
Anna 1 Astro 1965,4708,6708,9122,7003,8901,9603,-491,-22,435,,,,
|
||||
Astro Beacon 1945,4709,6709,9122,7022,8901,9603,145,75,-272,,,,
|
||||
Astro DOS 71/4,4710,6710,9122,7022,8901,9603,-320,550,-494,,,,
|
||||
Astronomic Stn 1952,4711,6711,9122,7022,8901,9603,124,-234,-25,,,,
|
||||
Ascension Island 1958,4712,6712,9122,7022,8901,9603,-207,107,52,,,,
|
||||
Ayabelle Lighthouse,4713,6713,9122,7012,8901,9603,-77,-128,142,,,,
|
||||
Bellevue (IGN),4714,6714,9122,7022,8901,9603,-127,-769,472,,,,
|
||||
Camp Area Astro,4715,6715,9122,7022,8901,9603,-104,-129,239,,,,
|
||||
Canton Astro 1966,4716,6716,9122,7022,8901,9603,298,-304,-375,,,,
|
||||
Cape Canaveral,4717,6717,9122,7008,8901,9603,-2,150,181,,,,
|
||||
GUX 1 Astro,4718,6718,9122,7022,8901,9603,252,-209,-751,,,,
|
||||
Easter Island 1967,4719,6719,9122,7022,8901,9603,211,147,111,,,,
|
||||
Fiji 1986,4720,6720,9122,7043,8901,9606,0,0,4.5,0,0,0.554,0.2263
|
||||
Fiji 1956,4721,6721,9122,7022,8901,9603,265.025,384.929,-194.046,,,,
|
||||
South Georgia 1968,4722,6722,9122,7022,8901,9603,-794,119,-298,,,,
|
||||
GCGD59,4723,6723,9122,7008,8901,9607,-179.483,-69.379,-27.584,7.862,-8.163,-6.042,-13.925
|
||||
ISTS 073 Astro 1969,4724,6724,9122,7022,8901,9603,208,-435,-229,,,,
|
||||
Johnston Island,4725,6725,9122,7022,8901,9603,191,-77,-204,,,,
|
||||
L.C. 5 Astro,4726,6726,9122,7008,8901,9603,42,124,147,,,,
|
||||
Midway Astro 1961,4727,6727,9122,7022,8901,9603,912,-58,1227,,,,
|
||||
Pico De Las Nieves,4728,6728,9122,7022,8901,9603,-307,-92,127,,,,
|
||||
Pitcairn Astro 1967,4729,6729,9122,7022,8901,9603,185,165,42,,,,
|
||||
Santo (DOS),4730,6730,9122,7022,8901,9603,170,42,84,,,,
|
||||
Viti Levu 1916,4731,6731,9122,7012,8901,9603,51,391,-36,,,,
|
||||
Wake-Eniwetok 1960,4732,6732,9122,7053,8901,9603,101,52,-39,,,,
|
||||
Wake Island 1952,4733,6733,9122,7022,8901,9603,276,-57,149,,,,
|
||||
Tristan Astro 1968,4734,6734,9122,7022,8901,9603,-632,438,-609,,,,
|
||||
Kusaie 1951,4735,6735,9122,7022,8901,9603,647,1777,-1124,,,,
|
||||
Deception Island,4736,6736,9122,7012,8901,9603,260,12,-147,,,,
|
||||
Korea 2000,4737,6737,9122,7019,8901,9603,0,0,0,,,,
|
||||
Hong Kong 1963,4739,6739,9122,7022,8901,9603,-156,-271,-189,,,,
|
||||
PZ-90,4740,6740,9122,7054,8901,9607,0,0,1.5,0,0,-0.076,0
|
||||
Karbala 1979,4743,6743,9122,7012,8901,9603,70.995,-335.916,262.898,,,,
|
||||
Nahrwan 1934,4744,6744,9122,7012,8901,9603,-242.2,-144.9,370.3,,,,
|
||||
GR96,4747,6747,9122,7019,8901,9603,0,0,0,,,,
|
||||
Vanua Levu 1915,4748,6748,9122,7055,8901,9603,51,391,-36,,,,
|
||||
RGNC91-93,4749,6749,9122,7019,8901,9603,0,0,0,,,,
|
||||
ST87 Ouvea,4750,6750,9122,7030,8901,9603,-56.263,16.136,-22.856,,,,
|
||||
Viti Levu 1912,4752,6752,9122,7055,8901,9603,98,390,-22,,,,
|
||||
LGD2006,4754,6754,9122,7022,8901,9603,-208.4058,-109.8777,-2.5764,,,,
|
||||
DGN95,4755,6755,9122,7030,8901,9603,0,0,0,,,,
|
||||
VN-2000,4756,6756,9122,7030,8901,9607,-191.90441429,-39.30318279,-111.45032835,-0.00928836,0.01975479,-0.00427372,0.252906278
|
||||
JAD2001,4758,6758,9122,7030,8901,9603,0,0,0,,,,
|
||||
NAD83(NSRS2007),4759,6759,9122,7019,8901,9603,0,0,0,,,,
|
||||
HTRS96,4761,6761,9122,7019,8901,9603,0,0,0,,,,
|
||||
BDA2000,4762,6762,9122,7030,8901,9603,0,0,0,,,,
|
||||
Pitcairn 2006,4763,6763,9122,7030,8901,9603,0,0,0,,,,
|
||||
RSRGD2000,4764,6764,9122,7019,8901,9603,0,0,0,,,,
|
||||
Slovenia 1996,4765,6765,9122,7019,8901,9603,0,0,0,,,,
|
||||
Bern 1898 (Bern),4801,6801,9122,7004,8907,9603,674.374,15.056,405.346,,,,
|
||||
Bogota 1975 (Bogota),4802,6802,9122,7022,8904,9603,307,304,-318,,,,
|
||||
Lisbon (Lisbon),4803,6803,9122,7022,8902,9603,-304.046,-60.576,103.64,,,,
|
||||
Makassar (Jakarta),4804,6804,9122,7004,8908,9603,-587.8,519.75,145.76,,,,
|
||||
MGI (Ferro),4805,6805,9122,7004,8909,9603,682,-203,480,,,,
|
||||
Rome 1940,4806,6806,9122,7022,8906,9603,-225,-65,9,,,,
|
||||
NTF (Paris),4807,6807,9105,7011,8903,9603,-168,-60,320,,,,
|
||||
Tananarive (Paris),4810,6810,9105,7022,8903,9603,-189,-242,-91,,,,
|
||||
Voirol 1875 (Paris),4811,6811,9105,7011,8903,9603,-73,-247,227,,,,
|
||||
Batavia (Jakarta),4813,6813,9122,7004,8908,9603,-377,681,-50,,,,
|
||||
Carthage (Paris),4816,6816,9105,7011,8903,9603,-263,6,431,,,,
|
||||
Norsk,4817,6817,9122,7005,8913,9603,278,93,474,,,,
|
||||
S-JTSK (Ferro),4818,6818,9122,7004,8909,9603,589,76,480,,,,
|
||||
Nord Sahara 1959 (Paris),4819,6819,9105,7012,8903,9606,-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547
|
||||
Segara (Jakarta),4820,6820,9122,7004,8908,9603,-403,684,41,,,,
|
||||
Lisbon 1890 (Lisbon),4904,6904,9122,7004,8902,9603,508.088,-191.042,565.223,,,,
|
||||
PTRA08,5013,1041,9122,7019,8901,9603,0,0,0,,,,
|
||||
S-JTSK/05,5228,1052,9122,7004,8901,9607,572.213,85.334,461.94,-4.9732,-1.529,-5.2484,3.5378
|
||||
S-JTSK/05 (Ferro),5229,1055,9122,7004,8909,9607,572.213,85.334,461.94,-4.9732,-1.529,-5.2484,3.5378
|
||||
SLD99,5233,1053,9122,7015,8901,9607,-0.293,766.95,87.713,-0.195704,-1.695068,-3.473016,-0.039338
|
||||
GDBD2009,5246,1056,9122,7019,8901,9603,0,0,0,,,,
|
||||
TUREF,5252,1057,9122,7019,8901,9603,0,0,0,,,,
|
||||
DRUKREF 03,5264,1058,9122,7019,8901,9603,0,0,0,,,,
|
||||
ISN2004,5324,1060,9122,7019,8901,9603,0,0,0,,,,
|
||||
POSGAR 2007,5340,1062,9122,7019,8901,9603,0,0,0,,,,
|
||||
MARGEN,5354,1063,9122,7019,8901,9603,0,0,0,,,,
|
||||
SIRGAS-Chile,5360,1064,9122,7019,8901,9603,0,0,0,,,,
|
||||
CR05,5365,1065,9122,7030,8901,9603,0,0,0,,,,
|
||||
MACARIO SOLIS,5371,1066,9122,7019,8901,9603,0,0,0,,,,
|
||||
Peru96,5373,1067,9122,7019,8901,9603,0,0,0,,,,
|
||||
SIRGAS-ROU98,5381,1068,9122,7030,8901,9603,0,0,0,,,,
|
||||
SIRGAS_ES2007.8,5393,1069,9122,7019,8901,9603,0,0,0,,,,
|
||||
Ocotepeque 1935,5451,1070,9122,7008,8901,9603,205,96,-98,,,,
|
||||
RGAF09,5489,1073,9122,7019,8901,9603,0,0,0,,,,
|
||||
SAD69(96),5527,1075,9122,7050,8901,9603,-67.35,3.88,-38.22,,,,
|
||||
PNG94,5546,1076,9122,7019,8901,9603,0,0,0,,,,
|
||||
UCS-2000,5561,1077,9122,7024,8901,9607,25,-141,-78.5,0,-0.35,-0.736,0
|
||||
FEH2010,5593,1078,9122,7019,8901,9603,0,0,0,,,,
|
||||
CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,,
|
||||
Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,,
|
||||
CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926
|
||||
Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,,
|
||||
RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,,
|
||||
Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,,
|
||||
Bekaa Valley 1920,6882,1137,9122,7012,8901,9603,-183,-15,273,,,,
|
||||
Bioko,6883,1136,9122,7022,8901,9603,-235,-110,393,,,,
|
||||
South East Island 1943,6892,1138,9122,7012,8901,9603,-43.685,-179.785,-267.721,,,,
|
||||
Gambia,6894,1139,9122,7012,8901,9603,-63,176,185,,,,
|
||||
ONGD14,7373,1147,9122,7019,8901,9603,0,0,0,,,,
|
||||
St. Helena Tritan,7881,1173,9122,7030,8901,9603,-0.077,0.079,0.086,,,,
|
||||
SHGD2015,7886,1174,9122,7019,8901,9603,0,0,0,,,,
|
||||
DOS 1968,,,9122,7022,8901,9603,230,-199,-752,,,,
|
||||
European 1950 (Mean France),,,9122,7022,8901,9603,-87,-96,-120,,,,
|
||||
European 1950 (Spain and Portugal),,,9122,7022,8901,9603,-84,-107,-120,,,,
|
||||
Luzon Mindanao,,,9122,7008,8901,9603,-133,-79,-72,,,,
|
||||
NAD27 Alaska,,,9122,7008,8901,9603,-5,135,172,,,,
|
||||
NAD27 Bahamas,,,9122,7008,8901,9603,-4,154,178,,,,
|
||||
NAD27 Canada,,,9122,7008,8901,9603,-10,158,187,,,,
|
||||
NAD27 Canal Zone,,,9122,7008,8901,9603,0,125,201,,,,
|
||||
NAD27 Caribbean,,,9122,7008,8901,9603,-3,142,183,,,,
|
||||
NAD27 Central,,,9122,7008,8901,9603,0,125,194,,,,
|
||||
NAD27 Cuba,,,9122,7008,8901,9603,-9,152,178,,,,
|
||||
NAD27 Greenland,,,9122,7008,8901,9603,11,114,195,,,,
|
||||
NAD27 Mexico,,,9122,7008,8901,9603,-12,130,190,,,,
|
||||
NAD27 San Salvador,,,9122,7008,8901,9603,1,140,165,,,,
|
||||
Nahrwn Masirah Ilnd,,,9122,7012,8901,9603,-247,-148,369,,,,
|
||||
Nahrwn Saudi Arbia,,,9122,7012,8901,9603,-231,-196,482,,,,
|
||||
Pulkovo 1942 (2),,,9122,7024,8901,9603,28,-130,-95,,,,
|
||||
|
||||
|
1894
pkg/csv/pcs.csv
1894
pkg/csv/pcs.csv
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "5.10"
|
||||
!define VERSION "5.16"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}.exe"
|
||||
@ -167,6 +167,7 @@ Section "QT framework" SEC_QT
|
||||
File /r "platforms"
|
||||
File /r "imageformats"
|
||||
File /r "printsupport"
|
||||
File /r "styles"
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "5.10"
|
||||
!define VERSION "5.16"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||
@ -174,6 +174,7 @@ Section "QT framework" SEC_QT
|
||||
File /r "platforms"
|
||||
File /r "imageformats"
|
||||
File /r "printsupport"
|
||||
File /r "styles"
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<map xmlns="http://www.gpxsee.org/map/1">
|
||||
<name>4UMaps</name>
|
||||
<url>http://4umaps.eu/$z/$x/$y.png</url>
|
||||
<url>https://4umaps.com/$z/$x/$y.png</url>
|
||||
<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
|
||||
<zoom min="2" max="15"/>
|
||||
<bounds bottom="-65"/>
|
||||
|
||||
@ -11,23 +11,28 @@
|
||||
#define XTICKS 15
|
||||
#define YTICKS 10
|
||||
|
||||
struct Label {
|
||||
double min;
|
||||
double max;
|
||||
double d;
|
||||
class Ticks
|
||||
{
|
||||
public:
|
||||
Ticks(double minValue, double maxValue, int maxCount);
|
||||
|
||||
int count() const {return ((int)((_max - _min) / _d)) + 1;}
|
||||
double val(int i) const {return _min + i * _d;}
|
||||
double min() const {return _min;}
|
||||
double max() const {return _max;}
|
||||
|
||||
private:
|
||||
double _min;
|
||||
double _max;
|
||||
double _d;
|
||||
};
|
||||
|
||||
static struct Label label(double min, double max, int ticks)
|
||||
Ticks::Ticks(double minValue, double maxValue, int maxCount)
|
||||
{
|
||||
double range;
|
||||
struct Label l;
|
||||
|
||||
range = niceNum(max - min, 0);
|
||||
l.d = niceNum(range / ticks, 1);
|
||||
l.min = ceil(min / l.d) * l.d;
|
||||
l.max = floor(max / l.d) * l.d;
|
||||
|
||||
return l;
|
||||
double range = niceNum(maxValue - minValue, 0);
|
||||
_d = niceNum(range / maxCount, 1);
|
||||
_min = ceil(minValue / _d) * _d;
|
||||
_max = floor(maxValue / _d) * _d;
|
||||
}
|
||||
|
||||
|
||||
@ -36,6 +41,9 @@ AxisItem::AxisItem(Type type, QGraphicsItem *parent) : QGraphicsItem(parent)
|
||||
_type = type;
|
||||
_size = 0;
|
||||
|
||||
_font.setPixelSize(FONT_SIZE);
|
||||
_font.setFamily(FONT_FAMILY);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
|
||||
#endif // Q_OS_MAC
|
||||
@ -45,6 +53,16 @@ void AxisItem::setRange(const RangeF &range)
|
||||
{
|
||||
prepareGeometryChange();
|
||||
_range = range;
|
||||
|
||||
QFontMetrics fm(_font);
|
||||
Ticks ticks(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
|
||||
_ticks = QVector<Tick>(ticks.count());
|
||||
for (int i = 0; i < ticks.count(); i++) {
|
||||
Tick &t = _ticks[i];
|
||||
t.value = ticks.val(i);
|
||||
t.boundingBox = fm.tightBoundingRect(QString::number(t.value));
|
||||
}
|
||||
|
||||
updateBoundingRect();
|
||||
update();
|
||||
}
|
||||
@ -60,42 +78,28 @@ void AxisItem::setSize(qreal size)
|
||||
void AxisItem::setLabel(const QString& label)
|
||||
{
|
||||
prepareGeometryChange();
|
||||
QFontMetrics fm(_font);
|
||||
_label = label;
|
||||
_labelBB = fm.tightBoundingRect(label);
|
||||
updateBoundingRect();
|
||||
update();
|
||||
}
|
||||
|
||||
void AxisItem::updateBoundingRect()
|
||||
{
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QRect ss, es, ls;
|
||||
struct Label l;
|
||||
|
||||
|
||||
l = label(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
|
||||
es = fm.tightBoundingRect(QString::number(l.max));
|
||||
ss = fm.tightBoundingRect(QString::number(l.min));
|
||||
ls = fm.tightBoundingRect(_label);
|
||||
QFontMetrics fm(_font);
|
||||
QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
|
||||
QRect ss = _ticks.isEmpty() ? QRect() : _ticks.first().boundingBox;
|
||||
QRect ls(_labelBB);
|
||||
|
||||
if (_type == X) {
|
||||
_boundingRect = QRectF(-ss.width()/2, -TICK/2,
|
||||
_size + es.width()/2 + ss.width()/2,
|
||||
ls.height() + es.height() - fm.descent() + TICK + 2*PADDING + 1);
|
||||
_boundingRect = QRectF(-ss.width()/2, -TICK/2, _size + es.width()/2
|
||||
+ ss.width()/2, ls.height() + es.height() - fm.descent() + TICK
|
||||
+ 2*PADDING + 1);
|
||||
} else {
|
||||
int mtw = 0;
|
||||
QRect ts;
|
||||
qreal val;
|
||||
|
||||
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
|
||||
val = l.min + i * l.d;
|
||||
QString str = QString::number(val);
|
||||
ts = fm.tightBoundingRect(str);
|
||||
mtw = qMax(ts.width(), mtw);
|
||||
}
|
||||
|
||||
for (int i = 0; i < _ticks.count(); i++)
|
||||
mtw = qMax(_ticks.at(i).boundingBox.width(), mtw);
|
||||
_boundingRect = QRectF(-(ls.height() + mtw + 2*PADDING + TICK/2),
|
||||
-(_size + es.height()/2 + fm.descent()), ls.height() + mtw + 2*PADDING
|
||||
+ TICK, _size + es.height()/2 + fm.descent() + ss.height()/2);
|
||||
@ -107,60 +111,50 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
{
|
||||
Q_UNUSED(option);
|
||||
Q_UNUSED(widget);
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QRect ts, ls;
|
||||
struct Label l;
|
||||
qreal range = _range.size();
|
||||
qreal val;
|
||||
QPen pen = QPen(Qt::black, AXIS_WIDTH);
|
||||
QFontMetrics fm(_font);
|
||||
QRect ts;
|
||||
|
||||
|
||||
painter->setRenderHint(QPainter::Antialiasing, false);
|
||||
painter->setFont(font);
|
||||
painter->setPen(pen);
|
||||
|
||||
ls = fm.tightBoundingRect(_label);
|
||||
painter->setFont(_font);
|
||||
painter->setPen(QPen(Qt::black, AXIS_WIDTH));
|
||||
|
||||
if (_type == X) {
|
||||
painter->drawLine(0, 0, _size, 0);
|
||||
|
||||
l = label(_range.min(), _range.max(), XTICKS);
|
||||
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
|
||||
val = l.min + i * l.d;
|
||||
QString str = QString::number(val);
|
||||
for (int i = 0; i < _ticks.count(); i++) {
|
||||
qreal val = _ticks.at(i).value;
|
||||
ts = _ticks.at(i).boundingBox;
|
||||
|
||||
painter->drawLine((_size/range) * (val - _range.min()), TICK/2,
|
||||
(_size/range) * (val - _range.min()), -TICK/2);
|
||||
ts = fm.tightBoundingRect(str);
|
||||
painter->drawText(((_size/range) * (val - _range.min()))
|
||||
- (ts.width()/2), ts.height() + TICK/2 + PADDING, str);
|
||||
painter->drawLine((_size/_range.size()) * (val - _range.min()),
|
||||
TICK/2, (_size/_range.size()) * (val - _range.min()), -TICK/2);
|
||||
painter->drawText(((_size/_range.size()) * (val - _range.min()))
|
||||
- (ts.width()/2), ts.height() + TICK/2 + PADDING,
|
||||
QString::number(val));
|
||||
}
|
||||
|
||||
painter->drawText(_size/2 - ls.width()/2, ls.height() + ts.height()
|
||||
- 2*fm.descent() + TICK/2 + 2*PADDING, _label);
|
||||
painter->drawText(_size/2 - _labelBB.width()/2, _labelBB.height()
|
||||
+ ts.height() - 2*fm.descent() + TICK/2 + 2*PADDING, _label);
|
||||
} else {
|
||||
painter->drawLine(0, 0, 0, -_size);
|
||||
|
||||
l = label(_range.min(), _range.max(), YTICKS);
|
||||
int mtw = 0;
|
||||
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
|
||||
val = l.min + i * l.d;
|
||||
QString str = QString::number(val);
|
||||
|
||||
painter->drawLine(TICK/2, -((_size/range) * (val - _range.min())),
|
||||
-TICK/2, -((_size/range) * (val - _range.min())));
|
||||
ts = fm.tightBoundingRect(str);
|
||||
for (int i = 0; i < _ticks.count(); i++) {
|
||||
qreal val = _ticks.at(i).value;
|
||||
ts = _ticks.at(i).boundingBox;
|
||||
mtw = qMax(ts.width(), mtw);
|
||||
painter->drawText(-(ts.width() + PADDING + TICK/2), -((_size/range)
|
||||
* (val - _range.min())) + (ts.height()/2), str);
|
||||
|
||||
painter->drawLine(TICK/2, -((_size/_range.size())
|
||||
* (val - _range.min())), -TICK/2, -((_size/_range.size())
|
||||
* (val - _range.min())));
|
||||
painter->drawText(-(ts.width() + PADDING + TICK/2),
|
||||
-((_size/_range.size()) * (val - _range.min())) + (ts.height()/2),
|
||||
QString::number(val));
|
||||
}
|
||||
|
||||
painter->rotate(-90);
|
||||
painter->drawText(_size/2 - ls.width()/2, -(mtw + 2*PADDING + TICK/2),
|
||||
_label);
|
||||
painter->drawText(_size/2 - _labelBB.width()/2, -(mtw + 2*PADDING
|
||||
+ TICK/2), _label);
|
||||
painter->rotate(90);
|
||||
}
|
||||
|
||||
@ -172,46 +166,28 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
|
||||
QSizeF AxisItem::margin() const
|
||||
{
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
QFontMetrics fm(font);
|
||||
QRect ss, es, ls;
|
||||
struct Label l;
|
||||
|
||||
|
||||
l = label(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
|
||||
es = fm.tightBoundingRect(QString::number(l.max));
|
||||
ss = fm.tightBoundingRect(QString::number(l.min));
|
||||
ls = fm.tightBoundingRect(_label);
|
||||
QFontMetrics fm(_font);
|
||||
QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
|
||||
|
||||
if (_type == X) {
|
||||
return QSizeF(es.width()/2,
|
||||
ls.height() + es.height() - fm.descent() + TICK/2 + 2*PADDING);
|
||||
return QSizeF(es.width()/2, _labelBB.height() + es.height()
|
||||
- fm.descent() + TICK/2 + 2*PADDING);
|
||||
} else {
|
||||
int mtw = 0;
|
||||
QRect ts;
|
||||
qreal val;
|
||||
for (int i = 0; i < _ticks.count(); i++)
|
||||
mtw = qMax(_ticks.at(i).boundingBox.width(), mtw);
|
||||
|
||||
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
|
||||
val = l.min + i * l.d;
|
||||
QString str = QString::number(val);
|
||||
ts = fm.tightBoundingRect(str);
|
||||
mtw = qMax(ts.width(), mtw);
|
||||
}
|
||||
|
||||
return QSizeF(ls.height() -fm.descent() + mtw + 2*PADDING
|
||||
return QSizeF(_labelBB.height() -fm.descent() + mtw + 2*PADDING
|
||||
+ TICK/2, es.height()/2 + fm.descent());
|
||||
}
|
||||
}
|
||||
|
||||
QList<qreal> AxisItem::ticks() const
|
||||
{
|
||||
struct Label l;
|
||||
QList<qreal> list;
|
||||
|
||||
l = label(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
|
||||
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++)
|
||||
list.append(((_size/_range.size()) * ((l.min + i * l.d)
|
||||
for (int i = 0; i < _ticks.count(); i++)
|
||||
list.append(((_size/_range.size()) * (_ticks.at(i).value
|
||||
- _range.min())));
|
||||
|
||||
return list;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
#define AXISITEM_H
|
||||
|
||||
#include <QGraphicsItem>
|
||||
#include <QVector>
|
||||
#include "common/range.h"
|
||||
|
||||
class AxisItem : public QGraphicsItem
|
||||
@ -23,13 +24,21 @@ public:
|
||||
QList<qreal> ticks() const;
|
||||
|
||||
private:
|
||||
struct Tick {
|
||||
double value;
|
||||
QRect boundingBox;
|
||||
};
|
||||
|
||||
void updateBoundingRect();
|
||||
|
||||
Type _type;
|
||||
RangeF _range;
|
||||
qreal _size;
|
||||
QString _label;
|
||||
QRect _labelBB;
|
||||
QVector<Tick> _ticks;
|
||||
QRectF _boundingRect;
|
||||
QFont _font;
|
||||
};
|
||||
|
||||
#endif // AXISITEM_H
|
||||
|
||||
@ -13,11 +13,6 @@ FileBrowser::FileBrowser(QObject *parent) : QObject(parent)
|
||||
_index = -1;
|
||||
}
|
||||
|
||||
FileBrowser::~FileBrowser()
|
||||
{
|
||||
delete _watcher;
|
||||
}
|
||||
|
||||
void FileBrowser::setCurrent(const QString &path)
|
||||
{
|
||||
QFileInfo file(path);
|
||||
|
||||
@ -13,7 +13,6 @@ class FileBrowser : public QObject
|
||||
|
||||
public:
|
||||
FileBrowser(QObject *parent = 0);
|
||||
~FileBrowser();
|
||||
|
||||
void setFilter(const QStringList &filter);
|
||||
void setCurrent(const QString &path);
|
||||
|
||||
94
src/GUI/gearratiograph.cpp
Normal file
94
src/GUI/gearratiograph.cpp
Normal file
@ -0,0 +1,94 @@
|
||||
#include "data/data.h"
|
||||
#include "gearratiographitem.h"
|
||||
#include "gearratiograph.h"
|
||||
|
||||
|
||||
GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
|
||||
{
|
||||
_showTracks = true;
|
||||
|
||||
GraphView::setYUnits("");
|
||||
setYLabel(tr("Gear ratio"));
|
||||
|
||||
setSliderPrecision(2);
|
||||
}
|
||||
|
||||
void GearRatioGraph::setInfo()
|
||||
{
|
||||
if (_showTracks) {
|
||||
GraphView::addInfo(tr("Most used"), QString::number(top() * yScale(),
|
||||
'f', 2) + UNIT_SPACE + yUnits());
|
||||
GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f',
|
||||
2) + UNIT_SPACE + yUnits());
|
||||
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
|
||||
2) + UNIT_SPACE + yUnits());
|
||||
} else
|
||||
clearInfo();
|
||||
}
|
||||
|
||||
QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
|
||||
{
|
||||
QList<GraphItem*> graphs;
|
||||
|
||||
for (int i = 0; i < data.tracks().count(); i++) {
|
||||
const Graph &graph = data.tracks().at(i)->ratio();
|
||||
|
||||
if (graph.size() < 2) {
|
||||
skipColor();
|
||||
graphs.append(0);
|
||||
} else {
|
||||
GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType);
|
||||
GraphView::addGraph(gi);
|
||||
|
||||
for (QMap<qreal, qreal>::const_iterator it = gi->map().constBegin();
|
||||
it != gi->map().constEnd(); ++it)
|
||||
_map.insert(it.key(), _map.value(it.key()) + it.value());
|
||||
graphs.append(gi);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < data.routes().count(); i++) {
|
||||
skipColor();
|
||||
graphs.append(0);
|
||||
}
|
||||
|
||||
setInfo();
|
||||
redraw();
|
||||
|
||||
return graphs;
|
||||
}
|
||||
|
||||
qreal GearRatioGraph::top() const
|
||||
{
|
||||
qreal key = NAN, val = NAN;
|
||||
|
||||
for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
|
||||
it != _map.constEnd(); ++it) {
|
||||
if (it == _map.constBegin()) {
|
||||
val = it.value();
|
||||
key = it.key();
|
||||
} else if (it.value() > val) {
|
||||
val = it.value();
|
||||
key = it.key();
|
||||
}
|
||||
}
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
void GearRatioGraph::clear()
|
||||
{
|
||||
_map.clear();
|
||||
|
||||
GraphView::clear();
|
||||
}
|
||||
|
||||
void GearRatioGraph::showTracks(bool show)
|
||||
{
|
||||
_showTracks = show;
|
||||
|
||||
showGraph(show);
|
||||
setInfo();
|
||||
|
||||
redraw();
|
||||
}
|
||||
30
src/GUI/gearratiograph.h
Normal file
30
src/GUI/gearratiograph.h
Normal file
@ -0,0 +1,30 @@
|
||||
#ifndef GEARRATIOGRAPH_H
|
||||
#define GEARRATIOGRAPH_H
|
||||
|
||||
#include <QMap>
|
||||
#include "graphtab.h"
|
||||
|
||||
class GearRatioGraph : public GraphTab
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
GearRatioGraph(QWidget *parent = 0);
|
||||
|
||||
QString label() const {return tr("Gear ratio");}
|
||||
QList<GraphItem*> loadData(const Data &data);
|
||||
void clear();
|
||||
void showTracks(bool show);
|
||||
|
||||
private:
|
||||
qreal top() const;
|
||||
qreal min() const {return bounds().top();}
|
||||
qreal max() const {return bounds().bottom();}
|
||||
void setInfo();
|
||||
|
||||
QMap<qreal, qreal> _map;
|
||||
|
||||
bool _showTracks;
|
||||
};
|
||||
|
||||
#endif // GEARRATIOGRAPH_H
|
||||
39
src/GUI/gearratiographitem.cpp
Normal file
39
src/GUI/gearratiographitem.cpp
Normal file
@ -0,0 +1,39 @@
|
||||
#include <QMap>
|
||||
#include "tooltip.h"
|
||||
#include "gearratiographitem.h"
|
||||
|
||||
GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
|
||||
QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
|
||||
{
|
||||
qreal val = NAN;
|
||||
|
||||
for (int j = 1; j < graph.size(); j++) {
|
||||
const GraphPoint &p = graph.at(j);
|
||||
qreal val = _map.value(p.y());
|
||||
_map.insert(p.y(), val + (p.s() - graph.at(j-1).s()));
|
||||
}
|
||||
|
||||
for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
|
||||
it != _map.constEnd(); ++it) {
|
||||
if (it == _map.constBegin()) {
|
||||
val = it.value();
|
||||
_top = it.key();
|
||||
} else if (it.value() > val) {
|
||||
val = it.value();
|
||||
_top = it.key();
|
||||
}
|
||||
}
|
||||
|
||||
setToolTip(toolTip());
|
||||
}
|
||||
|
||||
QString GearRatioGraphItem::toolTip() const
|
||||
{
|
||||
ToolTip tt;
|
||||
|
||||
tt.insert(tr("Minimum"), QString::number(min(), 'f', 2));
|
||||
tt.insert(tr("Maximum"), QString::number(max(), 'f', 2));
|
||||
tt.insert(tr("Most used"), QString::number(top(), 'f', 2));
|
||||
|
||||
return tt.toString();
|
||||
}
|
||||
28
src/GUI/gearratiographitem.h
Normal file
28
src/GUI/gearratiographitem.h
Normal file
@ -0,0 +1,28 @@
|
||||
#ifndef GEARRATIOGRAPHITEM_H
|
||||
#define GEARRATIOGRAPHITEM_H
|
||||
|
||||
#include <QMap>
|
||||
#include "graphitem.h"
|
||||
|
||||
class GearRatioGraphItem : public GraphItem
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
GearRatioGraphItem(const Graph &graph, GraphType type,
|
||||
QGraphicsItem *parent = 0);
|
||||
|
||||
qreal min() const {return -bounds().bottom();}
|
||||
qreal max() const {return -bounds().top();}
|
||||
qreal top() const {return _top;}
|
||||
|
||||
const QMap<qreal, qreal> &map() const {return _map;}
|
||||
|
||||
private:
|
||||
QString toolTip() const;
|
||||
|
||||
QMap<qreal, qreal> _map;
|
||||
qreal _top;
|
||||
};
|
||||
|
||||
#endif // GEARRATIOGRAPHITEM_H
|
||||
@ -3,6 +3,8 @@
|
||||
#include <QMouseEvent>
|
||||
#include <QPaintEngine>
|
||||
#include <QPaintDevice>
|
||||
#include <QGraphicsSimpleTextItem>
|
||||
#include <QPalette>
|
||||
#include "data/graph.h"
|
||||
#include "opengl.h"
|
||||
#include "config.h"
|
||||
@ -41,6 +43,9 @@ GraphView::GraphView(QWidget *parent)
|
||||
_sliderInfo->setZValue(3.0);
|
||||
_info = new InfoItem();
|
||||
_grid = new GridItem();
|
||||
_message = new QGraphicsSimpleTextItem(tr("Data not available"));
|
||||
_message->setBrush(QPalette().brush(QPalette::Disabled,
|
||||
QPalette::WindowText));
|
||||
|
||||
connect(_slider, SIGNAL(positionChanged(const QPointF&)), this,
|
||||
SLOT(emitSliderPositionChanged(const QPointF&)));
|
||||
@ -63,30 +68,27 @@ GraphView::GraphView(QWidget *parent)
|
||||
|
||||
GraphView::~GraphView()
|
||||
{
|
||||
if (_xAxis->scene() != _scene)
|
||||
delete _xAxis;
|
||||
if (_yAxis->scene() != _scene)
|
||||
delete _yAxis;
|
||||
if (_slider->scene() != _scene)
|
||||
delete _slider;
|
||||
if (_info->scene() != _scene)
|
||||
delete _info;
|
||||
if (_grid->scene() != _scene)
|
||||
delete _grid;
|
||||
delete _xAxis;
|
||||
delete _yAxis;
|
||||
delete _slider;
|
||||
delete _info;
|
||||
delete _grid;
|
||||
delete _message;
|
||||
|
||||
for (int i = 0; i < _graphs.count(); i++)
|
||||
if (_graphs.at(i)->scene() != _scene)
|
||||
delete _graphs[i];
|
||||
delete _graphs[i];
|
||||
}
|
||||
|
||||
void GraphView::createXLabel()
|
||||
{
|
||||
_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel, _xUnits));
|
||||
_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel,
|
||||
_xUnits.isEmpty() ? "-" : _xUnits));
|
||||
}
|
||||
|
||||
void GraphView::createYLabel()
|
||||
{
|
||||
_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel, _yUnits));
|
||||
_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel,
|
||||
_yUnits.isEmpty() ? "-" : _yUnits));
|
||||
}
|
||||
|
||||
void GraphView::setYLabel(const QString &label)
|
||||
@ -163,9 +165,16 @@ void GraphView::setGraphType(GraphType type)
|
||||
_bounds = QRectF();
|
||||
|
||||
for (int i = 0; i < _graphs.count(); i++) {
|
||||
_graphs.at(i)->setGraphType(type);
|
||||
if (_graphs.at(i)->scene() == _scene)
|
||||
_bounds |= _graphs.at(i)->bounds();
|
||||
GraphItem *gi = _graphs.at(i);
|
||||
gi->setGraphType(type);
|
||||
if (!_hide.contains(gi->id())) {
|
||||
if (gi->bounds().width() > 0)
|
||||
addItem(gi);
|
||||
else
|
||||
removeItem(gi);
|
||||
}
|
||||
if (gi->scene() == _scene)
|
||||
_bounds |= gi->bounds();
|
||||
}
|
||||
|
||||
if (type == Distance)
|
||||
@ -204,8 +213,10 @@ void GraphView::addGraph(GraphItem *graph, int id)
|
||||
|
||||
if (!_hide.contains(id)) {
|
||||
_visible.append(graph);
|
||||
_scene->addItem(graph);
|
||||
_bounds |= graph->bounds();
|
||||
if (graph->bounds().width() > 0) {
|
||||
_scene->addItem(graph);
|
||||
_bounds |= graph->bounds();
|
||||
}
|
||||
setXUnits();
|
||||
}
|
||||
}
|
||||
@ -232,13 +243,15 @@ void GraphView::showGraph(bool show, int id)
|
||||
_visible.clear();
|
||||
_bounds = QRectF();
|
||||
for (int i = 0; i < _graphs.count(); i++) {
|
||||
GraphItem* gi = _graphs.at(i);
|
||||
GraphItem *gi = _graphs.at(i);
|
||||
if (_hide.contains(gi->id()))
|
||||
removeItem(gi);
|
||||
else {
|
||||
addItem(gi);
|
||||
_visible.append(gi);
|
||||
_bounds |= gi->bounds();
|
||||
if (gi->bounds().width() > 0) {
|
||||
addItem(gi);
|
||||
_bounds |= gi->bounds();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -252,7 +265,8 @@ QRectF GraphView::bounds() const
|
||||
|
||||
void GraphView::redraw()
|
||||
{
|
||||
redraw(viewport()->size() - QSizeF(MARGIN, MARGIN));
|
||||
if (!_graphs.isEmpty())
|
||||
redraw(viewport()->size() - QSizeF(MARGIN, MARGIN));
|
||||
}
|
||||
|
||||
void GraphView::redraw(const QSizeF &size)
|
||||
@ -263,16 +277,18 @@ void GraphView::redraw(const QSizeF &size)
|
||||
qreal sx, sy;
|
||||
|
||||
|
||||
if (_visible.isEmpty() || _bounds.isNull()) {
|
||||
if (_bounds.isNull()) {
|
||||
removeItem(_xAxis);
|
||||
removeItem(_yAxis);
|
||||
removeItem(_slider);
|
||||
removeItem(_info);
|
||||
removeItem(_grid);
|
||||
_scene->setSceneRect(QRectF());
|
||||
addItem(_message);
|
||||
_scene->setSceneRect(_scene->itemsBoundingRect());
|
||||
return;
|
||||
}
|
||||
|
||||
removeItem(_message);
|
||||
addItem(_xAxis);
|
||||
addItem(_yAxis);
|
||||
addItem(_slider);
|
||||
@ -308,6 +324,7 @@ void GraphView::redraw(const QSizeF &size)
|
||||
if (r.height() < _minYRange * sy)
|
||||
r.adjust(0, -(_minYRange/2 * sy - r.height()/2), 0,
|
||||
(_minYRange/2) * sy - r.height()/2);
|
||||
r = r.toRect();
|
||||
|
||||
_xAxis->setSize(r.width());
|
||||
_yAxis->setSize(r.height());
|
||||
@ -329,9 +346,11 @@ void GraphView::redraw(const QSizeF &size)
|
||||
_scene->setSceneRect(_scene->itemsBoundingRect());
|
||||
}
|
||||
|
||||
void GraphView::resizeEvent(QResizeEvent *)
|
||||
void GraphView::resizeEvent(QResizeEvent *e)
|
||||
{
|
||||
redraw();
|
||||
redraw(e->size() - QSizeF(MARGIN, MARGIN));
|
||||
|
||||
QGraphicsView::resizeEvent(e);
|
||||
}
|
||||
|
||||
void GraphView::mousePressEvent(QMouseEvent *e)
|
||||
|
||||
@ -7,15 +7,16 @@
|
||||
#include "data/graph.h"
|
||||
#include "palette.h"
|
||||
#include "units.h"
|
||||
#include "infoitem.h"
|
||||
|
||||
|
||||
class AxisItem;
|
||||
class SliderItem;
|
||||
class SliderInfoItem;
|
||||
class InfoItem;
|
||||
class GraphItem;
|
||||
class PathItem;
|
||||
class GridItem;
|
||||
class QGraphicsSimpleTextItem;
|
||||
|
||||
class GraphView : public QGraphicsView
|
||||
{
|
||||
@ -26,6 +27,7 @@ public:
|
||||
~GraphView();
|
||||
|
||||
bool isEmpty() const {return _graphs.isEmpty();}
|
||||
const QList<KV> &info() const {return _info->info();}
|
||||
void clear();
|
||||
|
||||
void plot(QPainter *painter, const QRectF &target, qreal scale);
|
||||
@ -64,7 +66,6 @@ protected:
|
||||
|
||||
QRectF bounds() const;
|
||||
void redraw();
|
||||
void redraw(const QSizeF &size);
|
||||
void addInfo(const QString &key, const QString &value);
|
||||
void clearInfo();
|
||||
void skipColor() {_palette.nextColor();}
|
||||
@ -77,6 +78,7 @@ private slots:
|
||||
void newSliderPosition(const QPointF &pos);
|
||||
|
||||
private:
|
||||
void redraw(const QSizeF &size);
|
||||
void setXUnits();
|
||||
void createXLabel();
|
||||
void createYLabel();
|
||||
@ -85,8 +87,8 @@ private:
|
||||
void removeItem(QGraphicsItem *item);
|
||||
void addItem(QGraphicsItem *item);
|
||||
|
||||
void resizeEvent(QResizeEvent *);
|
||||
void mousePressEvent(QMouseEvent *);
|
||||
void resizeEvent(QResizeEvent *e);
|
||||
void mousePressEvent(QMouseEvent *e);
|
||||
|
||||
Units _units;
|
||||
qreal _xScale, _yScale;
|
||||
@ -104,6 +106,7 @@ private:
|
||||
SliderInfoItem *_sliderInfo;
|
||||
InfoItem *_info;
|
||||
GridItem *_grid;
|
||||
QGraphicsSimpleTextItem *_message;
|
||||
|
||||
QList<GraphItem*> _visible;
|
||||
QSet<int> _hide;
|
||||
|
||||
@ -4,13 +4,6 @@
|
||||
|
||||
#define GRID_WIDTH 0
|
||||
|
||||
GridItem::GridItem(QGraphicsItem *parent) : QGraphicsItem(parent)
|
||||
{
|
||||
#ifndef Q_OS_MAC
|
||||
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
|
||||
#endif // Q_OS_MAC
|
||||
}
|
||||
|
||||
void GridItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
QWidget *widget)
|
||||
{
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
class GridItem : public QGraphicsItem
|
||||
{
|
||||
public:
|
||||
GridItem(QGraphicsItem *parent = 0);
|
||||
GridItem(QGraphicsItem *parent = 0): QGraphicsItem(parent) {}
|
||||
|
||||
QRectF boundingRect() const {return _boundingRect;}
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
|
||||
205
src/GUI/gui.cpp
205
src/GUI/gui.cpp
@ -23,6 +23,7 @@
|
||||
#include <QUrl>
|
||||
#include <QPixmapCache>
|
||||
#include "data/data.h"
|
||||
#include "data/poi.h"
|
||||
#include "map/maplist.h"
|
||||
#include "map/emptymap.h"
|
||||
#include "map/downloader.h"
|
||||
@ -36,6 +37,7 @@
|
||||
#include "temperaturegraph.h"
|
||||
#include "cadencegraph.h"
|
||||
#include "powergraph.h"
|
||||
#include "gearratiograph.h"
|
||||
#include "mapview.h"
|
||||
#include "trackinfo.h"
|
||||
#include "filebrowser.h"
|
||||
@ -96,14 +98,6 @@ GUI::GUI()
|
||||
updateStatusBarInfo();
|
||||
}
|
||||
|
||||
GUI::~GUI()
|
||||
{
|
||||
for (int i = 0; i < _tabs.size(); i++) {
|
||||
if (_graphTabWidget->indexOf(_tabs.at(i)) < 0)
|
||||
delete _tabs.at(i);
|
||||
}
|
||||
}
|
||||
|
||||
void GUI::loadMaps()
|
||||
{
|
||||
_ml = new MapList(this);
|
||||
@ -148,6 +142,7 @@ void GUI::createMapActions()
|
||||
|
||||
for (int i = 0; i < _ml->maps().count(); i++) {
|
||||
QAction *a = new QAction(_ml->maps().at(i)->name(), this);
|
||||
a->setMenuRole(QAction::NoRole);
|
||||
a->setCheckable(true);
|
||||
a->setActionGroup(_mapsActionGroup);
|
||||
|
||||
@ -176,6 +171,7 @@ QAction *GUI::createPOIFileAction(int index)
|
||||
{
|
||||
QAction *a = new QAction(QFileInfo(_poi->files().at(index)).fileName(),
|
||||
this);
|
||||
a->setMenuRole(QAction::NoRole);
|
||||
a->setCheckable(true);
|
||||
|
||||
_poiFilesSignalMapper->setMapping(a, index);
|
||||
@ -207,8 +203,10 @@ void GUI::createActions()
|
||||
|
||||
// Help & About
|
||||
_pathsAction = new QAction(tr("Paths"), this);
|
||||
_pathsAction->setMenuRole(QAction::NoRole);
|
||||
connect(_pathsAction, SIGNAL(triggered()), this, SLOT(paths()));
|
||||
_keysAction = new QAction(tr("Keyboard controls"), this);
|
||||
_keysAction->setMenuRole(QAction::NoRole);
|
||||
connect(_keysAction, SIGNAL(triggered()), this, SLOT(keys()));
|
||||
_aboutAction = new QAction(QIcon(QPixmap(APP_ICON)),
|
||||
tr("About GPXSee"), this);
|
||||
@ -218,50 +216,66 @@ void GUI::createActions()
|
||||
// File actions
|
||||
_openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
|
||||
tr("Open..."), this);
|
||||
_openFileAction->setMenuRole(QAction::NoRole);
|
||||
_openFileAction->setShortcut(OPEN_SHORTCUT);
|
||||
connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile()));
|
||||
addAction(_openFileAction);
|
||||
_printFileAction = new QAction(QIcon(QPixmap(PRINT_FILE_ICON)),
|
||||
tr("Print..."), this);
|
||||
_printFileAction->setMenuRole(QAction::NoRole);
|
||||
_printFileAction->setActionGroup(_fileActionGroup);
|
||||
connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
|
||||
addAction(_printFileAction);
|
||||
_exportFileAction = new QAction(QIcon(QPixmap(EXPORT_FILE_ICON)),
|
||||
tr("Export to PDF..."), this);
|
||||
_exportFileAction->setMenuRole(QAction::NoRole);
|
||||
_exportFileAction->setShortcut(EXPORT_SHORTCUT);
|
||||
_exportFileAction->setActionGroup(_fileActionGroup);
|
||||
connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
|
||||
addAction(_exportFileAction);
|
||||
_closeFileAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
|
||||
tr("Close"), this);
|
||||
_closeFileAction->setMenuRole(QAction::NoRole);
|
||||
_closeFileAction->setShortcut(CLOSE_SHORTCUT);
|
||||
_closeFileAction->setActionGroup(_fileActionGroup);
|
||||
connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeAll()));
|
||||
addAction(_closeFileAction);
|
||||
_reloadFileAction = new QAction(QIcon(QPixmap(RELOAD_FILE_ICON)),
|
||||
tr("Reload"), this);
|
||||
_reloadFileAction->setMenuRole(QAction::NoRole);
|
||||
_reloadFileAction->setShortcut(RELOAD_SHORTCUT);
|
||||
_reloadFileAction->setActionGroup(_fileActionGroup);
|
||||
connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile()));
|
||||
addAction(_reloadFileAction);
|
||||
_statisticsAction = new QAction(tr("Statistics..."), this);
|
||||
_statisticsAction->setMenuRole(QAction::NoRole);
|
||||
_statisticsAction->setShortcut(STATISTICS_SHORTCUT);
|
||||
_statisticsAction->setActionGroup(_fileActionGroup);
|
||||
connect(_statisticsAction, SIGNAL(triggered()), this, SLOT(statistics()));
|
||||
addAction(_statisticsAction);
|
||||
|
||||
// POI actions
|
||||
_openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
|
||||
tr("Load POI file..."), this);
|
||||
_openPOIAction->setMenuRole(QAction::NoRole);
|
||||
connect(_openPOIAction, SIGNAL(triggered()), this, SLOT(openPOIFile()));
|
||||
_closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
|
||||
tr("Close POI files"), this);
|
||||
_closePOIAction->setMenuRole(QAction::NoRole);
|
||||
connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
|
||||
_overlapPOIAction = new QAction(tr("Overlap POIs"), this);
|
||||
_overlapPOIAction->setMenuRole(QAction::NoRole);
|
||||
_overlapPOIAction->setCheckable(true);
|
||||
connect(_overlapPOIAction, SIGNAL(triggered(bool)), _mapView,
|
||||
SLOT(setPOIOverlap(bool)));
|
||||
_showPOILabelsAction = new QAction(tr("Show POI labels"), this);
|
||||
_showPOILabelsAction->setMenuRole(QAction::NoRole);
|
||||
_showPOILabelsAction->setCheckable(true);
|
||||
connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _mapView,
|
||||
SLOT(showPOILabels(bool)));
|
||||
_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
|
||||
tr("Show POIs"), this);
|
||||
_showPOIAction->setMenuRole(QAction::NoRole);
|
||||
_showPOIAction->setCheckable(true);
|
||||
_showPOIAction->setShortcut(SHOW_POI_SHORTCUT);
|
||||
connect(_showPOIAction, SIGNAL(triggered(bool)), _mapView,
|
||||
@ -272,6 +286,7 @@ void GUI::createActions()
|
||||
// Map actions
|
||||
_showMapAction = new QAction(QIcon(QPixmap(SHOW_MAP_ICON)), tr("Show map"),
|
||||
this);
|
||||
_showMapAction->setMenuRole(QAction::NoRole);
|
||||
_showMapAction->setCheckable(true);
|
||||
_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
|
||||
connect(_showMapAction, SIGNAL(triggered(bool)), _mapView,
|
||||
@ -279,16 +294,20 @@ void GUI::createActions()
|
||||
addAction(_showMapAction);
|
||||
_loadMapAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
|
||||
tr("Load map..."), this);
|
||||
_loadMapAction->setMenuRole(QAction::NoRole);
|
||||
connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
|
||||
_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
|
||||
_clearMapCacheAction->setMenuRole(QAction::NoRole);
|
||||
connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
|
||||
SLOT(clearMapCache()));
|
||||
createMapActions();
|
||||
_nextMapAction = new QAction(tr("Next map"), this);
|
||||
_nextMapAction->setMenuRole(QAction::NoRole);
|
||||
_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
|
||||
connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap()));
|
||||
addAction(_nextMapAction);
|
||||
_prevMapAction = new QAction(tr("Next map"), this);
|
||||
_prevMapAction->setMenuRole(QAction::NoRole);
|
||||
_prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
|
||||
connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
|
||||
addAction(_prevMapAction);
|
||||
@ -299,22 +318,27 @@ void GUI::createActions()
|
||||
|
||||
// Data actions
|
||||
_showTracksAction = new QAction(tr("Show tracks"), this);
|
||||
_showTracksAction->setMenuRole(QAction::NoRole);
|
||||
_showTracksAction->setCheckable(true);
|
||||
connect(_showTracksAction, SIGNAL(triggered(bool)), this,
|
||||
SLOT(showTracks(bool)));
|
||||
_showRoutesAction = new QAction(tr("Show routes"), this);
|
||||
_showRoutesAction->setMenuRole(QAction::NoRole);
|
||||
_showRoutesAction->setCheckable(true);
|
||||
connect(_showRoutesAction, SIGNAL(triggered(bool)), this,
|
||||
SLOT(showRoutes(bool)));
|
||||
_showWaypointsAction = new QAction(tr("Show waypoints"), this);
|
||||
_showWaypointsAction->setMenuRole(QAction::NoRole);
|
||||
_showWaypointsAction->setCheckable(true);
|
||||
connect(_showWaypointsAction, SIGNAL(triggered(bool)), _mapView,
|
||||
SLOT(showWaypoints(bool)));
|
||||
_showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this);
|
||||
_showWaypointLabelsAction->setMenuRole(QAction::NoRole);
|
||||
_showWaypointLabelsAction->setCheckable(true);
|
||||
connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _mapView,
|
||||
SLOT(showWaypointLabels(bool)));
|
||||
_showRouteWaypointsAction = new QAction(tr("Route waypoints"), this);
|
||||
_showRouteWaypointsAction->setMenuRole(QAction::NoRole);
|
||||
_showRouteWaypointsAction->setCheckable(true);
|
||||
connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _mapView,
|
||||
SLOT(showRouteWaypoints(bool)));
|
||||
@ -322,6 +346,7 @@ void GUI::createActions()
|
||||
// Graph actions
|
||||
_showGraphsAction = new QAction(QIcon(QPixmap(SHOW_GRAPHS_ICON)),
|
||||
tr("Show graphs"), this);
|
||||
_showGraphsAction->setMenuRole(QAction::NoRole);
|
||||
_showGraphsAction->setCheckable(true);
|
||||
_showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT);
|
||||
connect(_showGraphsAction, SIGNAL(triggered(bool)), this,
|
||||
@ -330,39 +355,46 @@ void GUI::createActions()
|
||||
ag = new QActionGroup(this);
|
||||
ag->setExclusive(true);
|
||||
_distanceGraphAction = new QAction(tr("Distance"), this);
|
||||
_distanceGraphAction->setMenuRole(QAction::NoRole);
|
||||
_distanceGraphAction->setCheckable(true);
|
||||
_distanceGraphAction->setActionGroup(ag);
|
||||
connect(_distanceGraphAction, SIGNAL(triggered()), this,
|
||||
SLOT(setDistanceGraph()));
|
||||
addAction(_distanceGraphAction);
|
||||
_timeGraphAction = new QAction(tr("Time"), this);
|
||||
_timeGraphAction->setMenuRole(QAction::NoRole);
|
||||
_timeGraphAction->setCheckable(true);
|
||||
_timeGraphAction->setActionGroup(ag);
|
||||
connect(_timeGraphAction, SIGNAL(triggered()), this,
|
||||
SLOT(setTimeGraph()));
|
||||
addAction(_timeGraphAction);
|
||||
_showGraphGridAction = new QAction(tr("Show grid"), this);
|
||||
_showGraphGridAction->setMenuRole(QAction::NoRole);
|
||||
_showGraphGridAction->setCheckable(true);
|
||||
connect(_showGraphGridAction, SIGNAL(triggered(bool)), this,
|
||||
SLOT(showGraphGrids(bool)));
|
||||
_showGraphSliderInfoAction = new QAction(tr("Show slider info"), this);
|
||||
_showGraphSliderInfoAction->setMenuRole(QAction::NoRole);
|
||||
_showGraphSliderInfoAction->setCheckable(true);
|
||||
connect(_showGraphSliderInfoAction, SIGNAL(triggered(bool)), this,
|
||||
SLOT(showGraphSliderInfo(bool)));
|
||||
|
||||
// Settings actions
|
||||
_showToolbarsAction = new QAction(tr("Show toolbars"), this);
|
||||
_showToolbarsAction->setMenuRole(QAction::NoRole);
|
||||
_showToolbarsAction->setCheckable(true);
|
||||
connect(_showToolbarsAction, SIGNAL(triggered(bool)), this,
|
||||
SLOT(showToolbars(bool)));
|
||||
ag = new QActionGroup(this);
|
||||
ag->setExclusive(true);
|
||||
_totalTimeAction = new QAction(tr("Total time"), this);
|
||||
_totalTimeAction->setMenuRole(QAction::NoRole);
|
||||
_totalTimeAction->setCheckable(true);
|
||||
_totalTimeAction->setActionGroup(ag);
|
||||
connect(_totalTimeAction, SIGNAL(triggered()), this,
|
||||
SLOT(setTotalTime()));
|
||||
_movingTimeAction = new QAction(tr("Moving time"), this);
|
||||
_movingTimeAction->setMenuRole(QAction::NoRole);
|
||||
_movingTimeAction->setCheckable(true);
|
||||
_movingTimeAction->setActionGroup(ag);
|
||||
connect(_movingTimeAction, SIGNAL(triggered()), this,
|
||||
@ -370,16 +402,19 @@ void GUI::createActions()
|
||||
ag = new QActionGroup(this);
|
||||
ag->setExclusive(true);
|
||||
_metricUnitsAction = new QAction(tr("Metric"), this);
|
||||
_metricUnitsAction->setMenuRole(QAction::NoRole);
|
||||
_metricUnitsAction->setCheckable(true);
|
||||
_metricUnitsAction->setActionGroup(ag);
|
||||
connect(_metricUnitsAction, SIGNAL(triggered()), this,
|
||||
SLOT(setMetricUnits()));
|
||||
_imperialUnitsAction = new QAction(tr("Imperial"), this);
|
||||
_imperialUnitsAction->setMenuRole(QAction::NoRole);
|
||||
_imperialUnitsAction->setCheckable(true);
|
||||
_imperialUnitsAction->setActionGroup(ag);
|
||||
connect(_imperialUnitsAction, SIGNAL(triggered()), this,
|
||||
SLOT(setImperialUnits()));
|
||||
_nauticalUnitsAction = new QAction(tr("Nautical"), this);
|
||||
_nauticalUnitsAction->setMenuRole(QAction::NoRole);
|
||||
_nauticalUnitsAction->setCheckable(true);
|
||||
_nauticalUnitsAction->setActionGroup(ag);
|
||||
connect(_nauticalUnitsAction, SIGNAL(triggered()), this,
|
||||
@ -387,22 +422,26 @@ void GUI::createActions()
|
||||
ag = new QActionGroup(this);
|
||||
ag->setExclusive(true);
|
||||
_decimalDegreesAction = new QAction(tr("Decimal degrees (DD)"), this);
|
||||
_decimalDegreesAction->setMenuRole(QAction::NoRole);
|
||||
_decimalDegreesAction->setCheckable(true);
|
||||
_decimalDegreesAction->setActionGroup(ag);
|
||||
connect(_decimalDegreesAction, SIGNAL(triggered()), this,
|
||||
SLOT(setDecimalDegrees()));
|
||||
_degreesMinutesAction = new QAction(tr("Degrees and decimal minutes (DMM)"),
|
||||
this);
|
||||
_degreesMinutesAction->setMenuRole(QAction::NoRole);
|
||||
_degreesMinutesAction->setCheckable(true);
|
||||
_degreesMinutesAction->setActionGroup(ag);
|
||||
connect(_degreesMinutesAction, SIGNAL(triggered()), this,
|
||||
SLOT(setDegreesMinutes()));
|
||||
_DMSAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
|
||||
_DMSAction->setMenuRole(QAction::NoRole);
|
||||
_DMSAction->setCheckable(true);
|
||||
_DMSAction->setActionGroup(ag);
|
||||
connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS()));
|
||||
_fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)),
|
||||
tr("Fullscreen mode"), this);
|
||||
_fullscreenAction->setMenuRole(QAction::NoRole);
|
||||
_fullscreenAction->setCheckable(true);
|
||||
_fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT);
|
||||
connect(_fullscreenAction, SIGNAL(triggered(bool)), this,
|
||||
@ -416,16 +455,20 @@ void GUI::createActions()
|
||||
// Navigation actions
|
||||
_nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this);
|
||||
_nextAction->setActionGroup(_navigationActionGroup);
|
||||
_nextAction->setMenuRole(QAction::NoRole);
|
||||
connect(_nextAction, SIGNAL(triggered()), this, SLOT(next()));
|
||||
_prevAction = new QAction(QIcon(QPixmap(PREV_FILE_ICON)), tr("Previous"),
|
||||
this);
|
||||
_prevAction->setMenuRole(QAction::NoRole);
|
||||
_prevAction->setActionGroup(_navigationActionGroup);
|
||||
connect(_prevAction, SIGNAL(triggered()), this, SLOT(prev()));
|
||||
_lastAction = new QAction(QIcon(QPixmap(LAST_FILE_ICON)), tr("Last"), this);
|
||||
_lastAction->setMenuRole(QAction::NoRole);
|
||||
_lastAction->setActionGroup(_navigationActionGroup);
|
||||
connect(_lastAction, SIGNAL(triggered()), this, SLOT(last()));
|
||||
_firstAction = new QAction(QIcon(QPixmap(FIRST_FILE_ICON)), tr("First"),
|
||||
this);
|
||||
_firstAction->setMenuRole(QAction::NoRole);
|
||||
_firstAction->setActionGroup(_navigationActionGroup);
|
||||
connect(_firstAction, SIGNAL(triggered()), this, SLOT(first()));
|
||||
}
|
||||
@ -438,8 +481,9 @@ void GUI::createMenus()
|
||||
fileMenu->addAction(_printFileAction);
|
||||
fileMenu->addAction(_exportFileAction);
|
||||
fileMenu->addSeparator();
|
||||
fileMenu->addAction(_reloadFileAction);
|
||||
fileMenu->addAction(_statisticsAction);
|
||||
fileMenu->addSeparator();
|
||||
fileMenu->addAction(_reloadFileAction);
|
||||
fileMenu->addAction(_closeFileAction);
|
||||
#ifndef Q_OS_MAC
|
||||
fileMenu->addSeparator();
|
||||
@ -557,12 +601,13 @@ void GUI::createGraphTabs()
|
||||
_graphTabWidget->setDocumentMode(true);
|
||||
#endif // Q_OS_WIN32
|
||||
|
||||
_tabs.append(new ElevationGraph);
|
||||
_tabs.append(new SpeedGraph);
|
||||
_tabs.append(new HeartRateGraph);
|
||||
_tabs.append(new CadenceGraph);
|
||||
_tabs.append(new PowerGraph);
|
||||
_tabs.append(new TemperatureGraph);
|
||||
_tabs.append(new ElevationGraph(_graphTabWidget));
|
||||
_tabs.append(new SpeedGraph(_graphTabWidget));
|
||||
_tabs.append(new HeartRateGraph(_graphTabWidget));
|
||||
_tabs.append(new CadenceGraph(_graphTabWidget));
|
||||
_tabs.append(new PowerGraph(_graphTabWidget));
|
||||
_tabs.append(new TemperatureGraph(_graphTabWidget));
|
||||
_tabs.append(new GearRatioGraph(_graphTabWidget));
|
||||
|
||||
for (int i = 0; i < _tabs.count(); i++)
|
||||
connect(_tabs.at(i), SIGNAL(sliderPositionChanged(qreal)), this,
|
||||
@ -646,19 +691,19 @@ void GUI::paths()
|
||||
msgBox.setWindowTitle(tr("Paths"));
|
||||
msgBox.setText("<h3>" + tr("Paths") + "</h3>");
|
||||
msgBox.setInformativeText(
|
||||
"<style>td {white-space: pre; padding-right: 1em;}</style>"
|
||||
"<div><table><tr><td>" + tr("Map directory:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(GLOBAL_MAP_DIR) + "</code></td></tr><tr><td>"
|
||||
+ tr("POI directory:") + "</td><td><code>"
|
||||
"<style>td {white-space: pre; padding-right: 1em;}</style><h4>"
|
||||
+ tr("Global") + "</h4><table><tr><td>" + tr("Map directory:")
|
||||
+ "</td><td><code>" + QDir::cleanPath(GLOBAL_MAP_DIR)
|
||||
+ "</code></td></tr><tr><td>" + tr("POI directory:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(GLOBAL_POI_DIR) + "</code></td></tr><tr><td>"
|
||||
+ tr("GCS file:") + "</td><td><code>" + QDir::cleanPath(GLOBAL_GCS_FILE)
|
||||
+ "</code></td></tr><tr><td>" + tr("PCS file:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(GLOBAL_PCS_FILE) + "</code></td></tr><tr><td>"
|
||||
+ tr("Ellipsoids file:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(GLOBAL_ELLIPSOID_FILE) + "</code></td></tr>"
|
||||
+ "<tr><td></td><td></td></tr></table></div><div><table><tr><td>"
|
||||
+ tr("User override directory:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(USER_DIR) + "</td></tr></table></div>"
|
||||
+ tr("GCS/PCS directory:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(GLOBAL_CSV_DIR) + "</code></td></tr></table>"
|
||||
+ "<h4>" + tr("User-specific") + "</h4><table><tr><td>"
|
||||
+ tr("Map directory:") + "</td><td><code>" + QDir::cleanPath(USER_MAP_DIR)
|
||||
+ "</code></td></tr><tr><td>" + tr("POI directory:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(USER_POI_DIR) + "</code></td></tr><tr><td>"
|
||||
+ tr("GCS/PCS directory:") + "</td><td><code>"
|
||||
+ QDir::cleanPath(USER_CSV_DIR) + "</code></td></tr></table>"
|
||||
);
|
||||
|
||||
msgBox.exec();
|
||||
@ -867,6 +912,7 @@ void GUI::openOptions()
|
||||
SET_TRACK_OPTION(outlierEliminate, setOutlierElimination);
|
||||
SET_TRACK_OPTION(pauseSpeed, setPauseSpeed);
|
||||
SET_TRACK_OPTION(pauseInterval, setPauseInterval);
|
||||
SET_TRACK_OPTION(useReportedSpeed, useReportedSpeed);
|
||||
|
||||
if (options.poiRadius != _options.poiRadius)
|
||||
_poi->setRadius(options.poiRadius);
|
||||
@ -874,6 +920,10 @@ void GUI::openOptions()
|
||||
QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
|
||||
if (options.connectionTimeout != _options.connectionTimeout)
|
||||
Downloader::setTimeout(options.connectionTimeout);
|
||||
#ifdef ENABLE_HTTP2
|
||||
if (options.enableHTTP2 != _options.enableHTTP2)
|
||||
Downloader::enableHTTP2(options.enableHTTP2);
|
||||
#endif // ENABLE_HTTP2
|
||||
|
||||
if (reload)
|
||||
reloadFile();
|
||||
@ -912,14 +962,78 @@ void GUI::exportFile()
|
||||
plot(&printer);
|
||||
}
|
||||
|
||||
void GUI::statistics()
|
||||
{
|
||||
#ifdef Q_OS_WIN32
|
||||
QString text = "<style>td {white-space: pre; padding-right: 4em;}"
|
||||
"th {text-align: left; padding-top: 0.5em;}</style><table>";
|
||||
#else // Q_OS_WIN32
|
||||
QString text = "<style>td {white-space: pre; padding-right: 2em;}"
|
||||
"th {text-align: left; padding-top: 0.5em;}</style><table>";
|
||||
#endif // Q_OS_WIN32
|
||||
|
||||
if (_showTracksAction->isChecked() && _trackCount > 1)
|
||||
text.append("<tr><td>" + tr("Tracks") + ":</td><td>"
|
||||
+ QString::number(_trackCount) + "</td></tr>");
|
||||
if (_showRoutesAction->isChecked() && _routeCount > 1)
|
||||
text.append("<tr><td>" + tr("Routes") + ":</td><td>"
|
||||
+ QString::number(_routeCount) + "</td></tr>");
|
||||
if (_showWaypointsAction->isChecked() && _waypointCount > 1)
|
||||
text.append("<tr><td>" + tr("Waypoints") + ":</td><td>"
|
||||
+ QString::number(_waypointCount) + "</td></tr>");
|
||||
|
||||
if (_dateRange.first.isValid()) {
|
||||
if (_dateRange.first == _dateRange.second) {
|
||||
QString format = QLocale::system().dateFormat(QLocale::LongFormat);
|
||||
text.append("<tr><td>" + tr("Date") + ":</td><td>"
|
||||
+ _dateRange.first.toString(format) + "</td></tr>");
|
||||
} else {
|
||||
QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
|
||||
text.append("<tr><td>" + tr("Date") + ":</td><td>"
|
||||
+ QString("%1 - %2").arg(_dateRange.first.toString(format),
|
||||
_dateRange.second.toString(format)) + "</td></tr>");
|
||||
}
|
||||
}
|
||||
|
||||
if (distance() > 0)
|
||||
text.append("<tr><td>" + tr("Distance") + ":</td><td>"
|
||||
+ Format::distance(distance(), units()) + "</td></tr>");
|
||||
if (time() > 0) {
|
||||
text.append("<tr><td>" + tr("Time") + ":</td><td>"
|
||||
+ Format::timeSpan(time()) + "</td></tr>");
|
||||
text.append("<tr><td>" + tr("Moving time") + ":</td><td>"
|
||||
+ Format::timeSpan(movingTime()) + "</td></tr>");
|
||||
}
|
||||
|
||||
for (int i = 0; i < _tabs.count(); i++) {
|
||||
const GraphTab *tab = _tabs.at(i);
|
||||
if (tab->isEmpty())
|
||||
continue;
|
||||
|
||||
text.append("<tr><th colspan=\"2\">" + tab->label() + "</th></tr>");
|
||||
for (int j = 0; j < tab->info().size(); j++) {
|
||||
const KV &kv = tab->info().at(j);
|
||||
text.append("<tr><td>" + kv.key() + ":</td><td>" + kv.value()
|
||||
+ "</td></tr>");
|
||||
}
|
||||
}
|
||||
|
||||
text.append("</table>");
|
||||
|
||||
|
||||
QMessageBox msgBox(this);
|
||||
msgBox.setWindowTitle(tr("Statistics"));
|
||||
msgBox.setText("<h3>" + tr("Statistics") + "</h3>");
|
||||
msgBox.setInformativeText(text);
|
||||
msgBox.exec();
|
||||
}
|
||||
|
||||
void GUI::plot(QPrinter *printer)
|
||||
{
|
||||
QPainter p(printer);
|
||||
TrackInfo info;
|
||||
qreal ih, gh, mh, ratio;
|
||||
qreal d = distance();
|
||||
qreal t = time();
|
||||
qreal tm = movingTime();
|
||||
|
||||
|
||||
if (!_pathName.isNull() && _options.printName)
|
||||
info.insert(tr("Name"), _pathName);
|
||||
@ -929,7 +1043,7 @@ void GUI::plot(QPrinter *printer)
|
||||
info.insert(tr("Tracks"), QString::number(_trackCount));
|
||||
if (_showRoutesAction->isChecked() && _routeCount > 1)
|
||||
info.insert(tr("Routes"), QString::number(_routeCount));
|
||||
if (_showWaypointsAction->isChecked() && _waypointCount > 2)
|
||||
if (_showWaypointsAction->isChecked() && _waypointCount > 1)
|
||||
info.insert(tr("Waypoints"), QString::number(_waypointCount));
|
||||
}
|
||||
|
||||
@ -945,12 +1059,12 @@ void GUI::plot(QPrinter *printer)
|
||||
}
|
||||
}
|
||||
|
||||
if (d > 0 && _options.printDistance)
|
||||
info.insert(tr("Distance"), Format::distance(d, units()));
|
||||
if (t > 0 && _options.printTime)
|
||||
info.insert(tr("Time"), Format::timeSpan(t));
|
||||
if (tm > 0 && _options.printMovingTime)
|
||||
info.insert(tr("Moving time"), Format::timeSpan(tm));
|
||||
if (distance() > 0 && _options.printDistance)
|
||||
info.insert(tr("Distance"), Format::distance(distance(), units()));
|
||||
if (time() > 0 && _options.printTime)
|
||||
info.insert(tr("Time"), Format::timeSpan(time()));
|
||||
if (movingTime() > 0 && _options.printMovingTime)
|
||||
info.insert(tr("Moving time"), Format::timeSpan(movingTime()));
|
||||
|
||||
qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
|
||||
/ (qreal)printer->resolution());
|
||||
@ -1166,6 +1280,7 @@ bool GUI::loadMap(const QString &fileName)
|
||||
|
||||
if (_ml->loadFile(fileName)) {
|
||||
QAction *a = new QAction(_ml->maps().last()->name(), this);
|
||||
a->setMenuRole(QAction::NoRole);
|
||||
a->setCheckable(true);
|
||||
a->setActionGroup(_mapsActionGroup);
|
||||
_mapsSignalMapper->setMapping(a, _ml->maps().size() - 1);
|
||||
@ -1638,10 +1753,16 @@ void GUI::writeSettings()
|
||||
settings.setValue(PAUSE_SPEED_SETTING, _options.pauseSpeed);
|
||||
if (_options.pauseInterval != PAUSE_INTERVAL_DEFAULT)
|
||||
settings.setValue(PAUSE_INTERVAL_SETTING, _options.pauseInterval);
|
||||
if (_options.useReportedSpeed != USE_REPORTED_SPEED_DEFAULT)
|
||||
settings.setValue(USE_REPORTED_SPEED_SETTING, _options.useReportedSpeed);
|
||||
if (_options.poiRadius != POI_RADIUS_DEFAULT)
|
||||
settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
|
||||
if (_options.useOpenGL != USE_OPENGL_DEFAULT)
|
||||
settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
|
||||
#ifdef ENABLE_HTTP2
|
||||
if (_options.enableHTTP2 != ENABLE_HTTP2_DEFAULT)
|
||||
settings.setValue(ENABLE_HTTP2_SETTING, _options.enableHTTP2);
|
||||
#endif // ENABLE_HTTP2
|
||||
if (_options.pixmapCache != PIXMAP_CACHE_DEFAULT)
|
||||
settings.setValue(PIXMAP_CACHE_SETTING, _options.pixmapCache);
|
||||
if (_options.connectionTimeout != CONNECTION_TIMEOUT_DEFAULT)
|
||||
@ -1866,12 +1987,18 @@ void GUI::readSettings()
|
||||
OUTLIER_ELIMINATE_DEFAULT).toBool();
|
||||
_options.pauseSpeed = settings.value(PAUSE_SPEED_SETTING,
|
||||
PAUSE_SPEED_DEFAULT).toFloat();
|
||||
_options.useReportedSpeed = settings.value(USE_REPORTED_SPEED_SETTING,
|
||||
USE_REPORTED_SPEED_DEFAULT).toBool();
|
||||
_options.pauseInterval = settings.value(PAUSE_INTERVAL_SETTING,
|
||||
PAUSE_INTERVAL_DEFAULT).toInt();
|
||||
_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
|
||||
.toInt();
|
||||
_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
|
||||
.toBool();
|
||||
#ifdef ENABLE_HTTP2
|
||||
_options.enableHTTP2 = settings.value(ENABLE_HTTP2_SETTING,
|
||||
ENABLE_HTTP2_DEFAULT).toBool();
|
||||
#endif // ENABLE_HTTP2
|
||||
_options.pixmapCache = settings.value(PIXMAP_CACHE_SETTING,
|
||||
PIXMAP_CACHE_DEFAULT).toInt();
|
||||
_options.connectionTimeout = settings.value(CONNECTION_TIMEOUT_SETTING,
|
||||
@ -1931,11 +2058,15 @@ void GUI::readSettings()
|
||||
Track::setOutlierElimination(_options.outlierEliminate);
|
||||
Track::setPauseSpeed(_options.pauseSpeed);
|
||||
Track::setPauseInterval(_options.pauseInterval);
|
||||
Track::useReportedSpeed(_options.useReportedSpeed);
|
||||
|
||||
_poi->setRadius(_options.poiRadius);
|
||||
|
||||
QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
|
||||
Downloader::setTimeout(_options.connectionTimeout);
|
||||
#ifdef ENABLE_HTTP2
|
||||
Downloader::enableHTTP2(_options.enableHTTP2);
|
||||
#endif // ENABLE_HTTP2
|
||||
|
||||
settings.endGroup();
|
||||
}
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
#include <QDate>
|
||||
#include <QPrinter>
|
||||
#include "data/graph.h"
|
||||
#include "data/poi.h"
|
||||
#include "units.h"
|
||||
#include "timetype.h"
|
||||
#include "format.h"
|
||||
@ -28,6 +27,7 @@ class GraphTab;
|
||||
class MapView;
|
||||
class Map;
|
||||
class MapList;
|
||||
class POI;
|
||||
|
||||
class GUI : public QMainWindow
|
||||
{
|
||||
@ -35,7 +35,6 @@ class GUI : public QMainWindow
|
||||
|
||||
public:
|
||||
GUI();
|
||||
~GUI();
|
||||
|
||||
bool openFile(const QString &fileName);
|
||||
|
||||
@ -48,6 +47,7 @@ private slots:
|
||||
void openFile();
|
||||
void closeAll();
|
||||
void reloadFile();
|
||||
void statistics();
|
||||
void openPOIFile();
|
||||
void closePOIFiles();
|
||||
void showGraphs(bool show);
|
||||
@ -151,6 +151,7 @@ private:
|
||||
QAction *_openFileAction;
|
||||
QAction *_closeFileAction;
|
||||
QAction *_reloadFileAction;
|
||||
QAction *_statisticsAction;
|
||||
QAction *_openPOIAction;
|
||||
QAction *_closePOIAction;
|
||||
QAction *_showPOIAction;
|
||||
|
||||
@ -7,6 +7,9 @@
|
||||
|
||||
InfoItem::InfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)
|
||||
{
|
||||
_font.setPixelSize(FONT_SIZE);
|
||||
_font.setFamily(FONT_FAMILY);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
|
||||
#endif // Q_OS_MAC
|
||||
@ -14,16 +17,14 @@ InfoItem::InfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)
|
||||
|
||||
void InfoItem::updateBoundingRect()
|
||||
{
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QList<KV>::const_iterator i;
|
||||
QFontMetrics fm(_font);
|
||||
qreal width = 0;
|
||||
|
||||
for (i = _list.constBegin(); i != _list.constEnd(); i++) {
|
||||
width += fm.width(i->key + ": ");
|
||||
width += fm.width(i->value) + ((i == _list.constEnd() - 1) ? 0 : PADDING);
|
||||
for (QList<KV>::const_iterator i = _list.constBegin();
|
||||
i != _list.constEnd(); i++) {
|
||||
width += fm.width(i->key() + ": ");
|
||||
width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
|
||||
? 0 : PADDING);
|
||||
}
|
||||
|
||||
_boundingRect = QRectF(0, 0, width, _list.isEmpty() ? 0 : fm.height());
|
||||
@ -34,22 +35,19 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
{
|
||||
Q_UNUSED(option);
|
||||
Q_UNUSED(widget);
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
painter->setFont(font);
|
||||
QFontMetrics fm(font);
|
||||
QList<KV>::const_iterator i;
|
||||
QFontMetrics fm(_font);
|
||||
int width = 0;
|
||||
|
||||
|
||||
painter->setFont(_font);
|
||||
painter->setRenderHint(QPainter::Antialiasing, false);
|
||||
|
||||
for (i = _list.constBegin(); i != _list.constEnd(); i++) {
|
||||
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.constEnd() - 1) ? 0 : PADDING);
|
||||
for (QList<KV>::const_iterator i = _list.constBegin();
|
||||
i != _list.constEnd(); i++) {
|
||||
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.constEnd() - 1)
|
||||
? 0 : PADDING);
|
||||
if (i != _list.constEnd() - 1) {
|
||||
painter->save();
|
||||
painter->setPen(Qt::gray);
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#include <QGraphicsItem>
|
||||
#include <QList>
|
||||
#include "kv.h"
|
||||
|
||||
class InfoItem : public QGraphicsItem
|
||||
{
|
||||
@ -13,6 +14,8 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
QWidget *widget);
|
||||
|
||||
const QList<KV> &info() const {return _list;}
|
||||
|
||||
void insert(const QString &key, const QString &value);
|
||||
void clear();
|
||||
bool isEmpty() {return _list.isEmpty();}
|
||||
@ -20,19 +23,9 @@ public:
|
||||
private:
|
||||
void updateBoundingRect();
|
||||
|
||||
class KV {
|
||||
public:
|
||||
QString key;
|
||||
QString value;
|
||||
|
||||
KV(const QString &k, const QString &v)
|
||||
{key = k; value = v;}
|
||||
bool operator==(const KV &other) const
|
||||
{return this->key == other.key;}
|
||||
};
|
||||
|
||||
QList<KV> _list;
|
||||
QRectF _boundingRect;
|
||||
QFont _font;
|
||||
};
|
||||
|
||||
#endif // INFOITEM_H
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
#define NEXT_MAP_SHORTCUT QKeySequence(QKeySequence::Forward)
|
||||
#define PREV_MAP_SHORTCUT QKeySequence(QKeySequence::Back)
|
||||
#define SHOW_GRAPHS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_G)
|
||||
#define STATISTICS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_S)
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#define FULLSCREEN_SHORTCUT QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F)
|
||||
|
||||
21
src/GUI/kv.h
Normal file
21
src/GUI/kv.h
Normal file
@ -0,0 +1,21 @@
|
||||
#ifndef KV_H
|
||||
#define KV_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
class KV {
|
||||
public:
|
||||
KV(const QString &key, const QString &value) : _key(key), _value(value) {}
|
||||
|
||||
const QString &key() const {return _key;}
|
||||
const QString &value() const {return _value;}
|
||||
|
||||
bool operator==(const KV &other) const
|
||||
{return this->key() == other.key();}
|
||||
|
||||
private:
|
||||
QString _key;
|
||||
QString _value;
|
||||
};
|
||||
|
||||
#endif // KV_H
|
||||
@ -75,7 +75,6 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
|
||||
_plot = false;
|
||||
_digitalZoom = 0;
|
||||
|
||||
_map->setBackgroundColor(_backgroundColor);
|
||||
_res = _map->resolution(_map->bounds());
|
||||
_scene->setSceneRect(_map->bounds());
|
||||
|
||||
@ -267,7 +266,6 @@ void MapView::setMap(Map *map)
|
||||
|
||||
_map = map;
|
||||
_map->load();
|
||||
_map->setBackgroundColor(_backgroundColor);
|
||||
connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
|
||||
|
||||
digitalZoom(0);
|
||||
@ -746,7 +744,6 @@ void MapView::setMapOpacity(int opacity)
|
||||
void MapView::setBackgroundColor(const QColor &color)
|
||||
{
|
||||
_backgroundColor = color;
|
||||
_map->setBackgroundColor(color);
|
||||
resetCachedContent();
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#include <QtGlobal>
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
|
||||
#include <QGLWidget>
|
||||
#include <QGLFormat>
|
||||
#else
|
||||
@ -7,13 +7,13 @@
|
||||
#include <QSurfaceFormat>
|
||||
#endif
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
|
||||
#define OPENGL_WIDGET QGLWidget
|
||||
#else
|
||||
#define OPENGL_WIDGET QOpenGLWidget
|
||||
#endif
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
|
||||
#define OPENGL_SET_SAMPLES(samples) \
|
||||
{QGLFormat fmt; \
|
||||
fmt.setSamples(samples); \
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
#include <QRadioButton>
|
||||
#include <QLabel>
|
||||
#include <QSysInfo>
|
||||
#include "config.h"
|
||||
#include "icons.h"
|
||||
#include "colorbox.h"
|
||||
#include "stylecombobox.h"
|
||||
@ -311,9 +310,25 @@ QWidget *OptionsDialog::createDataPage()
|
||||
pauseTab->setLayout(pauseLayout);
|
||||
|
||||
|
||||
_computed = new QRadioButton(tr("Computed from distance/time"));
|
||||
_reported = new QRadioButton(tr("Recorded by device"));
|
||||
if (_options->useReportedSpeed)
|
||||
_reported->setChecked(true);
|
||||
else
|
||||
_computed->setChecked(true);
|
||||
|
||||
QFormLayout *sourceLayout = new QFormLayout();
|
||||
sourceLayout->addWidget(_computed);
|
||||
sourceLayout->addWidget(_reported);
|
||||
|
||||
QWidget *sourceTab = new QWidget();
|
||||
sourceTab->setLayout(sourceLayout);
|
||||
|
||||
|
||||
QTabWidget *filterPage = new QTabWidget();
|
||||
filterPage->addTab(filterTab, tr("Filtering"));
|
||||
filterPage->addTab(pauseTab, tr("Pause detection"));
|
||||
filterPage->addTab(sourceTab, tr("Speed"));
|
||||
|
||||
return filterPage;
|
||||
}
|
||||
@ -424,6 +439,10 @@ QWidget *OptionsDialog::createSystemPage()
|
||||
{
|
||||
_useOpenGL = new QCheckBox(tr("Use OpenGL"));
|
||||
_useOpenGL->setChecked(_options->useOpenGL);
|
||||
#ifdef ENABLE_HTTP2
|
||||
_enableHTTP2 = new QCheckBox(tr("Enable HTTP/2"));
|
||||
_enableHTTP2->setChecked(_options->enableHTTP2);
|
||||
#endif // ENABLE_HTTP2
|
||||
|
||||
_pixmapCache = new QSpinBox();
|
||||
_pixmapCache->setMinimum(16);
|
||||
@ -442,6 +461,9 @@ QWidget *OptionsDialog::createSystemPage()
|
||||
formLayout->addRow(tr("Connection timeout:"), _connectionTimeout);
|
||||
|
||||
QFormLayout *checkboxLayout = new QFormLayout();
|
||||
#ifdef ENABLE_HTTP2
|
||||
checkboxLayout->addWidget(_enableHTTP2);
|
||||
#endif // ENABLE_HTTP2
|
||||
checkboxLayout->addWidget(_useOpenGL);
|
||||
|
||||
QWidget *systemTab = new QWidget();
|
||||
@ -543,6 +565,7 @@ void OptionsDialog::accept()
|
||||
if (qAbs(pauseSpeed - _options->pauseSpeed) > 0.01)
|
||||
_options->pauseSpeed = pauseSpeed;
|
||||
_options->pauseInterval = _pauseInterval->value();
|
||||
_options->useReportedSpeed = _reported->isChecked();
|
||||
|
||||
qreal poiRadius = (_options->units == Imperial)
|
||||
? _poiRadius->value() * MIINM : (_options->units == Nautical)
|
||||
@ -551,6 +574,9 @@ void OptionsDialog::accept()
|
||||
_options->poiRadius = poiRadius;
|
||||
|
||||
_options->useOpenGL = _useOpenGL->isChecked();
|
||||
#ifdef ENABLE_HTTP2
|
||||
_options->enableHTTP2 = _enableHTTP2->isChecked();
|
||||
#endif // ENABLE_HTTP2
|
||||
_options->pixmapCache = _pixmapCache->value();
|
||||
_options->connectionTimeout = _connectionTimeout->value();
|
||||
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
#include <QDialog>
|
||||
#include "palette.h"
|
||||
#include "units.h"
|
||||
#include "config.h"
|
||||
|
||||
|
||||
class ColorBox;
|
||||
class StyleComboBox;
|
||||
@ -43,10 +45,14 @@ struct Options {
|
||||
bool outlierEliminate;
|
||||
qreal pauseSpeed;
|
||||
int pauseInterval;
|
||||
bool useReportedSpeed;
|
||||
// POI
|
||||
int poiRadius;
|
||||
// System
|
||||
bool useOpenGL;
|
||||
#ifdef ENABLE_HTTP2
|
||||
bool enableHTTP2;
|
||||
#endif // ENABLE_HTTP2
|
||||
int pixmapCache;
|
||||
int connectionTimeout;
|
||||
// Print/Export
|
||||
@ -110,12 +116,17 @@ private:
|
||||
QCheckBox *_outlierEliminate;
|
||||
QDoubleSpinBox *_pauseSpeed;
|
||||
QSpinBox *_pauseInterval;
|
||||
QRadioButton *_computed;
|
||||
QRadioButton *_reported;
|
||||
// POI
|
||||
QDoubleSpinBox *_poiRadius;
|
||||
// System
|
||||
QSpinBox *_pixmapCache;
|
||||
QSpinBox *_connectionTimeout;
|
||||
QCheckBox *_useOpenGL;
|
||||
#ifdef ENABLE_HTTP2
|
||||
QCheckBox *_enableHTTP2;
|
||||
#endif // ENABLE_HTTP2
|
||||
// Print/Export
|
||||
QRadioButton *_wysiwyg;
|
||||
QRadioButton *_hires;
|
||||
|
||||
@ -175,10 +175,10 @@ void PathItem::setMarkerColor(const QColor &color)
|
||||
void PathItem::hover(bool hover)
|
||||
{
|
||||
if (hover) {
|
||||
_pen.setWidth(_width + 1);
|
||||
_pen.setWidth((_width + 1) * pow(2, -_digitalZoom));
|
||||
setZValue(zValue() + 1.0);
|
||||
} else {
|
||||
_pen.setWidth(_width);
|
||||
_pen.setWidth(_width * pow(2, -_digitalZoom));
|
||||
setZValue(zValue() - 1.0);
|
||||
}
|
||||
|
||||
|
||||
@ -18,52 +18,34 @@ ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
|
||||
_res = 1.0;
|
||||
_digitalZoom = 0;
|
||||
|
||||
_font.setPixelSize(FONT_SIZE);
|
||||
_font.setFamily(FONT_FAMILY);
|
||||
|
||||
#ifndef Q_OS_MAC
|
||||
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
|
||||
#endif // Q_OS_MAC
|
||||
}
|
||||
|
||||
void ScaleItem::updateBoundingRect()
|
||||
{
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QRect ss, es, us;
|
||||
|
||||
ss = fm.tightBoundingRect(QString::number(0));
|
||||
es = fm.tightBoundingRect(QString::number(_length * SEGMENTS));
|
||||
us = fm.tightBoundingRect(units());
|
||||
|
||||
_boundingRect = QRectF(-ss.width()/2, 0, _width * SEGMENTS + ss.width()/2
|
||||
+ qMax(us.width() + PADDING, es.width()/2) + 1, SCALE_HEIGHT + PADDING
|
||||
+ ss.height() + 2*fm.descent());
|
||||
}
|
||||
|
||||
void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
QWidget *widget)
|
||||
{
|
||||
Q_UNUSED(option);
|
||||
Q_UNUSED(widget);
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QFontMetrics fm(_font);
|
||||
QRect br;
|
||||
QPen pen = QPen(Qt::black, BORDER_WIDTH);
|
||||
|
||||
|
||||
painter->setRenderHint(QPainter::Antialiasing, false);
|
||||
painter->setFont(font);
|
||||
painter->setPen(pen);
|
||||
painter->setFont(_font);
|
||||
painter->setPen(QPen(Qt::black, BORDER_WIDTH));
|
||||
|
||||
for (int i = 0; i <= SEGMENTS; i++) {
|
||||
QString label = QString::number(_length * i);
|
||||
br = fm.tightBoundingRect(label);
|
||||
painter->drawText(_width * i - br.width()/2, br.height() + 1, label);
|
||||
for (int i = 0; i < _ticks.size(); i++) {
|
||||
br = _ticks.at(i).boundingBox;
|
||||
painter->drawText(_width * i - br.width()/2, br.height() + 1,
|
||||
QString::number(_ticks.at(i).value));
|
||||
}
|
||||
painter->drawText(_width * SEGMENTS + PADDING, SCALE_HEIGHT + PADDING
|
||||
+ br.height() + fm.descent(), units());
|
||||
+ br.height() + fm.descent(), _unitsStr);
|
||||
|
||||
painter->drawRect(QRectF(0, br.height() + PADDING, SEGMENTS * _width,
|
||||
SCALE_HEIGHT));
|
||||
@ -77,19 +59,6 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
*/
|
||||
}
|
||||
|
||||
QString ScaleItem::units() const
|
||||
{
|
||||
if (_units == Imperial)
|
||||
return _scale ? qApp->translate("ScaleItem", "mi")
|
||||
: qApp->translate("ScaleItem", "ft");
|
||||
else if (_units == Nautical)
|
||||
return _scale ? qApp->translate("ScaleItem", "nmi")
|
||||
: qApp->translate("ScaleItem", "ft");
|
||||
else
|
||||
return _scale ? qApp->translate("ScaleItem", "km")
|
||||
: qApp->translate("ScaleItem", "m");
|
||||
}
|
||||
|
||||
void ScaleItem::computeScale()
|
||||
{
|
||||
qreal res = _res * pow(2, -_digitalZoom);
|
||||
@ -127,21 +96,50 @@ void ScaleItem::computeScale()
|
||||
}
|
||||
}
|
||||
|
||||
void ScaleItem::updateCache()
|
||||
{
|
||||
QFontMetrics fm(_font);
|
||||
|
||||
_ticks = QVector<Tick>(SEGMENTS + 1);
|
||||
for (int i = 0; i < _ticks.size(); i++) {
|
||||
Tick &t = _ticks[i];
|
||||
t.value = _length * i;
|
||||
t.boundingBox = fm.tightBoundingRect(QString::number(t.value));
|
||||
}
|
||||
|
||||
if (_units == Imperial)
|
||||
_unitsStr = _scale ? qApp->translate("ScaleItem", "mi")
|
||||
: qApp->translate("ScaleItem", "ft");
|
||||
else if (_units == Nautical)
|
||||
_unitsStr = _scale ? qApp->translate("ScaleItem", "nmi")
|
||||
: qApp->translate("ScaleItem", "ft");
|
||||
else
|
||||
_unitsStr = _scale ? qApp->translate("ScaleItem", "km")
|
||||
: qApp->translate("ScaleItem", "m");
|
||||
_unitsBB = fm.tightBoundingRect(_unitsStr);
|
||||
|
||||
QRect ss = _ticks.isEmpty() ? QRect() : _ticks.first().boundingBox;
|
||||
QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
|
||||
_boundingRect = QRectF(-ss.width()/2, 0, _width * SEGMENTS + ss.width()/2
|
||||
+ qMax(_unitsBB.width() + PADDING, es.width()/2) + 1, SCALE_HEIGHT
|
||||
+ PADDING + ss.height() + 2*fm.descent());
|
||||
}
|
||||
|
||||
void ScaleItem::setResolution(qreal res)
|
||||
{
|
||||
prepareGeometryChange();
|
||||
_res = res;
|
||||
computeScale();
|
||||
updateBoundingRect();
|
||||
updateCache();
|
||||
update();
|
||||
}
|
||||
|
||||
void ScaleItem::setUnits(enum Units units)
|
||||
void ScaleItem::setUnits(Units units)
|
||||
{
|
||||
prepareGeometryChange();
|
||||
_units = units;
|
||||
computeScale();
|
||||
updateBoundingRect();
|
||||
updateCache();
|
||||
update();
|
||||
}
|
||||
|
||||
@ -150,7 +148,7 @@ void ScaleItem::setDigitalZoom(qreal zoom)
|
||||
prepareGeometryChange();
|
||||
_digitalZoom = zoom;
|
||||
computeScale();
|
||||
updateBoundingRect();
|
||||
updateCache();
|
||||
update();
|
||||
|
||||
setScale(pow(2, -_digitalZoom));
|
||||
|
||||
@ -14,23 +14,29 @@ public:
|
||||
QWidget *widget);
|
||||
|
||||
void setResolution(qreal res);
|
||||
void setUnits(enum Units units);
|
||||
void setUnits(Units units);
|
||||
void setDigitalZoom(qreal zoom);
|
||||
|
||||
private:
|
||||
void updateBoundingRect();
|
||||
struct Tick {
|
||||
double value;
|
||||
QRect boundingBox;
|
||||
};
|
||||
|
||||
void computeScale();
|
||||
QString units() const;
|
||||
void updateCache();
|
||||
|
||||
qreal _res;
|
||||
qreal _width;
|
||||
qreal _length;
|
||||
Units _units;
|
||||
bool _scale;
|
||||
|
||||
qreal _digitalZoom;
|
||||
|
||||
QRectF _boundingRect;
|
||||
QFont _font;
|
||||
QVector<Tick> _ticks;
|
||||
QRect _unitsBB;
|
||||
QString _unitsStr;
|
||||
};
|
||||
|
||||
#endif // SCALEITEM_H
|
||||
|
||||
@ -124,10 +124,14 @@
|
||||
#define PAUSE_SPEED_DEFAULT 0.5 /* m/s */
|
||||
#define PAUSE_INTERVAL_SETTING "pauseInterval"
|
||||
#define PAUSE_INTERVAL_DEFAULT 10 /* s */
|
||||
#define USE_REPORTED_SPEED_SETTING "useReportedSpeed"
|
||||
#define USE_REPORTED_SPEED_DEFAULT false
|
||||
#define POI_RADIUS_SETTING "poiRadius"
|
||||
#define POI_RADIUS_DEFAULT (int)(IMPERIAL_UNITS() ? MIINM : KMINM)
|
||||
#define USE_OPENGL_SETTING "useOpenGL"
|
||||
#define USE_OPENGL_DEFAULT false
|
||||
#define ENABLE_HTTP2_SETTING "enableHTTP2"
|
||||
#define ENABLE_HTTP2_DEFAULT true
|
||||
#define PIXMAP_CACHE_SETTING "pixmapCache"
|
||||
#define PIXMAP_CACHE_DEFAULT 64 /* MB */
|
||||
#define CONNECTION_TIMEOUT_SETTING "connectionTimeout"
|
||||
|
||||
@ -9,14 +9,14 @@ SliderInfoItem::SliderInfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)
|
||||
{
|
||||
_side = Right;
|
||||
_color = Qt::red;
|
||||
|
||||
_font.setPixelSize(FONT_SIZE);
|
||||
_font.setFamily(FONT_FAMILY);
|
||||
}
|
||||
|
||||
void SliderInfoItem::updateBoundingRect()
|
||||
{
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QFontMetrics fm(_font);
|
||||
|
||||
qreal width = qMax(fm.width(_x), fm.width(_y));
|
||||
qreal height = 2 * fm.height() - 2*fm.descent();
|
||||
@ -31,10 +31,7 @@ void SliderInfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
|
||||
{
|
||||
Q_UNUSED(option);
|
||||
Q_UNUSED(widget);
|
||||
QFont font;
|
||||
font.setPixelSize(FONT_SIZE);
|
||||
font.setFamily(FONT_FAMILY);
|
||||
QFontMetrics fm(font);
|
||||
QFontMetrics fm(_font);
|
||||
QRectF rx, ry;
|
||||
|
||||
|
||||
@ -57,7 +54,7 @@ void SliderInfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
|
||||
painter->drawRect(rx);
|
||||
painter->setBrush(Qt::NoBrush);
|
||||
|
||||
painter->setFont(font);
|
||||
painter->setFont(_font);
|
||||
painter->setRenderHint(QPainter::Antialiasing, false);
|
||||
painter->setPen(_color);
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@ private:
|
||||
QString _x, _y;
|
||||
QRectF _boundingRect;
|
||||
QColor _color;
|
||||
QFont _font;
|
||||
};
|
||||
|
||||
#endif // SLIDERINFOITEM_H
|
||||
|
||||
@ -36,11 +36,13 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,
|
||||
{
|
||||
_waypoint = waypoint;
|
||||
_showLabel = true;
|
||||
_hover = false;
|
||||
_size = 8;
|
||||
_color = Qt::black;
|
||||
|
||||
updateShape();
|
||||
_font.setPixelSize(FS(_size));
|
||||
_font.setFamily(FONT_FAMILY);
|
||||
|
||||
updateCache();
|
||||
|
||||
setPos(map->ll2xy(waypoint.coordinates()));
|
||||
setToolTip(toolTip(Metric, DecimalDegrees));
|
||||
@ -48,23 +50,18 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,
|
||||
setAcceptHoverEvents(true);
|
||||
}
|
||||
|
||||
void WaypointItem::updateShape()
|
||||
void WaypointItem::updateCache()
|
||||
{
|
||||
QPainterPath p;
|
||||
qreal pointSize = _hover ? HS(_size) : _size;
|
||||
qreal pointSize = _font.bold() ? HS(_size) : _size;
|
||||
|
||||
if (_showLabel) {
|
||||
QFont font;
|
||||
font.setPixelSize(FS(_size));
|
||||
font.setFamily(FONT_FAMILY);
|
||||
if (_hover)
|
||||
font.setBold(true);
|
||||
QFontMetrics fm(font);
|
||||
QRect ts = fm.tightBoundingRect(_waypoint.name());
|
||||
QFontMetrics fm(_font);
|
||||
_labelBB = fm.tightBoundingRect(_waypoint.name());
|
||||
|
||||
p.addRect(-pointSize/2, -pointSize/2, pointSize, pointSize);
|
||||
p.addRect(pointSize/2, pointSize/2,
|
||||
ts.width(), ts.height() + fm.descent());
|
||||
p.addRect(pointSize/2, pointSize/2, _labelBB.width(), _labelBB.height()
|
||||
+ fm.descent());
|
||||
} else
|
||||
p.addRect(-pointSize/2, -pointSize/2, pointSize, pointSize);
|
||||
|
||||
@ -76,23 +73,14 @@ void WaypointItem::paint(QPainter *painter,
|
||||
{
|
||||
Q_UNUSED(option);
|
||||
Q_UNUSED(widget);
|
||||
|
||||
qreal pointSize = _hover ? HS(_size) : _size;
|
||||
qreal pointSize = _font.bold() ? HS(_size) : _size;
|
||||
|
||||
painter->setPen(_color);
|
||||
|
||||
if (_showLabel) {
|
||||
QFont font;
|
||||
font.setPixelSize(FS(_size));
|
||||
font.setFamily(FONT_FAMILY);
|
||||
if (_hover)
|
||||
font.setBold(true);
|
||||
QFontMetrics fm(font);
|
||||
QRect ts = fm.tightBoundingRect(_waypoint.name());
|
||||
|
||||
painter->setFont(font);
|
||||
painter->drawText(pointSize/2 - qMax(ts.x(), 0), pointSize/2
|
||||
+ ts.height(), _waypoint.name());
|
||||
painter->setFont(_font);
|
||||
painter->drawText(pointSize/2 - qMax(_labelBB.x(), 0), pointSize/2
|
||||
+ _labelBB.height(), _waypoint.name());
|
||||
}
|
||||
|
||||
painter->setBrush(QBrush(_color, Qt::SolidPattern));
|
||||
@ -112,7 +100,8 @@ void WaypointItem::setSize(int size)
|
||||
|
||||
prepareGeometryChange();
|
||||
_size = size;
|
||||
updateShape();
|
||||
_font.setPixelSize(FS(_size));
|
||||
updateCache();
|
||||
}
|
||||
|
||||
void WaypointItem::setColor(const QColor &color)
|
||||
@ -136,7 +125,7 @@ void WaypointItem::showLabel(bool show)
|
||||
|
||||
prepareGeometryChange();
|
||||
_showLabel = show;
|
||||
updateShape();
|
||||
updateCache();
|
||||
}
|
||||
|
||||
void WaypointItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
|
||||
@ -144,8 +133,8 @@ void WaypointItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
|
||||
Q_UNUSED(event);
|
||||
|
||||
prepareGeometryChange();
|
||||
_hover = true;
|
||||
updateShape();
|
||||
_font.setBold(true);
|
||||
updateCache();
|
||||
setZValue(zValue() + 1.0);
|
||||
}
|
||||
|
||||
@ -154,7 +143,7 @@ void WaypointItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
|
||||
Q_UNUSED(event);
|
||||
|
||||
prepareGeometryChange();
|
||||
_hover = false;
|
||||
updateShape();
|
||||
_font.setBold(false);
|
||||
updateCache();
|
||||
setZValue(zValue() - 1.0);
|
||||
}
|
||||
|
||||
@ -31,16 +31,16 @@ private:
|
||||
void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
|
||||
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
|
||||
|
||||
void updateShape();
|
||||
void updateCache();
|
||||
QString toolTip(Units units, CoordinatesFormat format);
|
||||
|
||||
QPainterPath _shape;
|
||||
Waypoint _waypoint;
|
||||
|
||||
QPainterPath _shape;
|
||||
QColor _color;
|
||||
int _size;
|
||||
bool _hover;
|
||||
bool _showLabel;
|
||||
QFont _font;
|
||||
QRect _labelBB;
|
||||
};
|
||||
|
||||
#endif // WAYPOINTITEM_H
|
||||
|
||||
@ -4,9 +4,6 @@
|
||||
#include <cmath>
|
||||
#include <QDebug>
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif // M_PI
|
||||
#define deg2rad(d) (((d)*M_PI)/180.0)
|
||||
#define rad2deg(d) (((d)*180.0)/M_PI)
|
||||
|
||||
|
||||
@ -20,10 +20,10 @@ RectC::RectC(const Coordinates ¢er, double radius)
|
||||
double deltaLon = asin(sin(radDist) / cos(radlat));
|
||||
minLon = radLon - deltaLon;
|
||||
if (minLon < MIN_LON)
|
||||
minLon += 2.0 * M_PI;
|
||||
minLon += M_2_PI;
|
||||
maxLon = radLon + deltaLon;
|
||||
if (maxLon > MAX_LON)
|
||||
maxLon -= 2.0 * M_PI;
|
||||
maxLon -= M_2_PI;
|
||||
} else {
|
||||
// a pole is within the distance
|
||||
minLat = qMax(minLat, MIN_LAT);
|
||||
|
||||
@ -3,15 +3,9 @@
|
||||
|
||||
#include <cstdio>
|
||||
#include <cmath>
|
||||
#include <cassert>
|
||||
#include <cstdlib>
|
||||
#include <QtGlobal>
|
||||
|
||||
#define ASSERT assert // RTree uses ASSERT( condition )
|
||||
|
||||
#define Max(a,b) \
|
||||
(((a) > (b)) ? (a) : (b))
|
||||
#define Min(a,b) \
|
||||
(((a) < (b)) ? (a) : (b))
|
||||
|
||||
#define RTREE_TEMPLATE template<class DATATYPE, class ELEMTYPE, int NUMDIMS, \
|
||||
class ELEMTYPEREAL, int TMAXNODES, int TMINNODES>
|
||||
@ -129,7 +123,7 @@ public:
|
||||
/// Access the current data element.
|
||||
DATATYPE& operator*()
|
||||
{
|
||||
ASSERT(IsNotNull());
|
||||
Q_ASSERT(IsNotNull());
|
||||
StackElement& curTos = m_stack[m_tos - 1];
|
||||
return curTos.m_node->m_branch[curTos.m_branchIndex].m_data;
|
||||
}
|
||||
@ -137,7 +131,7 @@ public:
|
||||
/// Access the current data element.
|
||||
const DATATYPE& operator*() const
|
||||
{
|
||||
ASSERT(IsNotNull());
|
||||
Q_ASSERT(IsNotNull());
|
||||
StackElement& curTos = m_stack[m_tos - 1];
|
||||
return curTos.m_node->m_branch[curTos.m_branchIndex].m_data;
|
||||
}
|
||||
@ -148,7 +142,7 @@ public:
|
||||
/// Get the bounds for this node
|
||||
void GetBounds(ELEMTYPE a_min[NUMDIMS], ELEMTYPE a_max[NUMDIMS])
|
||||
{
|
||||
ASSERT(IsNotNull());
|
||||
Q_ASSERT(IsNotNull());
|
||||
StackElement& curTos = m_stack[m_tos - 1];
|
||||
Branch& curBranch = curTos.m_node->m_branch[curTos.m_branchIndex];
|
||||
|
||||
@ -206,13 +200,13 @@ public:
|
||||
m_stack[m_tos].m_node = a_node;
|
||||
m_stack[m_tos].m_branchIndex = a_branchIndex;
|
||||
++m_tos;
|
||||
ASSERT(m_tos <= MAX_STACK);
|
||||
Q_ASSERT(m_tos <= MAX_STACK);
|
||||
}
|
||||
|
||||
// Pop element off iteration stack
|
||||
StackElement& Pop()
|
||||
{
|
||||
ASSERT(m_tos > 0);
|
||||
Q_ASSERT(m_tos > 0);
|
||||
--m_tos;
|
||||
return m_stack[m_tos];
|
||||
}
|
||||
@ -356,12 +350,12 @@ protected:
|
||||
RTREE_TEMPLATE
|
||||
RTREE_QUAL::RTree()
|
||||
{
|
||||
ASSERT(MAXNODES > MINNODES);
|
||||
ASSERT(MINNODES > 0);
|
||||
Q_ASSERT(MAXNODES > MINNODES);
|
||||
Q_ASSERT(MINNODES > 0);
|
||||
|
||||
// We only support machine word size simple data type eg. integer index or
|
||||
// object pointer. Since we are storing as union with non data branch
|
||||
ASSERT(sizeof(DATATYPE) == sizeof(void*) || sizeof(DATATYPE) == sizeof(int));
|
||||
Q_ASSERT(sizeof(DATATYPE) == sizeof(void*) || sizeof(DATATYPE) == sizeof(int));
|
||||
|
||||
// Precomputed volumes of the unit spheres for the first few dimensions
|
||||
const float UNIT_SPHERE_VOLUMES[] = {
|
||||
@ -393,7 +387,7 @@ void RTREE_QUAL::Insert(const ELEMTYPE a_min[NUMDIMS],
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
for (int index=0; index<NUMDIMS; ++index)
|
||||
ASSERT(a_min[index] <= a_max[index]);
|
||||
Q_ASSERT(a_min[index] <= a_max[index]);
|
||||
#endif //_DEBUG
|
||||
|
||||
Rect rect;
|
||||
@ -413,7 +407,7 @@ void RTREE_QUAL::Remove(const ELEMTYPE a_min[NUMDIMS],
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
for (int index=0; index<NUMDIMS; ++index)
|
||||
ASSERT(a_min[index] <= a_max[index]);
|
||||
Q_ASSERT(a_min[index] <= a_max[index]);
|
||||
#endif //_DEBUG
|
||||
|
||||
Rect rect;
|
||||
@ -433,7 +427,7 @@ int RTREE_QUAL::Search(const ELEMTYPE a_min[NUMDIMS], const ELEMTYPE a_max[NUMDI
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
for (int index=0; index<NUMDIMS; ++index)
|
||||
ASSERT(a_min[index] <= a_max[index]);
|
||||
Q_ASSERT(a_min[index] <= a_max[index]);
|
||||
#endif //_DEBUG
|
||||
|
||||
Rect rect;
|
||||
@ -502,8 +496,8 @@ void RTREE_QUAL::Reset()
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::RemoveAllRec(Node* a_node)
|
||||
{
|
||||
ASSERT(a_node);
|
||||
ASSERT(a_node->m_level >= 0);
|
||||
Q_ASSERT(a_node);
|
||||
Q_ASSERT(a_node->m_level >= 0);
|
||||
|
||||
if (a_node->IsInternalNode()) { // This is an internal node in the tree
|
||||
for (int index=0; index < a_node->m_count; ++index)
|
||||
@ -530,7 +524,7 @@ typename RTREE_QUAL::Node* RTREE_QUAL::AllocNode()
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::FreeNode(Node* a_node)
|
||||
{
|
||||
ASSERT(a_node);
|
||||
Q_ASSERT(a_node);
|
||||
|
||||
#ifdef RTREE_DONT_USE_MEMPOOLS
|
||||
delete a_node;
|
||||
@ -593,8 +587,8 @@ RTREE_TEMPLATE
|
||||
bool RTREE_QUAL::InsertRectRec(Rect* a_rect, const DATATYPE& a_id, Node* a_node,
|
||||
Node** a_newNode, int a_level)
|
||||
{
|
||||
ASSERT(a_rect && a_node && a_newNode);
|
||||
ASSERT(a_level >= 0 && a_level <= a_node->m_level);
|
||||
Q_ASSERT(a_rect && a_node && a_newNode);
|
||||
Q_ASSERT(a_level >= 0 && a_level <= a_node->m_level);
|
||||
|
||||
int index;
|
||||
Branch branch;
|
||||
@ -621,7 +615,7 @@ bool RTREE_QUAL::InsertRectRec(Rect* a_rect, const DATATYPE& a_id, Node* a_node,
|
||||
return AddBranch(&branch, a_node, a_newNode);
|
||||
} else {
|
||||
// Should never occur
|
||||
ASSERT(0);
|
||||
Q_ASSERT(0);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -638,11 +632,11 @@ RTREE_TEMPLATE
|
||||
bool RTREE_QUAL::InsertRect(Rect* a_rect, const DATATYPE& a_id, Node** a_root,
|
||||
int a_level)
|
||||
{
|
||||
ASSERT(a_rect && a_root);
|
||||
ASSERT(a_level >= 0 && a_level <= (*a_root)->m_level);
|
||||
Q_ASSERT(a_rect && a_root);
|
||||
Q_ASSERT(a_level >= 0 && a_level <= (*a_root)->m_level);
|
||||
#ifdef _DEBUG
|
||||
for (int index=0; index < NUMDIMS; ++index)
|
||||
ASSERT(a_rect->m_min[index] <= a_rect->m_max[index]);
|
||||
Q_ASSERT(a_rect->m_min[index] <= a_rect->m_max[index]);
|
||||
#endif //_DEBUG
|
||||
|
||||
Node* newRoot;
|
||||
@ -672,7 +666,7 @@ bool RTREE_QUAL::InsertRect(Rect* a_rect, const DATATYPE& a_id, Node** a_root,
|
||||
RTREE_TEMPLATE
|
||||
typename RTREE_QUAL::Rect RTREE_QUAL::NodeCover(Node* a_node)
|
||||
{
|
||||
ASSERT(a_node);
|
||||
Q_ASSERT(a_node);
|
||||
|
||||
int firstTime = true;
|
||||
Rect rect;
|
||||
@ -698,8 +692,8 @@ typename RTREE_QUAL::Rect RTREE_QUAL::NodeCover(Node* a_node)
|
||||
RTREE_TEMPLATE
|
||||
bool RTREE_QUAL::AddBranch(Branch* a_branch, Node* a_node, Node** a_newNode)
|
||||
{
|
||||
ASSERT(a_branch);
|
||||
ASSERT(a_node);
|
||||
Q_ASSERT(a_branch);
|
||||
Q_ASSERT(a_node);
|
||||
|
||||
if (a_node->m_count < MAXNODES) { // Split won't be necessary
|
||||
a_node->m_branch[a_node->m_count] = *a_branch;
|
||||
@ -707,7 +701,7 @@ bool RTREE_QUAL::AddBranch(Branch* a_branch, Node* a_node, Node** a_newNode)
|
||||
|
||||
return false;
|
||||
} else {
|
||||
ASSERT(a_newNode);
|
||||
Q_ASSERT(a_newNode);
|
||||
|
||||
SplitNode(a_node, a_branch, a_newNode);
|
||||
return true;
|
||||
@ -721,8 +715,8 @@ bool RTREE_QUAL::AddBranch(Branch* a_branch, Node* a_node, Node** a_newNode)
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::DisconnectBranch(Node* a_node, int a_index)
|
||||
{
|
||||
ASSERT(a_node && (a_index >= 0) && (a_index < MAXNODES));
|
||||
ASSERT(a_node->m_count > 0);
|
||||
Q_ASSERT(a_node && (a_index >= 0) && (a_index < MAXNODES));
|
||||
Q_ASSERT(a_node->m_count > 0);
|
||||
|
||||
// Remove element by swapping with the last element to prevent gaps in array
|
||||
a_node->m_branch[a_index] = a_node->m_branch[a_node->m_count - 1];
|
||||
@ -739,7 +733,7 @@ void RTREE_QUAL::DisconnectBranch(Node* a_node, int a_index)
|
||||
RTREE_TEMPLATE
|
||||
int RTREE_QUAL::PickBranch(Rect* a_rect, Node* a_node)
|
||||
{
|
||||
ASSERT(a_rect && a_node);
|
||||
Q_ASSERT(a_rect && a_node);
|
||||
|
||||
bool firstTime = true;
|
||||
ELEMTYPEREAL increase;
|
||||
@ -774,13 +768,13 @@ int RTREE_QUAL::PickBranch(Rect* a_rect, Node* a_node)
|
||||
RTREE_TEMPLATE
|
||||
typename RTREE_QUAL::Rect RTREE_QUAL::CombineRect(Rect* a_rectA, Rect* a_rectB)
|
||||
{
|
||||
ASSERT(a_rectA && a_rectB);
|
||||
Q_ASSERT(a_rectA && a_rectB);
|
||||
|
||||
Rect newRect;
|
||||
|
||||
for (int index = 0; index < NUMDIMS; ++index) {
|
||||
newRect.m_min[index] = Min(a_rectA->m_min[index], a_rectB->m_min[index]);
|
||||
newRect.m_max[index] = Max(a_rectA->m_max[index], a_rectB->m_max[index]);
|
||||
newRect.m_min[index] = qMin(a_rectA->m_min[index], a_rectB->m_min[index]);
|
||||
newRect.m_max[index] = qMax(a_rectA->m_max[index], a_rectB->m_max[index]);
|
||||
}
|
||||
|
||||
return newRect;
|
||||
@ -795,8 +789,8 @@ typename RTREE_QUAL::Rect RTREE_QUAL::CombineRect(Rect* a_rectA, Rect* a_rectB)
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::SplitNode(Node* a_node, Branch* a_branch, Node** a_newNode)
|
||||
{
|
||||
ASSERT(a_node);
|
||||
ASSERT(a_branch);
|
||||
Q_ASSERT(a_node);
|
||||
Q_ASSERT(a_branch);
|
||||
|
||||
// Could just use local here, but member or external is faster since it is
|
||||
// reused
|
||||
@ -816,7 +810,7 @@ void RTREE_QUAL::SplitNode(Node* a_node, Branch* a_branch, Node** a_newNode)
|
||||
(*a_newNode)->m_level = a_node->m_level = level;
|
||||
LoadNodes(a_node, *a_newNode, parVars);
|
||||
|
||||
ASSERT((a_node->m_count + (*a_newNode)->m_count) == parVars->m_total);
|
||||
Q_ASSERT((a_node->m_count + (*a_newNode)->m_count) == parVars->m_total);
|
||||
}
|
||||
|
||||
|
||||
@ -824,14 +818,14 @@ void RTREE_QUAL::SplitNode(Node* a_node, Branch* a_branch, Node** a_newNode)
|
||||
RTREE_TEMPLATE
|
||||
ELEMTYPEREAL RTREE_QUAL::RectVolume(Rect* a_rect)
|
||||
{
|
||||
ASSERT(a_rect);
|
||||
Q_ASSERT(a_rect);
|
||||
|
||||
ELEMTYPEREAL volume = (ELEMTYPEREAL)1;
|
||||
|
||||
for (int index=0; index<NUMDIMS; ++index)
|
||||
volume *= a_rect->m_max[index] - a_rect->m_min[index];
|
||||
|
||||
ASSERT(volume >= (ELEMTYPEREAL)0);
|
||||
Q_ASSERT(volume >= (ELEMTYPEREAL)0);
|
||||
|
||||
return volume;
|
||||
}
|
||||
@ -841,7 +835,7 @@ ELEMTYPEREAL RTREE_QUAL::RectVolume(Rect* a_rect)
|
||||
RTREE_TEMPLATE
|
||||
ELEMTYPEREAL RTREE_QUAL::RectSphericalVolume(Rect* a_rect)
|
||||
{
|
||||
ASSERT(a_rect);
|
||||
Q_ASSERT(a_rect);
|
||||
|
||||
ELEMTYPEREAL sumOfSquares = (ELEMTYPEREAL)0;
|
||||
ELEMTYPEREAL radius;
|
||||
@ -881,10 +875,10 @@ RTREE_TEMPLATE
|
||||
void RTREE_QUAL::GetBranches(Node* a_node, Branch* a_branch,
|
||||
PartitionVars* a_parVars)
|
||||
{
|
||||
ASSERT(a_node);
|
||||
ASSERT(a_branch);
|
||||
Q_ASSERT(a_node);
|
||||
Q_ASSERT(a_branch);
|
||||
|
||||
ASSERT(a_node->m_count == MAXNODES);
|
||||
Q_ASSERT(a_node->m_count == MAXNODES);
|
||||
|
||||
// Load the branch buffer
|
||||
for (int index=0; index < MAXNODES; ++index)
|
||||
@ -917,7 +911,7 @@ void RTREE_QUAL::GetBranches(Node* a_node, Branch* a_branch,
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::ChoosePartition(PartitionVars* a_parVars, int a_minFill)
|
||||
{
|
||||
ASSERT(a_parVars);
|
||||
Q_ASSERT(a_parVars);
|
||||
|
||||
ELEMTYPEREAL biggestDiff;
|
||||
int group, chosen = 0, betterGroup = 0;
|
||||
@ -973,8 +967,8 @@ void RTREE_QUAL::ChoosePartition(PartitionVars* a_parVars, int a_minFill)
|
||||
}
|
||||
}
|
||||
|
||||
ASSERT((a_parVars->m_count[0] + a_parVars->m_count[1]) == a_parVars->m_total);
|
||||
ASSERT((a_parVars->m_count[0] >= a_parVars->m_minFill) &&
|
||||
Q_ASSERT((a_parVars->m_count[0] + a_parVars->m_count[1]) == a_parVars->m_total);
|
||||
Q_ASSERT((a_parVars->m_count[0] >= a_parVars->m_minFill) &&
|
||||
(a_parVars->m_count[1] >= a_parVars->m_minFill));
|
||||
}
|
||||
|
||||
@ -983,12 +977,12 @@ void RTREE_QUAL::ChoosePartition(PartitionVars* a_parVars, int a_minFill)
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::LoadNodes(Node* a_nodeA, Node* a_nodeB, PartitionVars* a_parVars)
|
||||
{
|
||||
ASSERT(a_nodeA);
|
||||
ASSERT(a_nodeB);
|
||||
ASSERT(a_parVars);
|
||||
Q_ASSERT(a_nodeA);
|
||||
Q_ASSERT(a_nodeB);
|
||||
Q_ASSERT(a_parVars);
|
||||
|
||||
for (int index=0; index < a_parVars->m_total; ++index) {
|
||||
ASSERT(a_parVars->m_partition[index] == 0 || a_parVars->m_partition[index] == 1);
|
||||
Q_ASSERT(a_parVars->m_partition[index] == 0 || a_parVars->m_partition[index] == 1);
|
||||
|
||||
if (a_parVars->m_partition[index] == 0)
|
||||
AddBranch(&a_parVars->m_branchBuf[index], a_nodeA, NULL);
|
||||
@ -1003,7 +997,7 @@ RTREE_TEMPLATE
|
||||
void RTREE_QUAL::InitParVars(PartitionVars* a_parVars, int a_maxRects,
|
||||
int a_minFill)
|
||||
{
|
||||
ASSERT(a_parVars);
|
||||
Q_ASSERT(a_parVars);
|
||||
|
||||
a_parVars->m_count[0] = a_parVars->m_count[1] = 0;
|
||||
a_parVars->m_area[0] = a_parVars->m_area[1] = (ELEMTYPEREAL)0;
|
||||
@ -1049,8 +1043,8 @@ void RTREE_QUAL::PickSeeds(PartitionVars* a_parVars)
|
||||
RTREE_TEMPLATE
|
||||
void RTREE_QUAL::Classify(int a_index, int a_group, PartitionVars* a_parVars)
|
||||
{
|
||||
ASSERT(a_parVars);
|
||||
ASSERT(!a_parVars->m_taken[a_index]);
|
||||
Q_ASSERT(a_parVars);
|
||||
Q_ASSERT(!a_parVars->m_taken[a_index]);
|
||||
|
||||
a_parVars->m_partition[a_index] = a_group;
|
||||
a_parVars->m_taken[a_index] = true;
|
||||
@ -1073,8 +1067,8 @@ void RTREE_QUAL::Classify(int a_index, int a_group, PartitionVars* a_parVars)
|
||||
RTREE_TEMPLATE
|
||||
bool RTREE_QUAL::RemoveRect(Rect* a_rect, const DATATYPE& a_id, Node** a_root)
|
||||
{
|
||||
ASSERT(a_rect && a_root);
|
||||
ASSERT(*a_root);
|
||||
Q_ASSERT(a_rect && a_root);
|
||||
Q_ASSERT(*a_root);
|
||||
|
||||
Node* tempNode;
|
||||
ListNode* reInsertList = NULL;
|
||||
@ -1100,7 +1094,7 @@ bool RTREE_QUAL::RemoveRect(Rect* a_rect, const DATATYPE& a_id, Node** a_root)
|
||||
if ((*a_root)->m_count == 1 && (*a_root)->IsInternalNode()) {
|
||||
tempNode = (*a_root)->m_branch[0].m_child;
|
||||
|
||||
ASSERT(tempNode);
|
||||
Q_ASSERT(tempNode);
|
||||
FreeNode(*a_root);
|
||||
*a_root = tempNode;
|
||||
}
|
||||
@ -1119,8 +1113,8 @@ RTREE_TEMPLATE
|
||||
bool RTREE_QUAL::RemoveRectRec(Rect* a_rect, const DATATYPE& a_id, Node* a_node,
|
||||
ListNode** a_listNode)
|
||||
{
|
||||
ASSERT(a_rect && a_node && a_listNode);
|
||||
ASSERT(a_node->m_level >= 0);
|
||||
Q_ASSERT(a_rect && a_node && a_listNode);
|
||||
Q_ASSERT(a_node->m_level >= 0);
|
||||
|
||||
if (a_node->IsInternalNode()) { // not a leaf node
|
||||
for (int index = 0; index < a_node->m_count; ++index) {
|
||||
@ -1160,7 +1154,7 @@ bool RTREE_QUAL::RemoveRectRec(Rect* a_rect, const DATATYPE& a_id, Node* a_node,
|
||||
RTREE_TEMPLATE
|
||||
bool RTREE_QUAL::Overlap(Rect* a_rectA, Rect* a_rectB) const
|
||||
{
|
||||
ASSERT(a_rectA && a_rectB);
|
||||
Q_ASSERT(a_rectA && a_rectB);
|
||||
|
||||
for (int index=0; index < NUMDIMS; ++index) {
|
||||
if (a_rectA->m_min[index] > a_rectB->m_max[index] ||
|
||||
@ -1193,9 +1187,9 @@ bool RTREE_QUAL::Search(Node* a_node, Rect* a_rect, int& a_foundCount,
|
||||
bool (*a_resultCallback)(DATATYPE a_data, void* a_context),
|
||||
void* a_context) const
|
||||
{
|
||||
ASSERT(a_node);
|
||||
ASSERT(a_node->m_level >= 0);
|
||||
ASSERT(a_rect);
|
||||
Q_ASSERT(a_node);
|
||||
Q_ASSERT(a_node->m_level >= 0);
|
||||
Q_ASSERT(a_rect);
|
||||
|
||||
if (a_node->IsInternalNode()) { // This is an internal node in the tree
|
||||
for (int index=0; index < a_node->m_count; ++index) {
|
||||
25
src/config.h
25
src/config.h
@ -12,11 +12,12 @@
|
||||
#define FONT_FAMILY "Arial"
|
||||
#define FONT_SIZE 12 // px
|
||||
|
||||
#define ELLIPSOID_FILE QString("csv/ellipsoids.csv")
|
||||
#define GCS_FILE QString("csv/gcs.csv")
|
||||
#define PCS_FILE QString("csv/pcs.csv")
|
||||
#define MAP_DIR QString("maps")
|
||||
#define POI_DIR QString("POI")
|
||||
#define CSV_DIR QString("csv")
|
||||
#define ELLIPSOID_FILE QString("ellipsoids.csv")
|
||||
#define GCS_FILE QString("gcs.csv")
|
||||
#define PCS_FILE QString("pcs.csv")
|
||||
|
||||
#if defined(Q_OS_WIN32)
|
||||
#define USER_DIR QDir::homePath() + QString("/GPXSee")
|
||||
@ -30,17 +31,23 @@
|
||||
#define GLOBAL_DIR QString("/usr/share/gpxsee")
|
||||
#endif
|
||||
|
||||
#define USER_ELLIPSOID_FILE USER_DIR + QString("/") + ELLIPSOID_FILE
|
||||
#define USER_GCS_FILE USER_DIR + QString("/") + GCS_FILE
|
||||
#define USER_PCS_FILE USER_DIR + QString("/") + PCS_FILE
|
||||
#define USER_CSV_DIR USER_DIR + QString("/") + CSV_DIR
|
||||
#define USER_ELLIPSOID_FILE USER_CSV_DIR + QString("/") + ELLIPSOID_FILE
|
||||
#define USER_GCS_FILE USER_CSV_DIR + QString("/") + GCS_FILE
|
||||
#define USER_PCS_FILE USER_CSV_DIR + QString("/") + PCS_FILE
|
||||
#define USER_MAP_DIR USER_DIR + QString("/") + MAP_DIR
|
||||
#define USER_POI_DIR USER_DIR + QString("/") + POI_DIR
|
||||
#define GLOBAL_ELLIPSOID_FILE GLOBAL_DIR + QString("/") + ELLIPSOID_FILE
|
||||
#define GLOBAL_GCS_FILE GLOBAL_DIR + QString("/") + GCS_FILE
|
||||
#define GLOBAL_PCS_FILE GLOBAL_DIR + QString("/") + PCS_FILE
|
||||
#define GLOBAL_CSV_DIR GLOBAL_DIR + QString("/") + CSV_DIR
|
||||
#define GLOBAL_ELLIPSOID_FILE GLOBAL_CSV_DIR + QString("/") + ELLIPSOID_FILE
|
||||
#define GLOBAL_GCS_FILE GLOBAL_CSV_DIR + QString("/") + GCS_FILE
|
||||
#define GLOBAL_PCS_FILE GLOBAL_CSV_DIR + QString("/") + PCS_FILE
|
||||
#define GLOBAL_MAP_DIR GLOBAL_DIR + QString("/") + MAP_DIR
|
||||
#define GLOBAL_POI_DIR GLOBAL_DIR + QString("/") + POI_DIR
|
||||
#define TILES_DIR USER_DIR + QString("/tiles")
|
||||
#define TRANSLATIONS_DIR GLOBAL_DIR + QString("/translations")
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 1))
|
||||
#define ENABLE_HTTP2
|
||||
#endif // QT >= 5.10.1
|
||||
|
||||
#endif /* CONFIG_H */
|
||||
|
||||
@ -1,48 +1,72 @@
|
||||
#include <cstring>
|
||||
#include <QtEndian>
|
||||
#include "common/staticassert.h"
|
||||
#include "fitparser.h"
|
||||
|
||||
|
||||
const quint32 FIT_MAGIC = 0x5449462E; // .FIT
|
||||
#define FIT_MAGIC 0x5449462E // .FIT
|
||||
|
||||
#define RECORD_MESSAGE 20
|
||||
#define EVENT_MESSAGE 21
|
||||
#define TIMESTAMP_FIELD 253
|
||||
|
||||
class Event {
|
||||
public:
|
||||
Event() : id(0), type(0), data(0) {}
|
||||
|
||||
FITParser::FITParser()
|
||||
{
|
||||
memset(_defs, 0, sizeof(_defs));
|
||||
quint8 id;
|
||||
quint8 type;
|
||||
quint32 data;
|
||||
};
|
||||
|
||||
_device = 0;
|
||||
_endian = 0;
|
||||
_timestamp = 0;
|
||||
_len = 0;
|
||||
}
|
||||
struct FileHeader {
|
||||
quint8 headerSize;
|
||||
quint8 protocolVersion;
|
||||
quint16 profileVersion;
|
||||
quint32 dataSize;
|
||||
quint32 magic;
|
||||
};
|
||||
|
||||
void FITParser::clearDefinitions()
|
||||
{
|
||||
for (int i = 0; i < 16; i++) {
|
||||
if (_defs[i].fields)
|
||||
delete[] _defs[i].fields;
|
||||
if (_defs[i].devFields)
|
||||
delete[] _defs[i].devFields;
|
||||
}
|
||||
struct FITParser::Field {
|
||||
quint8 id;
|
||||
quint8 size;
|
||||
quint8 type;
|
||||
};
|
||||
|
||||
memset(_defs, 0, sizeof(_defs));
|
||||
}
|
||||
class FITParser::MessageDefinition {
|
||||
public:
|
||||
MessageDefinition() : endian(0), globalId(0), numFields(0), fields(0),
|
||||
numDevFields(0), devFields(0) {}
|
||||
~MessageDefinition() {delete[] fields; delete[] devFields;}
|
||||
|
||||
void FITParser::warning(const char *text) const
|
||||
{
|
||||
const QFile *file = static_cast<QFile *>(_device);
|
||||
qWarning("%s:%d: %s\n", qPrintable(file->fileName()), _len, text);
|
||||
}
|
||||
quint8 endian;
|
||||
quint16 globalId;
|
||||
quint8 numFields;
|
||||
Field *fields;
|
||||
quint8 numDevFields;
|
||||
Field *devFields;
|
||||
};
|
||||
|
||||
bool FITParser::readData(char *data, size_t size)
|
||||
class FITParser::CTX {
|
||||
public:
|
||||
CTX(QFile *file) : file(file), len(0), endian(0), timestamp(0),
|
||||
lastWrite(0), ratio(NAN) {}
|
||||
|
||||
QFile *file;
|
||||
quint32 len;
|
||||
quint8 endian;
|
||||
quint32 timestamp, lastWrite;
|
||||
MessageDefinition defs[16];
|
||||
qreal ratio;
|
||||
Trackpoint trackpoint;
|
||||
TrackData track;
|
||||
};
|
||||
|
||||
|
||||
bool FITParser::readData(QFile *file, char *data, size_t size)
|
||||
{
|
||||
qint64 n;
|
||||
|
||||
n = _device->read(data, size);
|
||||
n = file->read(data, size);
|
||||
if (n < 0) {
|
||||
_errorString = "I/O error";
|
||||
return false;
|
||||
@ -54,17 +78,17 @@ bool FITParser::readData(char *data, size_t size)
|
||||
return true;
|
||||
}
|
||||
|
||||
template<class T> bool FITParser::readValue(T &val)
|
||||
template<class T> bool FITParser::readValue(CTX &ctx, T &val)
|
||||
{
|
||||
T data;
|
||||
|
||||
if (!readData((char*)&data, sizeof(T)))
|
||||
if (!readData(ctx.file, (char*)&data, sizeof(T)))
|
||||
return false;
|
||||
|
||||
_len -= sizeof(T);
|
||||
ctx.len -= sizeof(T);
|
||||
|
||||
if (sizeof(T) > 1) {
|
||||
if (_endian)
|
||||
if (ctx.endian)
|
||||
val = qFromBigEndian(data);
|
||||
else
|
||||
val = qFromLittleEndian(data);
|
||||
@ -74,22 +98,16 @@ template<class T> bool FITParser::readValue(T &val)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FITParser::skipValue(size_t size)
|
||||
bool FITParser::skipValue(CTX &ctx, size_t size)
|
||||
{
|
||||
size_t i;
|
||||
quint8 val;
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
if (!readValue(val))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
ctx.len -= size;
|
||||
return ctx.file->seek(ctx.file->pos() + size);
|
||||
}
|
||||
|
||||
bool FITParser::parseDefinitionMessage(quint8 header)
|
||||
bool FITParser::parseDefinitionMessage(CTX &ctx, quint8 header)
|
||||
{
|
||||
int local_id = header & 0x0f;
|
||||
MessageDefinition* def = &_defs[local_id];
|
||||
MessageDefinition *def = &(ctx.defs[local_id]);
|
||||
quint8 i;
|
||||
|
||||
|
||||
@ -103,54 +121,56 @@ bool FITParser::parseDefinitionMessage(quint8 header)
|
||||
}
|
||||
|
||||
// reserved/unused
|
||||
if (!readValue(i))
|
||||
if (!readValue(ctx, i))
|
||||
return false;
|
||||
|
||||
// endianness
|
||||
if (!readValue(def->endian))
|
||||
if (!readValue(ctx, def->endian))
|
||||
return false;
|
||||
if (def->endian > 1) {
|
||||
_errorString = "Bad endian field";
|
||||
return false;
|
||||
}
|
||||
_endian = def->endian;
|
||||
ctx.endian = def->endian;
|
||||
|
||||
// global message number
|
||||
if (!readValue(def->globalId))
|
||||
if (!readValue(ctx, def->globalId))
|
||||
return false;
|
||||
|
||||
// number of records
|
||||
if (!readValue(def->numFields))
|
||||
if (!readValue(ctx, def->numFields))
|
||||
return false;
|
||||
|
||||
// definition records
|
||||
def->fields = new Field[def->numFields];
|
||||
for (i = 0; i < def->numFields; i++) {
|
||||
STATIC_ASSERT(sizeof(def->fields[i]) == 3);
|
||||
if (!readData((char*)&(def->fields[i]), sizeof(def->fields[i])))
|
||||
if (!readData(ctx.file, (char*)&(def->fields[i]),
|
||||
sizeof(def->fields[i])))
|
||||
return false;
|
||||
_len -= sizeof(def->fields[i]);
|
||||
ctx.len -= sizeof(def->fields[i]);
|
||||
}
|
||||
|
||||
// developer definition records
|
||||
if (header & 0x20) {
|
||||
if (!readValue(def->numDevFields))
|
||||
if (!readValue(ctx, def->numDevFields))
|
||||
return false;
|
||||
|
||||
def->devFields = new Field[def->numDevFields];
|
||||
for (i = 0; i < def->numDevFields; i++) {
|
||||
STATIC_ASSERT(sizeof(def->devFields[i]) == 3);
|
||||
if (!readData((char*)&(def->devFields[i]),
|
||||
if (!readData(ctx.file, (char*)&(def->devFields[i]),
|
||||
sizeof(def->devFields[i])))
|
||||
return false;
|
||||
_len -= sizeof(def->devFields[i]);
|
||||
ctx.len -= sizeof(def->devFields[i]);
|
||||
}
|
||||
}
|
||||
} else
|
||||
def->numDevFields = 0;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FITParser::readField(Field *f, quint32 &val)
|
||||
bool FITParser::readField(CTX &ctx, Field *field, quint32 &val)
|
||||
{
|
||||
quint8 v8 = (quint8)-1;
|
||||
quint16 v16 = (quint16)-1;
|
||||
@ -158,46 +178,44 @@ bool FITParser::readField(Field *f, quint32 &val)
|
||||
|
||||
val = (quint32)-1;
|
||||
|
||||
switch (f->type) {
|
||||
switch (field->type) {
|
||||
case 0: // enum
|
||||
case 1: // sint8
|
||||
case 2: // uint8
|
||||
if (f->size == 1) {
|
||||
ret = readValue(v8);
|
||||
if (field->size == 1) {
|
||||
ret = readValue(ctx, v8);
|
||||
val = v8;
|
||||
} else
|
||||
ret = skipValue(f->size);
|
||||
ret = skipValue(ctx, field->size);
|
||||
break;
|
||||
case 0x83: // sint16
|
||||
case 0x84: // uint16
|
||||
if (f->size == 2) {
|
||||
ret = readValue(v16);
|
||||
if (field->size == 2) {
|
||||
ret = readValue(ctx, v16);
|
||||
val = v16;
|
||||
} else
|
||||
ret = skipValue(f->size);
|
||||
ret = skipValue(ctx, field->size);
|
||||
break;
|
||||
case 0x85: // sint32
|
||||
case 0x86: // uint32
|
||||
if (f->size == 4)
|
||||
ret = readValue(val);
|
||||
if (field->size == 4)
|
||||
ret = readValue(ctx, val);
|
||||
else
|
||||
ret = skipValue(f->size);
|
||||
ret = skipValue(ctx, field->size);
|
||||
break;
|
||||
default:
|
||||
ret = skipValue(f->size);
|
||||
ret = skipValue(ctx, field->size);
|
||||
break;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool FITParser::parseData(TrackData &track, MessageDefinition *def,
|
||||
quint8 offset)
|
||||
bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
|
||||
{
|
||||
Field *field;
|
||||
quint32 timestamp = _timestamp + offset;
|
||||
Event event;
|
||||
quint32 val;
|
||||
Trackpoint trackpoint;
|
||||
int i;
|
||||
|
||||
|
||||
if (!def->fields && !def->devFields) {
|
||||
@ -205,133 +223,149 @@ bool FITParser::parseData(TrackData &track, MessageDefinition *def,
|
||||
return false;
|
||||
}
|
||||
|
||||
_endian = def->endian;
|
||||
ctx.endian = def->endian;
|
||||
|
||||
for (i = 0; i < def->numFields; i++) {
|
||||
for (int i = 0; i < def->numFields; i++) {
|
||||
field = &def->fields[i];
|
||||
if (!readField(field, val))
|
||||
if (!readField(ctx, field, val))
|
||||
return false;
|
||||
|
||||
if (field->id == TIMESTAMP_FIELD)
|
||||
_timestamp = timestamp = val;
|
||||
ctx.timestamp = val;
|
||||
else if (def->globalId == RECORD_MESSAGE) {
|
||||
switch (field->id) {
|
||||
case 0:
|
||||
if (val != 0x7fffffff)
|
||||
trackpoint.rcoordinates().setLat(
|
||||
ctx.trackpoint.rcoordinates().setLat(
|
||||
((qint32)val / (double)0x7fffffff) * 180);
|
||||
break;
|
||||
case 1:
|
||||
if (val != 0x7fffffff)
|
||||
trackpoint.rcoordinates().setLon(
|
||||
ctx.trackpoint.rcoordinates().setLon(
|
||||
((qint32)val / (double)0x7fffffff) * 180);
|
||||
break;
|
||||
case 2:
|
||||
if (val != 0xffff)
|
||||
trackpoint.setElevation((val / 5.0) - 500);
|
||||
ctx.trackpoint.setElevation((val / 5.0) - 500);
|
||||
break;
|
||||
case 3:
|
||||
if (val != 0xff)
|
||||
trackpoint.setHeartRate(val);
|
||||
ctx.trackpoint.setHeartRate(val);
|
||||
break;
|
||||
case 4:
|
||||
if (val != 0xff)
|
||||
trackpoint.setCadence(val);
|
||||
ctx.trackpoint.setCadence(val);
|
||||
break;
|
||||
case 6:
|
||||
if (val != 0xffff)
|
||||
trackpoint.setSpeed(val / 1000.0f);
|
||||
ctx.trackpoint.setSpeed(val / 1000.0f);
|
||||
break;
|
||||
case 7:
|
||||
if (val != 0xffff)
|
||||
trackpoint.setPower(val);
|
||||
ctx.trackpoint.setPower(val);
|
||||
break;
|
||||
case 13:
|
||||
if (val != 0x7f)
|
||||
trackpoint.setTemperature((qint8)val);
|
||||
ctx.trackpoint.setTemperature((qint8)val);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
} else if (def->globalId == EVENT_MESSAGE) {
|
||||
switch (field->id) {
|
||||
case 0:
|
||||
event.id = val;
|
||||
break;
|
||||
case 1:
|
||||
event.type = val;
|
||||
break;
|
||||
case 3:
|
||||
event.data = val;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < def->numDevFields; i++) {
|
||||
for (int i = 0; i < def->numDevFields; i++) {
|
||||
field = &def->devFields[i];
|
||||
if (!readField(field, val))
|
||||
if (!readField(ctx, field, val))
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (def->globalId == RECORD_MESSAGE) {
|
||||
if (trackpoint.coordinates().isValid()) {
|
||||
trackpoint.setTimestamp(QDateTime::fromTime_t(timestamp
|
||||
if (def->globalId == EVENT_MESSAGE) {
|
||||
if ((event.id == 42 || event.id == 43) && event.type == 3) {
|
||||
quint32 front = ((event.data & 0xFF000000) >> 24);
|
||||
quint32 rear = ((event.data & 0x0000FF00) >> 8);
|
||||
ctx.ratio = ((qreal)front / (qreal)rear);
|
||||
}
|
||||
} else if (def->globalId == RECORD_MESSAGE) {
|
||||
if (ctx.timestamp > ctx.lastWrite
|
||||
&& ctx.trackpoint.coordinates().isValid()) {
|
||||
ctx.trackpoint.setTimestamp(QDateTime::fromTime_t(ctx.timestamp
|
||||
+ 631065600));
|
||||
track.append(trackpoint);
|
||||
} else {
|
||||
if (trackpoint.coordinates().isNull())
|
||||
warning("Missing coordinates");
|
||||
else {
|
||||
_errorString = "Invalid coordinates";
|
||||
return false;
|
||||
}
|
||||
ctx.trackpoint.setRatio(ctx.ratio);
|
||||
ctx.track.append(ctx.trackpoint);
|
||||
ctx.trackpoint = Trackpoint();
|
||||
ctx.lastWrite = ctx.timestamp;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FITParser::parseDataMessage(TrackData &track, quint8 header)
|
||||
bool FITParser::parseDataMessage(CTX &ctx, quint8 header)
|
||||
{
|
||||
int local_id = header & 0xf;
|
||||
MessageDefinition* def = &_defs[local_id];
|
||||
return parseData(track, def, 0);
|
||||
MessageDefinition *def = &(ctx.defs[local_id]);
|
||||
return parseData(ctx, def);
|
||||
}
|
||||
|
||||
bool FITParser::parseCompressedMessage(TrackData &track, quint8 header)
|
||||
bool FITParser::parseCompressedMessage(CTX &ctx, quint8 header)
|
||||
{
|
||||
int local_id = (header >> 5) & 3;
|
||||
MessageDefinition* def = &_defs[local_id];
|
||||
return parseData(track, def, header & 0x1f);
|
||||
MessageDefinition *def = &(ctx.defs[local_id]);
|
||||
ctx.timestamp += header & 0x1f;
|
||||
return parseData(ctx, def);
|
||||
}
|
||||
|
||||
bool FITParser::parseRecord(TrackData &track)
|
||||
bool FITParser::parseRecord(CTX &ctx)
|
||||
{
|
||||
quint8 header;
|
||||
|
||||
if (!readValue(header))
|
||||
if (!readValue(ctx, header))
|
||||
return false;
|
||||
|
||||
if (header & 0x80)
|
||||
return parseCompressedMessage(track, header);
|
||||
return parseCompressedMessage(ctx, header);
|
||||
else if (header & 0x40)
|
||||
return parseDefinitionMessage(header);
|
||||
return parseDefinitionMessage(ctx, header);
|
||||
else
|
||||
return parseDataMessage(track, header);
|
||||
return parseDataMessage(ctx, header);
|
||||
}
|
||||
|
||||
bool FITParser::parseHeader()
|
||||
bool FITParser::parseHeader(CTX &ctx)
|
||||
{
|
||||
FileHeader hdr;
|
||||
quint16 crc;
|
||||
qint64 len;
|
||||
|
||||
STATIC_ASSERT(sizeof(hdr) == 12);
|
||||
len = _device->read((char*)&hdr, sizeof(hdr));
|
||||
len = ctx.file->read((char*)&hdr, sizeof(hdr));
|
||||
if (len < 0) {
|
||||
_errorString = "I/O error";
|
||||
return false;
|
||||
} else if ((size_t)len < sizeof(hdr)
|
||||
|| hdr.magic != qToLittleEndian(FIT_MAGIC)) {
|
||||
|| hdr.magic != qToLittleEndian((quint32)FIT_MAGIC)) {
|
||||
_errorString = "Not a FIT file";
|
||||
return false;
|
||||
}
|
||||
|
||||
_len = qFromLittleEndian(hdr.dataSize);
|
||||
ctx.len = qFromLittleEndian(hdr.dataSize);
|
||||
|
||||
if (hdr.headerSize > sizeof(hdr))
|
||||
if (!readData((char *)&crc, sizeof(crc)))
|
||||
if (!readData(ctx.file, (char *)&crc, sizeof(crc)))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@ -342,23 +376,17 @@ bool FITParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
{
|
||||
Q_UNUSED(routes);
|
||||
Q_UNUSED(waypoints);
|
||||
bool ret = true;
|
||||
CTX ctx(file);
|
||||
|
||||
_device = file;
|
||||
_endian = 0;
|
||||
_timestamp = 0;
|
||||
|
||||
if (!parseHeader())
|
||||
if (!parseHeader(ctx))
|
||||
return false;
|
||||
|
||||
tracks.append(TrackData());
|
||||
TrackData &track = tracks.last();
|
||||
while (ctx.len)
|
||||
if (!parseRecord(ctx))
|
||||
return false;
|
||||
|
||||
while (_len)
|
||||
if ((ret = parseRecord(track)) == false)
|
||||
break;
|
||||
tracks.append(ctx.track);
|
||||
|
||||
clearDefinitions();
|
||||
|
||||
return ret;
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -3,63 +3,34 @@
|
||||
|
||||
#include "parser.h"
|
||||
|
||||
class QFile;
|
||||
|
||||
class FITParser : public Parser
|
||||
{
|
||||
public:
|
||||
FITParser();
|
||||
|
||||
bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
|
||||
QList<Waypoint> &waypoints);
|
||||
QString errorString() const {return _errorString;}
|
||||
int errorLine() const {return 0;}
|
||||
|
||||
private:
|
||||
struct FileHeader {
|
||||
quint8 headerSize;
|
||||
quint8 protocolVersion;
|
||||
quint16 profileVersion;
|
||||
quint32 dataSize;
|
||||
quint32 magic;
|
||||
};
|
||||
struct Field;
|
||||
class MessageDefinition;
|
||||
class CTX;
|
||||
|
||||
struct Field {
|
||||
quint8 id;
|
||||
quint8 size;
|
||||
quint8 type;
|
||||
};
|
||||
bool readData(QFile *file, char *data, size_t size);
|
||||
template<class T> bool readValue(CTX &ctx, T &val);
|
||||
bool skipValue(CTX &ctx, size_t size);
|
||||
bool readField(CTX &ctx, Field *field, quint32 &val);
|
||||
|
||||
struct MessageDefinition {
|
||||
quint8 endian;
|
||||
quint16 globalId;
|
||||
quint8 numFields;
|
||||
Field *fields;
|
||||
quint8 numDevFields;
|
||||
Field *devFields;
|
||||
};
|
||||
bool parseHeader(CTX &ctx);
|
||||
bool parseRecord(CTX &ctx);
|
||||
bool parseDefinitionMessage(CTX &ctx, quint8 header);
|
||||
bool parseCompressedMessage(CTX &ctx, quint8 header);
|
||||
bool parseDataMessage(CTX &ctx, quint8 header);
|
||||
bool parseData(CTX &ctx, const MessageDefinition *def);
|
||||
|
||||
|
||||
void warning(const char *text) const;
|
||||
void clearDefinitions();
|
||||
|
||||
bool readData(char *data, size_t size);
|
||||
template<class T> bool readValue(T &val);
|
||||
bool skipValue(size_t size);
|
||||
|
||||
bool parseHeader();
|
||||
bool parseRecord(TrackData &track);
|
||||
bool parseDefinitionMessage(quint8 header);
|
||||
bool parseCompressedMessage(TrackData &track, quint8 header);
|
||||
bool parseDataMessage(TrackData &track, quint8 header);
|
||||
bool parseData(TrackData &track, MessageDefinition *def, quint8 offset);
|
||||
bool readField(Field *f, quint32 &val);
|
||||
|
||||
QIODevice *_device;
|
||||
QString _errorString;
|
||||
|
||||
quint32 _len;
|
||||
quint8 _endian;
|
||||
quint32 _timestamp;
|
||||
MessageDefinition _defs[16];
|
||||
};
|
||||
|
||||
#endif // FITPARSER_H
|
||||
|
||||
@ -51,6 +51,15 @@ Coordinates GPXParser::coordinates()
|
||||
return Coordinates(lon, lat);
|
||||
}
|
||||
|
||||
void GPXParser::rpExtension(TrackData *autoRoute)
|
||||
{
|
||||
while (_reader.readNextStartElement()) {
|
||||
if (_reader.name() == "rpt")
|
||||
autoRoute->append(Trackpoint(coordinates()));
|
||||
_reader.skipCurrentElement();
|
||||
}
|
||||
}
|
||||
|
||||
void GPXParser::tpExtension(Trackpoint &trackpoint)
|
||||
{
|
||||
while (_reader.readNextStartElement()) {
|
||||
@ -63,7 +72,17 @@ void GPXParser::tpExtension(Trackpoint &trackpoint)
|
||||
}
|
||||
}
|
||||
|
||||
void GPXParser::extensions(Trackpoint &trackpoint)
|
||||
void GPXParser::rteptExtensions(TrackData *autoRoute)
|
||||
{
|
||||
while (_reader.readNextStartElement()) {
|
||||
if (_reader.name() == "RoutePointExtension")
|
||||
rpExtension(autoRoute);
|
||||
else
|
||||
_reader.skipCurrentElement();
|
||||
}
|
||||
}
|
||||
|
||||
void GPXParser::trkptExtensions(Trackpoint &trackpoint)
|
||||
{
|
||||
while (_reader.readNextStartElement()) {
|
||||
if (_reader.name() == "speed")
|
||||
@ -95,7 +114,7 @@ void GPXParser::trackpointData(Trackpoint &trackpoint)
|
||||
else if (_reader.name() == "geoidheight")
|
||||
gh = number();
|
||||
else if (_reader.name() == "extensions")
|
||||
extensions(trackpoint);
|
||||
trkptExtensions(trackpoint);
|
||||
else
|
||||
_reader.skipCurrentElement();
|
||||
}
|
||||
@ -104,7 +123,7 @@ void GPXParser::trackpointData(Trackpoint &trackpoint)
|
||||
trackpoint.setElevation(trackpoint.elevation() - gh);
|
||||
}
|
||||
|
||||
void GPXParser::waypointData(Waypoint &waypoint)
|
||||
void GPXParser::waypointData(Waypoint &waypoint, TrackData *autoRoute)
|
||||
{
|
||||
qreal gh = NAN;
|
||||
|
||||
@ -119,6 +138,8 @@ void GPXParser::waypointData(Waypoint &waypoint)
|
||||
gh = number();
|
||||
else if (_reader.name() == "time")
|
||||
waypoint.setTimestamp(time());
|
||||
else if (autoRoute && _reader.name() == "extensions")
|
||||
rteptExtensions(autoRoute);
|
||||
else
|
||||
_reader.skipCurrentElement();
|
||||
}
|
||||
@ -138,12 +159,14 @@ void GPXParser::trackpoints(TrackData &track)
|
||||
}
|
||||
}
|
||||
|
||||
void GPXParser::routepoints(RouteData &route)
|
||||
void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
|
||||
{
|
||||
TrackData autoRoute;
|
||||
|
||||
while (_reader.readNextStartElement()) {
|
||||
if (_reader.name() == "rtept") {
|
||||
route.append(Waypoint(coordinates()));
|
||||
waypointData(route.last());
|
||||
waypointData(route.last(), &autoRoute);
|
||||
} else if (_reader.name() == "name")
|
||||
route.setName(_reader.readElementText());
|
||||
else if (_reader.name() == "desc")
|
||||
@ -151,6 +174,12 @@ void GPXParser::routepoints(RouteData &route)
|
||||
else
|
||||
_reader.skipCurrentElement();
|
||||
}
|
||||
|
||||
if (!autoRoute.isEmpty()) {
|
||||
autoRoute.setName(route.name());
|
||||
autoRoute.setDescription(route.description());
|
||||
tracks.append(autoRoute);
|
||||
}
|
||||
}
|
||||
|
||||
void GPXParser::track(TrackData &track)
|
||||
@ -176,7 +205,7 @@ void GPXParser::gpx(QList<TrackData> &tracks, QList<RouteData> &routes,
|
||||
track(tracks.back());
|
||||
} else if (_reader.name() == "rte") {
|
||||
routes.append(RouteData());
|
||||
routepoints(routes.back());
|
||||
routepoints(routes.back(), tracks);
|
||||
} else if (_reader.name() == "wpt") {
|
||||
waypoints.append(Waypoint(coordinates()));
|
||||
waypointData(waypoints.last());
|
||||
|
||||
@ -18,11 +18,13 @@ private:
|
||||
QList<Waypoint> &waypoints);
|
||||
void track(TrackData &track);
|
||||
void trackpoints(TrackData &track);
|
||||
void routepoints(RouteData &route);
|
||||
void routepoints(RouteData &route, QList<TrackData> &tracks);
|
||||
void rpExtension(TrackData *autoRoute);
|
||||
void tpExtension(Trackpoint &trackpoint);
|
||||
void extensions(Trackpoint &trackpoint);
|
||||
void trkptExtensions(Trackpoint &trackpoint);
|
||||
void rteptExtensions(TrackData *autoRoute);
|
||||
void trackpointData(Trackpoint &trackpoint);
|
||||
void waypointData(Waypoint &waypoint);
|
||||
void waypointData(Waypoint &waypoint, TrackData *autoRoute = 0);
|
||||
qreal number();
|
||||
QDateTime time();
|
||||
Coordinates coordinates();
|
||||
|
||||
@ -6,6 +6,26 @@ static qint64 delphi2unixMS(double date)
|
||||
return (qint64)((date - 25569.0) * 86400000);
|
||||
}
|
||||
|
||||
static bool isASCII(const QByteArray &ba)
|
||||
{
|
||||
for (int i = 0; i < ba.size(); i++) {
|
||||
quint8 c = (quint8)ba.at(i);
|
||||
if (c > 0x7f && c != 0xD1)
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static QByteArray &decode(QByteArray &ba)
|
||||
{
|
||||
if (isASCII(ba))
|
||||
ba.replace('\xD1', ',');
|
||||
|
||||
return ba;
|
||||
}
|
||||
|
||||
|
||||
bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
QList<RouteData> &routes, QList<Waypoint> &waypoints)
|
||||
{
|
||||
@ -24,7 +44,8 @@ bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
QByteArray line = file->readLine();
|
||||
|
||||
if (_errorLine == 1) {
|
||||
if (!line.trimmed().startsWith("OziExplorer Track Point File")) {
|
||||
QString fileType(QString::fromUtf8(line).trimmed());
|
||||
if (!fileType.startsWith("OziExplorer Track Point File")) {
|
||||
_errorString = "Not a PLT file";
|
||||
return false;
|
||||
}
|
||||
@ -107,7 +128,8 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
QByteArray line = file->readLine();
|
||||
|
||||
if (_errorLine == 1) {
|
||||
if (!line.trimmed().startsWith("OziExplorer Route File")) {
|
||||
QString fileType(QString::fromUtf8(line).trimmed());
|
||||
if (!fileType.startsWith("OziExplorer Route File")) {
|
||||
_errorString = "Not a RTE file";
|
||||
return false;
|
||||
}
|
||||
@ -127,12 +149,14 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
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', ','));
|
||||
if (list.size() >= 3) {
|
||||
QByteArray name(list.at(2).trimmed());
|
||||
routes.last().setName(decode(name));
|
||||
}
|
||||
if (list.size() >= 4) {
|
||||
QByteArray description(list.at(3).trimmed());
|
||||
routes.last().setDescription(decode(description));
|
||||
}
|
||||
} else if (list.at(0).trimmed() == "W") {
|
||||
if (!record || list.size() < 7) {
|
||||
_errorString = "Parse error";
|
||||
@ -152,9 +176,9 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
|
||||
Waypoint wp(gcs->toWGS84(Coordinates(lon, lat)));
|
||||
|
||||
QString name(list.at(4).trimmed().replace('\xD1', ','));
|
||||
QByteArray name(list.at(4).trimmed());
|
||||
if (!name.isEmpty())
|
||||
wp.setName(name);
|
||||
wp.setName(decode(name));
|
||||
if (list.size() >= 8) {
|
||||
QByteArray field(list.at(7).trimmed());
|
||||
if (!field.isEmpty()) {
|
||||
@ -168,9 +192,9 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
}
|
||||
}
|
||||
if (list.size() >= 14) {
|
||||
QString desc(list.at(13).trimmed().replace('\xD1', ','));
|
||||
if (!desc.isEmpty())
|
||||
wp.setDescription(desc);
|
||||
QByteArray description(list.at(13).trimmed());
|
||||
if (!description.isEmpty())
|
||||
wp.setDescription(decode(description));
|
||||
}
|
||||
|
||||
routes.last().append(wp);
|
||||
@ -201,7 +225,8 @@ bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
QByteArray line = file->readLine();
|
||||
|
||||
if (_errorLine == 1) {
|
||||
if (!line.trimmed().startsWith("OziExplorer Waypoint File")) {
|
||||
QString fileType(QString::fromUtf8(line).trimmed());
|
||||
if (!fileType.startsWith("OziExplorer Waypoint File")) {
|
||||
_errorString = "Not a WPT file";
|
||||
return false;
|
||||
}
|
||||
@ -230,9 +255,9 @@ bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
|
||||
Waypoint wp(gcs->toWGS84(Coordinates(lon, lat)));
|
||||
|
||||
QString name(list.at(1).trimmed().replace('\xD1', ','));
|
||||
QByteArray name(list.at(1).trimmed());
|
||||
if (!name.isEmpty())
|
||||
wp.setName(name);
|
||||
wp.setName(decode(name));
|
||||
if (list.size() >= 5) {
|
||||
QByteArray field(list.at(4).trimmed());
|
||||
if (!field.isEmpty()) {
|
||||
@ -246,9 +271,9 @@ bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
}
|
||||
}
|
||||
if (list.size() >= 11) {
|
||||
QString desc(list.at(10).trimmed().replace('\xD1', ','));
|
||||
if (!desc.isEmpty())
|
||||
wp.setDescription(desc);
|
||||
QByteArray description(list.at(10).trimmed());
|
||||
if (!description.isEmpty())
|
||||
wp.setDescription(decode(description));
|
||||
}
|
||||
if (list.size() >= 15) {
|
||||
QByteArray field(list.at(14).trimmed());
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include <QPointF>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include "rtree.h"
|
||||
#include "common/rtree.h"
|
||||
#include "waypoint.h"
|
||||
#include "path.h"
|
||||
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
#include "track.h"
|
||||
|
||||
#define OUTLIER_WINDOW 21
|
||||
|
||||
int Track::_elevationWindow = 3;
|
||||
int Track::_speedWindow = 5;
|
||||
int Track::_heartRateWindow = 3;
|
||||
@ -12,15 +10,16 @@ qreal Track::_pauseSpeed = 0.5;
|
||||
int Track::_pauseInterval = 10;
|
||||
|
||||
bool Track::_outlierEliminate = true;
|
||||
bool Track::_useReportedSpeed = false;
|
||||
|
||||
|
||||
static qreal median(QVector<qreal> v)
|
||||
static qreal median(QVector<qreal> &v)
|
||||
{
|
||||
qSort(v.begin(), v.end());
|
||||
return v.at(v.size() / 2);
|
||||
}
|
||||
|
||||
static qreal MAD(QVector<qreal> v, qreal m)
|
||||
static qreal MAD(QVector<qreal> &v, qreal m)
|
||||
{
|
||||
for (int i = 0; i < v.size(); i++)
|
||||
v[i] = qAbs(v.at(i) - m);
|
||||
@ -28,21 +27,17 @@ static qreal MAD(QVector<qreal> v, qreal m)
|
||||
return v.at(v.size() / 2);
|
||||
}
|
||||
|
||||
static QSet<int> eliminate(const QVector<qreal> &v, int window)
|
||||
static QSet<int> eliminate(const QVector<qreal> &v)
|
||||
{
|
||||
QSet<int> rm;
|
||||
qreal m, M;
|
||||
|
||||
QVector<qreal> w(v);
|
||||
qreal m = median(w);
|
||||
qreal M = MAD(w, m);
|
||||
|
||||
if (v.size() < window)
|
||||
return rm;
|
||||
|
||||
for (int i = window/2; i < v.size() - window/2; i++) {
|
||||
m = median(v.mid(i - window/2, window));
|
||||
M = MAD(v.mid(i - window/2, window), m);
|
||||
if (qAbs((0.6745 * (v.at(i) - m)) / M) > 3.5)
|
||||
for (int i = 0; i < v.size(); i++)
|
||||
if (qAbs((0.6745 * (v.at(i) - m)) / M) > 5)
|
||||
rm.insert(i);
|
||||
}
|
||||
|
||||
return rm;
|
||||
}
|
||||
@ -74,37 +69,33 @@ static Graph filter(const Graph &g, int window)
|
||||
|
||||
Track::Track(const TrackData &data) : _data(data)
|
||||
{
|
||||
qreal dt, ds, total;
|
||||
int last;
|
||||
|
||||
QVector<qreal> acceleration;
|
||||
qreal ds, dt;
|
||||
|
||||
_time.append(0);
|
||||
_distance.append(0);
|
||||
_speed.append(0);
|
||||
|
||||
last = 0;
|
||||
acceleration.append(0);
|
||||
|
||||
for (int i = 1; i < _data.count(); i++) {
|
||||
ds = _data.at(i).coordinates().distanceTo(_data.at(i-1).coordinates());
|
||||
_distance.append(ds);
|
||||
_distance.append(_distance.at(i-1) + ds);
|
||||
|
||||
if (_data.first().hasTimestamp() && _data.at(i).hasTimestamp()
|
||||
&& _data.at(i).timestamp() > _data.at(last).timestamp()) {
|
||||
&& _data.at(i).timestamp() >= _data.at(i-1).timestamp())
|
||||
_time.append(_data.first().timestamp().msecsTo(
|
||||
_data.at(i).timestamp()) / 1000.0);
|
||||
last = i;
|
||||
} else
|
||||
else
|
||||
_time.append(NAN);
|
||||
|
||||
if (std::isnan(_time.at(i)) || std::isnan(_time.at(i-1)))
|
||||
_speed.append(NAN);
|
||||
else {
|
||||
dt = _time.at(i) - _time.at(i-1);
|
||||
if (dt < 1e-3) {
|
||||
_speed.append(_speed.at(i-1));
|
||||
continue;
|
||||
}
|
||||
dt = _time.at(i) - _time.at(i-1);
|
||||
if (dt < 1e-3) {
|
||||
_speed.append(_speed.at(i-1));
|
||||
acceleration.append(acceleration.at(i-1));
|
||||
} else {
|
||||
_speed.append(ds / dt);
|
||||
qreal dv = _speed.at(i) - _speed.at(i-1);
|
||||
acceleration.append(dv / dt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -118,20 +109,37 @@ Track::Track(const TrackData &data) : _data(data)
|
||||
}
|
||||
}
|
||||
|
||||
if (_outlierEliminate)
|
||||
_outliers = eliminate(_speed, OUTLIER_WINDOW);
|
||||
if (!_outlierEliminate)
|
||||
return;
|
||||
|
||||
_outliers = eliminate(acceleration);
|
||||
|
||||
QSet<int>::const_iterator it;
|
||||
for (it = _stop.constBegin(); it != _stop.constEnd(); ++it)
|
||||
_outliers.remove(*it);
|
||||
|
||||
total = 0;
|
||||
int last = 0;
|
||||
for (int i = 0; i < _data.size(); i++) {
|
||||
if (_outliers.contains(i))
|
||||
last++;
|
||||
else
|
||||
break;
|
||||
}
|
||||
for (int i = last + 1; i < _data.size(); i++) {
|
||||
if (_outliers.contains(i))
|
||||
continue;
|
||||
if (!discardStopPoint(i))
|
||||
total += _distance.at(i);
|
||||
_distance[i] = total;
|
||||
if (discardStopPoint(i)) {
|
||||
_distance[i] = _distance.at(last);
|
||||
_speed[i] = 0;
|
||||
} else {
|
||||
ds = _data.at(i).coordinates().distanceTo(
|
||||
_data.at(last).coordinates());
|
||||
_distance[i] = _distance.at(last) + ds;
|
||||
|
||||
dt = _time.at(i) - _time.at(last);
|
||||
_speed[i] = (dt < 1e-3) ? _speed.at(last) : ds / dt;
|
||||
}
|
||||
last = i;
|
||||
}
|
||||
}
|
||||
|
||||
@ -151,14 +159,15 @@ Graph Track::speed() const
|
||||
{
|
||||
Graph raw, filtered;
|
||||
qreal v;
|
||||
QSet<int> stop;
|
||||
QList<int> stop;
|
||||
|
||||
for (int i = 0; i < _data.size(); i++) {
|
||||
if (_stop.contains(i) && (!std::isnan(_speed.at(i))
|
||||
|| _data.at(i).hasSpeed())) {
|
||||
v = 0;
|
||||
stop.insert(raw.size());
|
||||
} else if (_data.at(i).hasSpeed() && !_outliers.contains(i))
|
||||
stop.append(raw.size());
|
||||
} else if (_useReportedSpeed && _data.at(i).hasSpeed()
|
||||
&& !_outliers.contains(i))
|
||||
v = _data.at(i).speed();
|
||||
else if (!std::isnan(_speed.at(i)) && !_outliers.contains(i))
|
||||
v = _speed.at(i);
|
||||
@ -170,9 +179,8 @@ Graph Track::speed() const
|
||||
|
||||
filtered = filter(raw, _speedWindow);
|
||||
|
||||
QSet<int>::const_iterator it;
|
||||
for (it = stop.constBegin(); it != stop.constEnd(); ++it)
|
||||
filtered[*it].setY(0);
|
||||
for (int i = 0; i < stop.size(); i++)
|
||||
filtered[stop.at(i)].setY(0);
|
||||
|
||||
return filtered;
|
||||
}
|
||||
@ -201,16 +209,28 @@ Graph Track::temperature() const
|
||||
return raw;
|
||||
}
|
||||
|
||||
Graph Track::ratio() const
|
||||
{
|
||||
Graph raw;
|
||||
|
||||
for (int i = 0; i < _data.size(); i++)
|
||||
if (_data.at(i).hasRatio() && !_outliers.contains(i))
|
||||
raw.append(GraphPoint(_distance.at(i), _time.at(i),
|
||||
_data.at(i).ratio()));
|
||||
|
||||
return raw;
|
||||
}
|
||||
|
||||
Graph Track::cadence() const
|
||||
{
|
||||
Graph raw, filtered;
|
||||
QSet<int> stop;
|
||||
QList<int> stop;
|
||||
qreal c;
|
||||
|
||||
for (int i = 0; i < _data.size(); i++) {
|
||||
if (_data.at(i).hasCadence() && _stop.contains(i)) {
|
||||
c = 0;
|
||||
stop.insert(raw.size());
|
||||
stop.append(raw.size());
|
||||
} else if (_data.at(i).hasCadence() && !_outliers.contains(i))
|
||||
c = _data.at(i).cadence();
|
||||
else
|
||||
@ -221,9 +241,8 @@ Graph Track::cadence() const
|
||||
|
||||
filtered = filter(raw, _cadenceWindow);
|
||||
|
||||
QSet<int>::const_iterator it;
|
||||
for (it = stop.constBegin(); it != stop.constEnd(); ++it)
|
||||
filtered[*it].setY(0);
|
||||
for (int i = 0; i < stop.size(); i++)
|
||||
filtered[stop.at(i)].setY(0);
|
||||
|
||||
return filtered;
|
||||
}
|
||||
@ -231,13 +250,13 @@ Graph Track::cadence() const
|
||||
Graph Track::power() const
|
||||
{
|
||||
Graph raw, filtered;
|
||||
QSet<int> stop;
|
||||
QList<int> stop;
|
||||
qreal p;
|
||||
|
||||
for (int i = 0; i < _data.size(); i++) {
|
||||
if (_data.at(i).hasPower() && _stop.contains(i)) {
|
||||
p = 0;
|
||||
stop.insert(raw.size());
|
||||
stop.append(raw.size());
|
||||
} else if (_data.at(i).hasPower() && !_outliers.contains(i))
|
||||
p = _data.at(i).power();
|
||||
else
|
||||
@ -248,22 +267,29 @@ Graph Track::power() const
|
||||
|
||||
filtered = filter(raw, _powerWindow);
|
||||
|
||||
QSet<int>::const_iterator it;
|
||||
for (it = stop.constBegin(); it != stop.constEnd(); ++it)
|
||||
filtered[*it].setY(0);
|
||||
for (int i = 0; i < stop.size(); i++)
|
||||
filtered[stop.at(i)].setY(0);
|
||||
|
||||
return filtered;
|
||||
}
|
||||
|
||||
qreal Track::distance() const
|
||||
{
|
||||
return _distance.isEmpty() ? 0 : _distance.last();
|
||||
for (int i = _distance.size() - 1; i >= 0; i--)
|
||||
if (!_outliers.contains(i))
|
||||
return _distance.at(i);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
qreal Track::time() const
|
||||
{
|
||||
return (_data.size() < 2) ? 0 :
|
||||
(_data.first().timestamp().msecsTo(_data.last().timestamp()) / 1000.0);
|
||||
for (int i = _data.size() - 1; i >= 0; i--)
|
||||
if (!_outliers.contains(i))
|
||||
return _data.first().timestamp().msecsTo(_data.at(i).timestamp())
|
||||
/ 1000.0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
qreal Track::movingTime() const
|
||||
|
||||
@ -22,6 +22,7 @@ public:
|
||||
Graph temperature() const;
|
||||
Graph cadence() const;
|
||||
Graph power() const;
|
||||
Graph ratio() const;
|
||||
|
||||
qreal distance() const;
|
||||
qreal time() const;
|
||||
@ -42,6 +43,7 @@ public:
|
||||
static void setPauseInterval(int interval) {_pauseInterval = interval;}
|
||||
static void setOutlierElimination(bool eliminate)
|
||||
{_outlierEliminate = eliminate;}
|
||||
static void useReportedSpeed(bool use) {_useReportedSpeed = use;}
|
||||
|
||||
private:
|
||||
bool discardStopPoint(int i) const;
|
||||
@ -58,15 +60,14 @@ private:
|
||||
qreal _pause;
|
||||
|
||||
static bool _outlierEliminate;
|
||||
|
||||
static int _elevationWindow;
|
||||
static int _speedWindow;
|
||||
static int _heartRateWindow;
|
||||
static int _cadenceWindow;
|
||||
static int _powerWindow;
|
||||
|
||||
static qreal _pauseSpeed;
|
||||
static int _pauseInterval;
|
||||
static bool _useReportedSpeed;
|
||||
};
|
||||
|
||||
#endif // TRACK_H
|
||||
|
||||
@ -11,10 +11,10 @@ class Trackpoint
|
||||
public:
|
||||
Trackpoint()
|
||||
{_elevation = NAN; _speed = NAN; _heartRate = NAN; _temperature = NAN;
|
||||
_cadence = NAN; _power = NAN;}
|
||||
_cadence = NAN; _power = NAN; _ratio = NAN;}
|
||||
Trackpoint(const Coordinates &coordinates) : _coordinates(coordinates)
|
||||
{_elevation = NAN; _speed = NAN; _heartRate = NAN; _temperature = NAN;
|
||||
_cadence = NAN; _power = NAN;}
|
||||
_cadence = NAN; _power = NAN; _ratio = NAN;}
|
||||
|
||||
const Coordinates &coordinates() const {return _coordinates;}
|
||||
Coordinates &rcoordinates() {return _coordinates;}
|
||||
@ -25,6 +25,7 @@ public:
|
||||
qreal temperature() const {return _temperature;}
|
||||
qreal cadence() const {return _cadence;}
|
||||
qreal power() const {return _power;}
|
||||
qreal ratio() const {return _ratio;}
|
||||
|
||||
void setCoordinates(const Coordinates &coordinates)
|
||||
{_coordinates = coordinates;}
|
||||
@ -35,6 +36,7 @@ public:
|
||||
void setTemperature(qreal temperature) {_temperature = temperature;}
|
||||
void setCadence(qreal cadence) {_cadence = cadence;}
|
||||
void setPower(qreal power) {_power = power;}
|
||||
void setRatio(qreal ratio) {_ratio = ratio;}
|
||||
|
||||
bool hasTimestamp() const {return !_timestamp.isNull();}
|
||||
bool hasElevation() const {return !std::isnan(_elevation);}
|
||||
@ -43,6 +45,7 @@ public:
|
||||
bool hasTemperature() const {return !std::isnan(_temperature);}
|
||||
bool hasCadence() const {return !std::isnan(_cadence);}
|
||||
bool hasPower() const {return !std::isnan(_power);}
|
||||
bool hasRatio() const {return !std::isnan(_ratio);}
|
||||
|
||||
private:
|
||||
Coordinates _coordinates;
|
||||
@ -53,6 +56,7 @@ private:
|
||||
qreal _temperature;
|
||||
qreal _cadence;
|
||||
qreal _power;
|
||||
qreal _ratio;
|
||||
};
|
||||
|
||||
Q_DECLARE_TYPEINFO(Trackpoint, Q_MOVABLE_TYPE);
|
||||
@ -63,7 +67,8 @@ inline QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint)
|
||||
dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", "
|
||||
<< trackpoint.timestamp() << ", " << trackpoint.elevation() << ", "
|
||||
<< trackpoint.speed() << ", " << trackpoint.heartRate() << ", "
|
||||
<< trackpoint.temperature() << ")";
|
||||
<< trackpoint.temperature() << ", " << trackpoint.cadence() << ", "
|
||||
<< trackpoint.power() << ", " << trackpoint.ratio() << ")";
|
||||
return dbg.space();
|
||||
}
|
||||
#endif // QT_NO_DEBUG
|
||||
|
||||
@ -45,16 +45,12 @@ Defense.
|
||||
#include "albersequal.h"
|
||||
|
||||
|
||||
#ifndef M_PI_2
|
||||
#define M_PI_2 1.57079632679489661923
|
||||
#endif // M_PI_2
|
||||
|
||||
#define ONE_MINUS_SQR(x) (1.0 - (x) * (x))
|
||||
#define ALBERS_Q(slat, one_minus_sqr_es_sin, es_sin) \
|
||||
(_one_minus_es2 * ((slat) / (one_minus_sqr_es_sin) - \
|
||||
(1 / (_two_es)) * log((1 - (es_sin)) / (1 + (es_sin)))))
|
||||
#define ALBERS_M(clat, one_minus_sqr_es_sin) \
|
||||
((clat) / sqrt(one_minus_sqr_es_sin))
|
||||
#define ALBERS_Q(slat, one_minus_sqr_e_sin, es_sin) \
|
||||
(_one_minus_es * ((slat) / (one_minus_sqr_e_sin) - \
|
||||
(1 / (_two_e)) * log((1 - (es_sin)) / (1 + (es_sin)))))
|
||||
#define ALBERS_M(clat, one_minus_sqr_e_sin) \
|
||||
((clat) / sqrt(one_minus_sqr_e_sin))
|
||||
|
||||
|
||||
AlbersEqual::AlbersEqual(const Ellipsoid *ellipsoid, double standardParallel1,
|
||||
@ -64,8 +60,8 @@ AlbersEqual::AlbersEqual(const Ellipsoid *ellipsoid, double standardParallel1,
|
||||
double sin_lat, sin_lat1, sin_lat2, cos_lat1, cos_lat2;
|
||||
double m1, m2, sqr_m1, sqr_m2;
|
||||
double q0, q1, q2;
|
||||
double es_sin, es_sin1, es_sin2;
|
||||
double one_minus_sqr_es_sin1, one_minus_sqr_es_sin2;
|
||||
double e_sin, e_sin1, e_sin2;
|
||||
double one_minus_sqr_e_sin1, one_minus_sqr_e_sin2;
|
||||
double nq0;
|
||||
double sp1, sp2;
|
||||
|
||||
@ -79,31 +75,30 @@ AlbersEqual::AlbersEqual(const Ellipsoid *ellipsoid, double standardParallel1,
|
||||
sp2 = deg2rad(standardParallel2);
|
||||
|
||||
_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;
|
||||
_es = ellipsoid->es();
|
||||
_e = sqrt(_es);
|
||||
_one_minus_es = 1 - _es;
|
||||
_two_e = 2 * _e;
|
||||
|
||||
sin_lat = sin(_latitudeOrigin);
|
||||
es_sin = _es * sin_lat;
|
||||
q0 = ALBERS_Q(sin_lat, ONE_MINUS_SQR(es_sin), es_sin);
|
||||
e_sin = _e * sin_lat;
|
||||
q0 = ALBERS_Q(sin_lat, ONE_MINUS_SQR(e_sin), e_sin);
|
||||
|
||||
sin_lat1 = sin(sp1);
|
||||
cos_lat1 = cos(sp1);
|
||||
es_sin1 = _es * sin_lat1;
|
||||
one_minus_sqr_es_sin1 = ONE_MINUS_SQR(es_sin1);
|
||||
m1 = ALBERS_M(cos_lat1, one_minus_sqr_es_sin1);
|
||||
q1 = ALBERS_Q(sin_lat1, one_minus_sqr_es_sin1, es_sin1);
|
||||
e_sin1 = _e * sin_lat1;
|
||||
one_minus_sqr_e_sin1 = ONE_MINUS_SQR(e_sin1);
|
||||
m1 = ALBERS_M(cos_lat1, one_minus_sqr_e_sin1);
|
||||
q1 = ALBERS_Q(sin_lat1, one_minus_sqr_e_sin1, e_sin1);
|
||||
|
||||
sqr_m1 = m1 * m1;
|
||||
if (fabs(sp1 - sp2) > 1.0e-10) {
|
||||
sin_lat2 = sin(sp2);
|
||||
cos_lat2 = cos(sp2);
|
||||
es_sin2 = _es * sin_lat2;
|
||||
one_minus_sqr_es_sin2 = ONE_MINUS_SQR(es_sin2);
|
||||
m2 = ALBERS_M(cos_lat2, one_minus_sqr_es_sin2);
|
||||
q2 = ALBERS_Q(sin_lat2, one_minus_sqr_es_sin2, es_sin2);
|
||||
e_sin2 = _e * sin_lat2;
|
||||
one_minus_sqr_e_sin2 = ONE_MINUS_SQR(e_sin2);
|
||||
m2 = ALBERS_M(cos_lat2, one_minus_sqr_e_sin2);
|
||||
q2 = ALBERS_Q(sin_lat2, one_minus_sqr_e_sin2, e_sin2);
|
||||
sqr_m2 = m2 * m2;
|
||||
_n = (sqr_m1 - sqr_m2) / (q2 - q1);
|
||||
} else
|
||||
@ -119,7 +114,7 @@ PointD AlbersEqual::ll2xy(const Coordinates &c) const
|
||||
{
|
||||
double dlam;
|
||||
double sin_lat;
|
||||
double es_sin;
|
||||
double e_sin;
|
||||
double q;
|
||||
double rho;
|
||||
double theta;
|
||||
@ -128,13 +123,13 @@ PointD AlbersEqual::ll2xy(const Coordinates &c) const
|
||||
|
||||
dlam = deg2rad(c.lon()) - _longitudeOrigin;
|
||||
if (dlam > M_PI)
|
||||
dlam -= 2.0 * M_PI;
|
||||
dlam -= M_2_PI;
|
||||
if (dlam < -M_PI)
|
||||
dlam += 2.0 * M_PI;
|
||||
dlam += M_2_PI;
|
||||
|
||||
sin_lat = sin(deg2rad(c.lat()));
|
||||
es_sin = _es * sin_lat;
|
||||
q = ALBERS_Q(sin_lat, ONE_MINUS_SQR(es_sin), es_sin);
|
||||
e_sin = _e * sin_lat;
|
||||
q = ALBERS_Q(sin_lat, ONE_MINUS_SQR(e_sin), e_sin);
|
||||
nq = _n * q;
|
||||
rho = (_C < nq) ? 0 : _a_over_n * sqrt(_C - nq);
|
||||
theta = _n * dlam;
|
||||
@ -151,7 +146,7 @@ Coordinates AlbersEqual::xy2ll(const PointD &p) const
|
||||
double rho, rho_n;
|
||||
double phi, delta_phi = 1.0;
|
||||
double sin_phi;
|
||||
double es_sin, one_minus_sqr_es_sin;
|
||||
double e_sin, one_minus_sqr_e_sin;
|
||||
double theta = 0.0;
|
||||
int count = 30;
|
||||
double tolerance = 4.85e-10;
|
||||
@ -174,7 +169,7 @@ Coordinates AlbersEqual::xy2ll(const PointD &p) const
|
||||
theta = atan2(dx, rho0_minus_dy);
|
||||
rho_n = rho * _n;
|
||||
q = (_C - (rho_n * rho_n) / _a2) / _n;
|
||||
qc = 1 - ((_one_minus_es2) / (_two_es)) * log((1.0 - _es) / (1.0 + _es));
|
||||
qc = 1 - ((_one_minus_es) / (_two_e)) * log((1.0 - _e) / (1.0 + _e));
|
||||
if (fabs(fabs(qc) - fabs(q)) > 1.0e-6) {
|
||||
q_over_2 = q / 2.0;
|
||||
if (q_over_2 > 1.0)
|
||||
@ -183,17 +178,17 @@ Coordinates AlbersEqual::xy2ll(const PointD &p) const
|
||||
lat = -M_PI_2;
|
||||
else {
|
||||
phi = asin(q_over_2);
|
||||
if (_es < 1.0e-10)
|
||||
if (_e < 1.0e-10)
|
||||
lat = phi;
|
||||
else {
|
||||
while ((fabs(delta_phi) > tolerance) && count) {
|
||||
sin_phi = sin(phi);
|
||||
es_sin = _es * sin_phi;
|
||||
one_minus_sqr_es_sin = ONE_MINUS_SQR(es_sin);
|
||||
delta_phi = (one_minus_sqr_es_sin * one_minus_sqr_es_sin)
|
||||
/ (2.0 * cos(phi)) * (q / (_one_minus_es2) - sin_phi
|
||||
/ one_minus_sqr_es_sin + (log((1.0 - es_sin)
|
||||
/ (1.0 + es_sin)) / (_two_es)));
|
||||
e_sin = _e * sin_phi;
|
||||
one_minus_sqr_e_sin = ONE_MINUS_SQR(e_sin);
|
||||
delta_phi = (one_minus_sqr_e_sin * one_minus_sqr_e_sin)
|
||||
/ (2.0 * cos(phi)) * (q / (_one_minus_es) - sin_phi
|
||||
/ one_minus_sqr_e_sin + (log((1.0 - e_sin)
|
||||
/ (1.0 + e_sin)) / (_two_e)));
|
||||
phi += delta_phi;
|
||||
count --;
|
||||
}
|
||||
@ -216,9 +211,9 @@ Coordinates AlbersEqual::xy2ll(const PointD &p) const
|
||||
lon = _longitudeOrigin + theta / _n;
|
||||
|
||||
if (lon > M_PI)
|
||||
lon -= M_PI * 2;
|
||||
lon -= M_2_PI;
|
||||
if (lon < -M_PI)
|
||||
lon += M_PI * 2;
|
||||
lon += M_2_PI;
|
||||
|
||||
if (lon > M_PI)
|
||||
lon = M_PI;
|
||||
|
||||
@ -27,11 +27,11 @@ private:
|
||||
double _rho0;
|
||||
double _C;
|
||||
double _n;
|
||||
double _e;
|
||||
double _es;
|
||||
double _es2;
|
||||
double _a_over_n;
|
||||
double _one_minus_es2;
|
||||
double _two_es;
|
||||
double _one_minus_es;
|
||||
double _two_e;
|
||||
};
|
||||
|
||||
#endif // ALBERSEQUAL_H
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
#define TL(m) ((m)->xy2pp((m)->bounds().topLeft()))
|
||||
#define BR(m) ((m)->xy2pp((m)->bounds().bottomRight()))
|
||||
|
||||
static bool resCmp(const OfflineMap *m1, const OfflineMap *m2)
|
||||
static bool resCmp(OfflineMap *m1, OfflineMap *m2)
|
||||
{
|
||||
qreal r1, r2;
|
||||
|
||||
@ -22,12 +22,12 @@ static bool resCmp(const OfflineMap *m1, const OfflineMap *m2)
|
||||
return r1 > r2;
|
||||
}
|
||||
|
||||
static bool xCmp(const OfflineMap *m1, const OfflineMap *m2)
|
||||
static bool xCmp(OfflineMap *m1, OfflineMap *m2)
|
||||
{
|
||||
return TL(m1).x() < TL(m2).x();
|
||||
}
|
||||
|
||||
static bool yCmp(const OfflineMap *m1, const OfflineMap *m2)
|
||||
static bool yCmp(OfflineMap *m1, OfflineMap *m2)
|
||||
{
|
||||
return TL(m1).y() > TL(m2).y();
|
||||
}
|
||||
@ -147,7 +147,7 @@ Atlas::Atlas(const QString &fileName, QObject *parent)
|
||||
_valid = true;
|
||||
}
|
||||
|
||||
QRectF Atlas::bounds() const
|
||||
QRectF Atlas::bounds()
|
||||
{
|
||||
QSizeF s(0, 0);
|
||||
|
||||
@ -161,20 +161,6 @@ QRectF Atlas::bounds() const
|
||||
return QRectF(QPointF(0, 0), s);
|
||||
}
|
||||
|
||||
qreal Atlas::resolution(const QRectF &rect) const
|
||||
{
|
||||
int idx = _zooms.at(_zoom).first;
|
||||
|
||||
for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).last; i++) {
|
||||
if (_bounds.at(i).xy.contains(rect.center())) {
|
||||
idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return _maps.at(idx)->resolution(rect);
|
||||
}
|
||||
|
||||
int Atlas::zoomFit(const QSize &size, const RectC &br)
|
||||
{
|
||||
_zoom = 0;
|
||||
@ -276,7 +262,6 @@ void Atlas::draw(QPainter *painter, const QRectF &rect, bool block)
|
||||
}
|
||||
|
||||
// Multiple maps
|
||||
painter->fillRect(rect, _backgroundColor);
|
||||
for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).last; i++) {
|
||||
QRectF ir = rect.intersected(_bounds.at(i).xy);
|
||||
if (!ir.isNull())
|
||||
|
||||
@ -13,10 +13,9 @@ class Atlas : public Map
|
||||
public:
|
||||
Atlas(const QString &fileName, QObject *parent = 0);
|
||||
|
||||
const QString &name() const {return _name;}
|
||||
QString name() const {return _name;}
|
||||
|
||||
QRectF bounds() const;
|
||||
qreal resolution(const QRectF &rect) const;
|
||||
QRectF bounds();
|
||||
|
||||
int zoom() const {return _zoom;}
|
||||
void setZoom(int zoom);
|
||||
|
||||
@ -7,6 +7,9 @@ CoordinateSystem::CoordinateSystem(int code)
|
||||
case 1035:
|
||||
case 1039:
|
||||
case 4400:
|
||||
case 4402:
|
||||
case 4404:
|
||||
case 4405:
|
||||
case 4409:
|
||||
case 4463:
|
||||
case 4464:
|
||||
@ -26,6 +29,7 @@ CoordinateSystem::CoordinateSystem(int code)
|
||||
case 4530:
|
||||
case 4531:
|
||||
case 4532:
|
||||
case 6501:
|
||||
_axisOrder = YX;
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -12,6 +12,7 @@ public:
|
||||
CoordinateSystem(AxisOrder axisOrder) : _axisOrder(axisOrder) {}
|
||||
CoordinateSystem(int code);
|
||||
|
||||
bool isNull() const {return (_axisOrder == Unknown);}
|
||||
bool isValid() const {return (_axisOrder != Unknown);}
|
||||
|
||||
AxisOrder axisOrder() const {return _axisOrder;}
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
#include <cmath>
|
||||
#include "common/wgs84.h"
|
||||
#include "datum.h"
|
||||
|
||||
static Ellipsoid WGS84e = Ellipsoid(WGS84_RADIUS, WGS84_FLATTENING);
|
||||
static Datum WGS84 = Datum(&WGS84e, 0.0, 0.0, 0.0);
|
||||
|
||||
// Abridged Molodensky transformation
|
||||
#define as2rad(x) ((x) * (M_PI/648000.0))
|
||||
#define rad2as(x) ((x) * (648000.0/M_PI))
|
||||
#define ds2scale(x) (1.0 + (x) * 1e-6)
|
||||
#define scale2ds(x) (((x) - 1.0) / 1e-6)
|
||||
|
||||
static Coordinates molodensky(const Coordinates &c, const Datum &from,
|
||||
const Datum &to)
|
||||
{
|
||||
@ -32,40 +33,96 @@ static Coordinates molodensky(const Coordinates &c, const Datum &from,
|
||||
double adb = 1.0 / (1.0 - from_f);
|
||||
double rn = from_a / sqrt(1 - from_esq * ssqlat);
|
||||
double rm = from_a * (1 - from_esq) / pow((1 - from_esq * ssqlat), 1.5);
|
||||
double from_h = 0.0;
|
||||
|
||||
double dlat = (-dx * slat * clon - dy * slat * slon + dz * clat + da
|
||||
* rn * from_esq * slat * clat / from_a + df * (rm * adb + rn / adb) * slat
|
||||
* clat) / (rm + from_h);
|
||||
* clat) / rm;
|
||||
|
||||
double dlon = (-dx * slon + dy * clon) / ((rn + from_h) * clat);
|
||||
double dlon = (-dx * slon + dy * clon) / (rn * clat);
|
||||
|
||||
return Coordinates(c.lon() + rad2deg(dlon), c.lat() + rad2deg(dlat));
|
||||
}
|
||||
|
||||
Datum::Datum(const Ellipsoid *ellipsoid, double dx, double dy, double dz)
|
||||
: _ellipsoid(ellipsoid), _dx(dx), _dy(dy), _dz(dz)
|
||||
const Datum &Datum::WGS84()
|
||||
{
|
||||
_WGS84 = (_ellipsoid->radius() == WGS84_RADIUS
|
||||
&& _ellipsoid->flattening() == WGS84_FLATTENING && _dx == 0.0
|
||||
&& _dy == 0.0 && _dz == 0.0) ? true : false;
|
||||
static Datum d(&Ellipsoid::WGS84(), 0.0, 0.0, 0.0);
|
||||
return d;
|
||||
}
|
||||
|
||||
Point3D Datum::helmert(const Point3D &p) const
|
||||
{
|
||||
return Point3D(_scale * (p.x() + _rz * p.y() -_ry * p.z()) + _dx,
|
||||
_scale * (-_rz * p.x() + p.y() + _rx * p.z()) + _dy,
|
||||
_scale * (_ry * p.x() -_rx * p.y() + p.z()) + _dz);
|
||||
}
|
||||
|
||||
Point3D Datum::helmertr(const Point3D &p) const
|
||||
{
|
||||
double x = (p.x() - _dx) / _scale;
|
||||
double y = (p.y() - _dy) / _scale;
|
||||
double z = (p.z() - _dz) / _scale;
|
||||
|
||||
return Point3D(x -_rz * y + _ry * z, _rz * x + y + -_rx * z, -_ry * x + _rx
|
||||
* y + z);
|
||||
}
|
||||
|
||||
Datum::Datum(const Ellipsoid *ellipsoid, double dx, double dy, double dz,
|
||||
double rx, double ry, double rz, double ds)
|
||||
: _ellipsoid(ellipsoid), _dx(dx), _dy(dy), _dz(dz), _rx(as2rad(rx)),
|
||||
_ry(as2rad(ry)), _rz(as2rad(rz)), _scale(ds2scale(ds))
|
||||
{
|
||||
if (_ellipsoid->radius() == WGS84_RADIUS && _ellipsoid->flattening()
|
||||
== WGS84_FLATTENING && _dx == 0.0 && _dy == 0.0 && _dz == 0.0
|
||||
&& _rx == 0.0 && _ry == 0.0 && _rz == 0.0 && ds == 0.0)
|
||||
_transformation = None;
|
||||
else
|
||||
_transformation = Helmert;
|
||||
}
|
||||
|
||||
Datum::Datum(const Ellipsoid *ellipsoid, double dx, double dy, double dz)
|
||||
: _ellipsoid(ellipsoid), _dx(dx), _dy(dy), _dz(dz), _rx(0.0), _ry(0.0),
|
||||
_rz(0.0), _scale(1.0)
|
||||
{
|
||||
if (_ellipsoid->radius() == WGS84_RADIUS && _ellipsoid->flattening()
|
||||
== WGS84_FLATTENING && _dx == 0.0 && _dy == 0.0 && _dz == 0.0)
|
||||
_transformation = None;
|
||||
else
|
||||
_transformation = Molodensky;
|
||||
}
|
||||
|
||||
Coordinates Datum::toWGS84(const Coordinates &c) const
|
||||
{
|
||||
return _WGS84 ? c : molodensky(c, *this, WGS84);
|
||||
switch (_transformation) {
|
||||
case Helmert:
|
||||
return Geocentric::toGeodetic(helmert(Geocentric::fromGeodetic(c,
|
||||
ellipsoid())), WGS84().ellipsoid());
|
||||
case Molodensky:
|
||||
return molodensky(c, *this, WGS84());
|
||||
default:
|
||||
return c;
|
||||
}
|
||||
}
|
||||
|
||||
Coordinates Datum::fromWGS84(const Coordinates &c) const
|
||||
{
|
||||
return _WGS84 ? c : molodensky(c, WGS84, *this);
|
||||
switch (_transformation) {
|
||||
case Helmert:
|
||||
return Geocentric::toGeodetic(helmertr(Geocentric::fromGeodetic(c,
|
||||
WGS84().ellipsoid())), ellipsoid());
|
||||
case Molodensky:
|
||||
return molodensky(c, WGS84(), *this);
|
||||
default:
|
||||
return c;
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef QT_NO_DEBUG
|
||||
QDebug operator<<(QDebug dbg, const Datum &datum)
|
||||
{
|
||||
dbg.nospace() << "Datum(" << *datum.ellipsoid() << ", " << datum.dx()
|
||||
<< ", " << datum.dy() << ", " << datum.dz() << ")";
|
||||
<< ", " << datum.dy() << ", " << datum.dz() << ", " << rad2as(datum.rx())
|
||||
<< ", " << rad2as(datum.ry()) << ", " << rad2as(datum.rz()) << ", "
|
||||
<< scale2ds(datum.scale()) << ")";
|
||||
return dbg.space();
|
||||
}
|
||||
#endif // QT_NO_DEBUG
|
||||
|
||||
@ -2,42 +2,60 @@
|
||||
#define DATUM_H
|
||||
|
||||
#include <cmath>
|
||||
#include <QList>
|
||||
#include <QDebug>
|
||||
#include "ellipsoid.h"
|
||||
#include "common/coordinates.h"
|
||||
#include "ellipsoid.h"
|
||||
#include "geocentric.h"
|
||||
|
||||
class Datum
|
||||
{
|
||||
public:
|
||||
Datum() : _ellipsoid(0), _dx(NAN), _dy(NAN), _dz(NAN),
|
||||
_WGS84(false) {}
|
||||
Datum() : _ellipsoid(0), _transformation(None), _dx(NAN), _dy(NAN),
|
||||
_dz(NAN), _rx(NAN), _ry(NAN), _rz(NAN), _scale(NAN) {}
|
||||
Datum(const Ellipsoid *ellipsoid, double dx, double dy, double dz,
|
||||
double rx, double ry, double rz, double ds);
|
||||
Datum(const Ellipsoid *ellipsoid, double dx, double dy, double dz);
|
||||
|
||||
const Ellipsoid *ellipsoid() const {return _ellipsoid;}
|
||||
double dx() const {return _dx;}
|
||||
double dy() const {return _dy;}
|
||||
double dz() const {return _dz;}
|
||||
double rx() const {return _rx;}
|
||||
double ry() const {return _ry;}
|
||||
double rz() const {return _rz;}
|
||||
double scale() const {return _scale;}
|
||||
|
||||
bool isNull() const
|
||||
{return (!_ellipsoid && std::isnan(_dx) && std::isnan(_dy)
|
||||
&& std::isnan(_dz));}
|
||||
{return !_ellipsoid;}
|
||||
bool isValid() const
|
||||
{return (_ellipsoid && !std::isnan(_dx) && !std::isnan(_dy)
|
||||
&& !std::isnan(_dz));}
|
||||
&& !std::isnan(_dz) && !std::isnan(_scale) && !std::isnan(_rx)
|
||||
&& !std::isnan(_ry) && !std::isnan(_rz));}
|
||||
|
||||
Coordinates toWGS84(const Coordinates &c) const;
|
||||
Coordinates fromWGS84(const Coordinates &c) const;
|
||||
|
||||
static const Datum &WGS84();
|
||||
|
||||
private:
|
||||
enum TransformationType {
|
||||
None,
|
||||
Molodensky,
|
||||
Helmert
|
||||
};
|
||||
|
||||
Point3D helmert(const Point3D &p) const;
|
||||
Point3D helmertr(const Point3D &p) const;
|
||||
|
||||
const Ellipsoid *_ellipsoid;
|
||||
double _dx, _dy, _dz;
|
||||
bool _WGS84;
|
||||
TransformationType _transformation;
|
||||
double _dx, _dy, _dz, _rx, _ry, _rz, _scale;
|
||||
};
|
||||
|
||||
inline bool operator==(const Datum &d1, const Datum &d2)
|
||||
{return (d1.ellipsoid() == d2.ellipsoid() && d1.dx() == d2.dx()
|
||||
&& d1.dy() == d2.dy() && d1.dz() == d2.dz());}
|
||||
{return (*d1.ellipsoid() == *d2.ellipsoid() && d1.dx() == d2.dx()
|
||||
&& d1.dy() == d2.dy() && d1.dz() == d2.dz() && d1.rx() == d2.rx()
|
||||
&& d1.ry() == d2.ry() && d1.rz() == d2.rz() && d1.scale() == d2.scale());}
|
||||
|
||||
#ifndef QT_NO_DEBUG
|
||||
QDebug operator<<(QDebug dbg, const Datum &datum);
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
#include <QFileInfo>
|
||||
#include <QNetworkRequest>
|
||||
#include <QBasicTimer>
|
||||
#include "config.h"
|
||||
#include "downloader.h"
|
||||
|
||||
|
||||
@ -81,6 +80,9 @@ private:
|
||||
|
||||
QNetworkAccessManager *Downloader::_manager = 0;
|
||||
int Downloader::_timeout = 30;
|
||||
#ifdef ENABLE_HTTP2
|
||||
bool Downloader::_http2 = true;
|
||||
#endif // ENABLE_HTTP2
|
||||
|
||||
bool Downloader::doDownload(const Download &dl,
|
||||
const QByteArray &authorization, const Redirect *redirect)
|
||||
@ -108,6 +110,10 @@ bool Downloader::doDownload(const Download &dl,
|
||||
request.setRawHeader("User-Agent", USER_AGENT);
|
||||
if (!authorization.isNull())
|
||||
request.setRawHeader("Authorization", authorization);
|
||||
#ifdef ENABLE_HTTP2
|
||||
request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute,
|
||||
QVariant(_http2));
|
||||
#endif // ENABLE_HTTP2
|
||||
|
||||
QNetworkReply *reply = _manager->get(request);
|
||||
if (reply && reply->isRunning()) {
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
#include <QList>
|
||||
#include <QSet>
|
||||
#include <QHash>
|
||||
#include "config.h"
|
||||
|
||||
|
||||
class Download
|
||||
@ -46,6 +47,9 @@ public:
|
||||
void clearErrors() {_errorDownloads.clear();}
|
||||
|
||||
static void setTimeout(int timeout) {_timeout = timeout;}
|
||||
#ifdef ENABLE_HTTP2
|
||||
static void enableHTTP2(bool enable) {_http2 = enable;}
|
||||
#endif // ENABLE_HTTP2
|
||||
static void setNetworkAccessManager(QNetworkAccessManager *manager)
|
||||
{_manager = manager;}
|
||||
|
||||
@ -69,6 +73,9 @@ private:
|
||||
QHash<QUrl, int> _errorDownloads;
|
||||
|
||||
static int _timeout;
|
||||
#ifdef ENABLE_HTTP2
|
||||
static bool _http2;
|
||||
#endif // ENABLE_HTTP2
|
||||
static QNetworkAccessManager *_manager;
|
||||
};
|
||||
|
||||
|
||||
@ -3,12 +3,18 @@
|
||||
#include "common/wgs84.h"
|
||||
#include "ellipsoid.h"
|
||||
|
||||
QMap<int, Ellipsoid> Ellipsoid::_ellipsoids = WGS84();
|
||||
QMap<int, Ellipsoid> Ellipsoid::_ellipsoids = defaults();
|
||||
|
||||
QMap<int, Ellipsoid> Ellipsoid::WGS84()
|
||||
const Ellipsoid &Ellipsoid::WGS84()
|
||||
{
|
||||
static Ellipsoid e(WGS84_RADIUS, WGS84_FLATTENING);
|
||||
return e;
|
||||
}
|
||||
|
||||
QMap<int, Ellipsoid> Ellipsoid::defaults()
|
||||
{
|
||||
QMap<int, Ellipsoid> map;
|
||||
map.insert(7030, Ellipsoid(WGS84_RADIUS, WGS84_FLATTENING));
|
||||
map.insert(7030, WGS84());
|
||||
return map;
|
||||
}
|
||||
|
||||
@ -66,6 +72,14 @@ void Ellipsoid::loadList(const QString &path)
|
||||
}
|
||||
}
|
||||
|
||||
Ellipsoid::Ellipsoid(double radius, double flattening)
|
||||
: _radius(radius), _flattening(flattening)
|
||||
{
|
||||
_es = 2.0 * flattening - flattening * flattening;
|
||||
_e2s = (1.0 / (1.0 - _es)) - 1.0;
|
||||
_b = radius * (1.0 - flattening);
|
||||
}
|
||||
|
||||
#ifndef QT_NO_DEBUG
|
||||
QDebug operator<<(QDebug dbg, const Ellipsoid &ellipsoid)
|
||||
{
|
||||
|
||||
@ -9,26 +9,30 @@
|
||||
class Ellipsoid
|
||||
{
|
||||
public:
|
||||
Ellipsoid() : _radius(NAN), _flattening(NAN) {}
|
||||
Ellipsoid(double radius, double flattening)
|
||||
: _radius(radius), _flattening(flattening) {}
|
||||
Ellipsoid() : _radius(NAN), _flattening(NAN), _es(NAN), _b(NAN) {}
|
||||
Ellipsoid(double radius, double flattening);
|
||||
|
||||
double radius() const {return _radius;}
|
||||
double flattening() const {return _flattening;}
|
||||
double es() const {return _es;}
|
||||
double e2s() const {return _e2s;}
|
||||
double b() const {return _b;}
|
||||
|
||||
bool isNull() const
|
||||
{return (std::isnan(_radius) && std::isnan(_flattening));}
|
||||
bool isValid() const
|
||||
{return !(std::isnan(_radius) || std::isnan(_flattening));}
|
||||
|
||||
static const Ellipsoid &WGS84();
|
||||
static const Ellipsoid *ellipsoid(int id);
|
||||
static void loadList(const QString &path);
|
||||
|
||||
private:
|
||||
double _radius;
|
||||
double _flattening;
|
||||
double _es, _e2s, _b;
|
||||
|
||||
static QMap<int, Ellipsoid> WGS84();
|
||||
static QMap<int, Ellipsoid> defaults();
|
||||
static QMap<int, Ellipsoid> _ellipsoids;
|
||||
};
|
||||
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
static QPointF ll2m(const Coordinates &c)
|
||||
{
|
||||
return QPointF(c.lon(), rad2deg(log(tan(M_PI/4.0 + deg2rad(c.lat())/2.0))));
|
||||
return QPointF(c.lon(), rad2deg(log(tan(M_PI_4 + deg2rad(c.lat())/2.0))));
|
||||
}
|
||||
|
||||
static Coordinates m2ll(const QPointF &p)
|
||||
{
|
||||
return Coordinates(p.x(), rad2deg(2 * atan(exp(deg2rad(p.y()))) - M_PI/2));
|
||||
return Coordinates(p.x(), rad2deg(2.0 * atan(exp(deg2rad(p.y()))) - M_PI_2));
|
||||
}
|
||||
|
||||
static qreal zoom2scale(int zoom)
|
||||
@ -46,7 +46,7 @@ EmptyMap::EmptyMap(QObject *parent) : Map(parent)
|
||||
_zoom = ZOOM_MAX;
|
||||
}
|
||||
|
||||
QRectF EmptyMap::bounds() const
|
||||
QRectF EmptyMap::bounds()
|
||||
{
|
||||
return QRectF(ll2xy(Coordinates(-180, 85)), ll2xy(Coordinates(180, -85)));
|
||||
}
|
||||
@ -65,7 +65,7 @@ int EmptyMap::zoomFit(const QSize &size, const RectC &rect)
|
||||
return _zoom;
|
||||
}
|
||||
|
||||
qreal EmptyMap::resolution(const QRectF &rect) const
|
||||
qreal EmptyMap::resolution(const QRectF &rect)
|
||||
{
|
||||
qreal scale = zoom2scale(_zoom);
|
||||
|
||||
@ -87,18 +87,19 @@ int EmptyMap::zoomOut()
|
||||
|
||||
void EmptyMap::draw(QPainter *painter, const QRectF &rect, bool block)
|
||||
{
|
||||
Q_UNUSED(painter);
|
||||
Q_UNUSED(rect);
|
||||
Q_UNUSED(block);
|
||||
painter->fillRect(rect, _backgroundColor);
|
||||
}
|
||||
|
||||
QPointF EmptyMap::ll2xy(const Coordinates &c) const
|
||||
QPointF EmptyMap::ll2xy(const Coordinates &c)
|
||||
{
|
||||
qreal scale = zoom2scale(_zoom);
|
||||
QPointF m = ll2m(c);
|
||||
return QPointF(m.x() / scale, m.y() / -scale);
|
||||
}
|
||||
|
||||
Coordinates EmptyMap::xy2ll(const QPointF &p) const
|
||||
Coordinates EmptyMap::xy2ll(const QPointF &p)
|
||||
{
|
||||
qreal scale = zoom2scale(_zoom);
|
||||
return m2ll(QPointF(p.x() * scale, -p.y() * scale));
|
||||
|
||||
@ -10,10 +10,10 @@ class EmptyMap : public Map
|
||||
public:
|
||||
EmptyMap(QObject *parent = 0);
|
||||
|
||||
const QString &name() const {return _name;}
|
||||
QString name() const {return QString();}
|
||||
|
||||
QRectF bounds() const;
|
||||
qreal resolution(const QRectF &rect) const;
|
||||
QRectF bounds();
|
||||
qreal resolution(const QRectF &rect);
|
||||
|
||||
int zoom() const {return _zoom;}
|
||||
void setZoom(int zoom) {_zoom = zoom;}
|
||||
@ -21,18 +21,12 @@ public:
|
||||
int zoomIn();
|
||||
int zoomOut();
|
||||
|
||||
QPointF ll2xy(const Coordinates &c)
|
||||
{return static_cast<const EmptyMap &>(*this).ll2xy(c);}
|
||||
Coordinates xy2ll(const QPointF &p)
|
||||
{return static_cast<const EmptyMap &>(*this).xy2ll(p);}
|
||||
QPointF ll2xy(const Coordinates &c);
|
||||
Coordinates xy2ll(const QPointF &p);
|
||||
|
||||
void draw(QPainter *painter, const QRectF &rect, bool block);
|
||||
|
||||
private:
|
||||
QPointF ll2xy(const Coordinates &c) const;
|
||||
Coordinates xy2ll(const QPointF &p) const;
|
||||
|
||||
QString _name;
|
||||
int _zoom;
|
||||
};
|
||||
|
||||
|
||||
@ -19,9 +19,6 @@ private:
|
||||
GCS _gcs;
|
||||
};
|
||||
|
||||
static Ellipsoid WGS84e = Ellipsoid(WGS84_RADIUS, WGS84_FLATTENING);
|
||||
static Datum WGS84d = Datum(&WGS84e, 0.0, 0.0, 0.0);
|
||||
|
||||
static int parameter(const QString &str, bool *res)
|
||||
{
|
||||
QString field = str.trimmed();
|
||||
@ -33,12 +30,30 @@ static int parameter(const QString &str, bool *res)
|
||||
return field.toInt(res);
|
||||
}
|
||||
|
||||
QList<GCS::Entry> GCS::_gcss = WGS84();
|
||||
static double parameterd(const QString &str, bool *res)
|
||||
{
|
||||
QString field = str.trimmed();
|
||||
if (field.isEmpty()) {
|
||||
*res = true;
|
||||
return NAN;
|
||||
}
|
||||
|
||||
QList<GCS::Entry> GCS::WGS84()
|
||||
return field.toDouble(res);
|
||||
}
|
||||
|
||||
|
||||
QList<GCS::Entry> GCS::_gcss = defaults();
|
||||
|
||||
const GCS &GCS::WGS84()
|
||||
{
|
||||
static GCS g(Datum::WGS84(), 8901, 9122);
|
||||
return g;
|
||||
}
|
||||
|
||||
QList<GCS::Entry> GCS::defaults()
|
||||
{
|
||||
QList<GCS::Entry> list;
|
||||
list.append(GCS::Entry(4326, 6326, "WGS 84", GCS(WGS84d, 8901, 9122)));
|
||||
list.append(GCS::Entry(4326, 6326, "WGS 84", WGS84()));
|
||||
return list;
|
||||
}
|
||||
|
||||
@ -91,7 +106,7 @@ void GCS::loadList(const QString &path)
|
||||
|
||||
QByteArray line = file.readLine();
|
||||
QList<QByteArray> list = line.split(',');
|
||||
if (list.size() < 10) {
|
||||
if (list.size() != 14) {
|
||||
qWarning("%s:%d: Format error", qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
@ -145,6 +160,26 @@ void GCS::loadList(const QString &path)
|
||||
qWarning("%s:%d: Invalid dz", qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
double rx = parameterd(list[10], &res);
|
||||
if (!res) {
|
||||
qWarning("%s:%d: Invalid rx", qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
double ry = parameterd(list[11], &res);
|
||||
if (!res) {
|
||||
qWarning("%s:%d: Invalid ry", qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
double rz = parameterd(list[12], &res);
|
||||
if (!res) {
|
||||
qWarning("%s:%d: Invalid rz", qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
double ds = parameterd(list[13], &res);
|
||||
if (!res) {
|
||||
qWarning("%s:%d: Invalid ds", qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!(e = Ellipsoid::ellipsoid(el))) {
|
||||
qWarning("%s:%d: Unknown ellipsoid code", qPrintable(path), ln);
|
||||
@ -156,11 +191,22 @@ void GCS::loadList(const QString &path)
|
||||
case 9603:
|
||||
datum = Datum(e, dx, dy, dz);
|
||||
break;
|
||||
case 9606:
|
||||
datum = Datum(e, dx, dy, dz, -rx, -ry, -rz, ds);
|
||||
break;
|
||||
case 9607:
|
||||
datum = Datum(e, dx, dy, dz, rx, ry, rz, ds);
|
||||
break;
|
||||
default:
|
||||
qWarning("%s:%d: Unknown coordinates transformation method",
|
||||
qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
if (!datum.isValid()) {
|
||||
qWarning("%s:%d: Invalid coordinates transformation parameters",
|
||||
qPrintable(path), ln);
|
||||
continue;
|
||||
}
|
||||
|
||||
GCS gcs(datum, pm, au);
|
||||
if (gcs.isValid())
|
||||
|
||||
@ -29,13 +29,14 @@ public:
|
||||
static const GCS *gcs(int geodeticDatum, int primeMeridian,
|
||||
int angularUnits);
|
||||
static const GCS *gcs(const QString &name);
|
||||
static const GCS &WGS84();
|
||||
|
||||
static void loadList(const QString &path);
|
||||
|
||||
private:
|
||||
class Entry;
|
||||
|
||||
static QList<Entry> WGS84();
|
||||
static QList<Entry> defaults();
|
||||
|
||||
Datum _datum;
|
||||
PrimeMeridian _primeMeridian;
|
||||
|
||||
106
src/map/geocentric.cpp
Normal file
106
src/map/geocentric.cpp
Normal file
@ -0,0 +1,106 @@
|
||||
/*
|
||||
* 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 "ellipsoid.h"
|
||||
#include "geocentric.h"
|
||||
|
||||
|
||||
#define AD_C 1.0026000
|
||||
|
||||
Point3D Geocentric::fromGeodetic(const Coordinates &c, const Ellipsoid *e)
|
||||
{
|
||||
double lat = deg2rad(c.lat());
|
||||
double lon = deg2rad(c.lon());
|
||||
double slat = sin(lat);
|
||||
double slat2 = slat * slat;
|
||||
double clat = cos(lat);
|
||||
double Rn = e->radius() / (sqrt(1.0 - e->es() * slat2));
|
||||
|
||||
if (lon > M_PI)
|
||||
lon -= M_2_PI;
|
||||
|
||||
return Point3D(Rn * clat * cos(lon), Rn * clat * sin(lon),
|
||||
(Rn * (1 - e->es())) * slat);
|
||||
}
|
||||
|
||||
Coordinates Geocentric::toGeodetic(const Point3D &p, const Ellipsoid *e)
|
||||
{
|
||||
bool pole = false;
|
||||
double lat, lon;
|
||||
|
||||
if (p.x() == 0.0) {
|
||||
if (p.y() > 0)
|
||||
lon = M_PI_2;
|
||||
else if (p.y() < 0)
|
||||
lon = -M_PI_2;
|
||||
else {
|
||||
pole = true;
|
||||
lon = 0.0;
|
||||
if (p.z() > 0.0)
|
||||
lat = M_PI_2;
|
||||
else if (p.z() < 0.0)
|
||||
lat = -M_PI_2;
|
||||
else
|
||||
return Coordinates(rad2deg(lon), rad2deg(M_PI_2));
|
||||
}
|
||||
} else
|
||||
lon = atan2(p.y(), p.x());
|
||||
|
||||
double W2 = p.x()*p.x() + p.y()*p.y();
|
||||
double W = sqrt(W2);
|
||||
double T0 = p.z() * AD_C;
|
||||
double S0 = sqrt(T0 * T0 + W2);
|
||||
double Sin_B0 = T0 / S0;
|
||||
double Cos_B0 = W / S0;
|
||||
double Sin3_B0 = Sin_B0 * Sin_B0 * Sin_B0;
|
||||
double T1 = p.z() + e->b() * e->e2s() * Sin3_B0;
|
||||
double Sum = W - e->radius() * e->es() * Cos_B0 * Cos_B0 * Cos_B0;
|
||||
double S1 = sqrt(T1*T1 + Sum * Sum);
|
||||
double Sin_p1 = T1 / S1;
|
||||
double Cos_p1 = Sum / S1;
|
||||
|
||||
if (!pole)
|
||||
lat = atan(Sin_p1 / Cos_p1);
|
||||
|
||||
return Coordinates(rad2deg(lon), rad2deg(lat));
|
||||
}
|
||||
29
src/map/geocentric.h
Normal file
29
src/map/geocentric.h
Normal file
@ -0,0 +1,29 @@
|
||||
#ifndef GEOCENTRIC_H
|
||||
#define GEOCENTRIC_H
|
||||
|
||||
#include <cmath>
|
||||
#include "common/coordinates.h"
|
||||
|
||||
class Ellipsoid;
|
||||
|
||||
class Point3D {
|
||||
public:
|
||||
Point3D() : _x(NAN), _y(NAN), _z(NAN) {}
|
||||
Point3D(double x, double y, double z) : _x(x), _y(y), _z(z) {}
|
||||
|
||||
double x() const {return _x;}
|
||||
double y() const {return _y;}
|
||||
double z() const {return _z;}
|
||||
|
||||
private:
|
||||
double _x;
|
||||
double _y;
|
||||
double _z;
|
||||
};
|
||||
|
||||
namespace Geocentric {
|
||||
Point3D fromGeodetic(const Coordinates &c, const Ellipsoid *e);
|
||||
Coordinates toGeodetic(const Point3D &p, const Ellipsoid *e);
|
||||
}
|
||||
|
||||
#endif // GEOCENTRIC_H
|
||||
@ -1,5 +1,3 @@
|
||||
#include <QFileInfo>
|
||||
#include <QtEndian>
|
||||
#include "pcs.h"
|
||||
#include "tifffile.h"
|
||||
#include "geotiff.h"
|
||||
@ -9,48 +7,54 @@
|
||||
#define TIFF_SHORT 3
|
||||
#define TIFF_LONG 4
|
||||
|
||||
#define ModelPixelScaleTag 33550
|
||||
#define ModelTiepointTag 33922
|
||||
#define ModelTransformationTag 34264
|
||||
#define GeoKeyDirectoryTag 34735
|
||||
#define GeoDoubleParamsTag 34736
|
||||
#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 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 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 ProjFalseOriginLongGeoKey 3084
|
||||
#define ProjFalseOriginLatGeoKey 3085
|
||||
#define ProjFalseOriginEastingGeoKey 3086
|
||||
#define ProjFalseOriginNorthingGeoKey 3087
|
||||
#define ProjCenterLongGeoKey 3088
|
||||
#define ProjCenterLatGeoKey 3089
|
||||
#define ProjCenterEastingGeoKey 3090
|
||||
#define ProjCenterNorthingGeoKey 3091
|
||||
#define ProjScaleAtNatOriginGeoKey 3092
|
||||
#define ProjScaleAtCenterGeoKey 3093
|
||||
#define ProjAzimuthAngleGeoKey 3094
|
||||
#define ProjRectifiedGridAngleGeoKey 3096
|
||||
|
||||
#define ModelTypeProjected 1
|
||||
#define ModelTypeGeographic 2
|
||||
#define ModelTypeGeocentric 3
|
||||
#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 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 IS_SET(map, key) \
|
||||
@ -251,6 +255,12 @@ bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const
|
||||
case ProjScaleAtCenterGeoKey:
|
||||
case ProjAzimuthAngleGeoKey:
|
||||
case ProjRectifiedGridAngleGeoKey:
|
||||
case ProjFalseOriginLongGeoKey:
|
||||
case ProjFalseOriginLatGeoKey:
|
||||
case ProjCenterEastingGeoKey:
|
||||
case ProjCenterNorthingGeoKey:
|
||||
case ProjFalseOriginEastingGeoKey:
|
||||
case ProjFalseOriginNorthingGeoKey:
|
||||
if (!readGeoValue(file, ctx.values, entry.ValueOffset,
|
||||
value.DOUBLE))
|
||||
return false;
|
||||
@ -303,9 +313,7 @@ const GCS *GeoTIFF::gcs(QMap<quint16, Value> &kv)
|
||||
|
||||
if (!(gcs = GCS::gcs(gd, pm, au)))
|
||||
_errorString = QString("%1+%2: unknown geodetic datum + prime"
|
||||
" meridian combination")
|
||||
.arg(kv.value(GeogGeodeticDatumGeoKey).SHORT)
|
||||
.arg(kv.value(GeogPrimeMeridianGeoKey).SHORT);
|
||||
" meridian combination").arg(gd).arg(pm);
|
||||
} else
|
||||
_errorString = "Can not determine GCS";
|
||||
|
||||
@ -325,7 +333,7 @@ Projection::Method GeoTIFF::method(QMap<quint16, Value> &kv)
|
||||
case CT_ObliqueMercator:
|
||||
return Projection::Method(9815);
|
||||
case CT_Mercator:
|
||||
return Projection::Method(1024);
|
||||
return Projection::Method(9804);
|
||||
case CT_LambertConfConic_2SP:
|
||||
return Projection::Method(9802);
|
||||
case CT_LambertConfConic_1SP:
|
||||
@ -389,12 +397,16 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
|
||||
lat0 = au.toDegrees(kv.value(ProjNatOriginLatGeoKey).DOUBLE);
|
||||
else if (kv.contains(ProjCenterLatGeoKey))
|
||||
lat0 = au.toDegrees(kv.value(ProjCenterLatGeoKey).DOUBLE);
|
||||
else if (kv.contains(ProjFalseOriginLatGeoKey))
|
||||
lat0 = au.toDegrees(kv.value(ProjFalseOriginLatGeoKey).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 if (kv.contains(ProjFalseOriginLongGeoKey))
|
||||
lon0 = au.toDegrees(kv.value(ProjFalseOriginLongGeoKey).DOUBLE);
|
||||
else
|
||||
lon0 = NAN;
|
||||
if (kv.contains(ProjScaleAtNatOriginGeoKey))
|
||||
@ -417,10 +429,18 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
|
||||
sp2 = NAN;
|
||||
if (kv.contains(ProjFalseNorthingGeoKey))
|
||||
fn = lu.toMeters(kv.value(ProjFalseNorthingGeoKey).DOUBLE);
|
||||
else if (kv.contains(ProjCenterNorthingGeoKey))
|
||||
fn = lu.toMeters(kv.value(ProjCenterNorthingGeoKey).DOUBLE);
|
||||
else if (kv.contains(ProjFalseOriginNorthingGeoKey))
|
||||
fn = lu.toMeters(kv.value(ProjFalseOriginNorthingGeoKey).DOUBLE);
|
||||
else
|
||||
fn = NAN;
|
||||
if (kv.contains(ProjFalseEastingGeoKey))
|
||||
fe = lu.toMeters(kv.value(ProjFalseEastingGeoKey).DOUBLE);
|
||||
else if (kv.contains(ProjCenterEastingGeoKey))
|
||||
fe = lu.toMeters(kv.value(ProjCenterEastingGeoKey).DOUBLE);
|
||||
else if (kv.contains(ProjFalseOriginEastingGeoKey))
|
||||
fe = lu.toMeters(kv.value(ProjFalseOriginEastingGeoKey).DOUBLE);
|
||||
else
|
||||
fe = NAN;
|
||||
|
||||
|
||||
253
src/map/jnxmap.cpp
Normal file
253
src/map/jnxmap.cpp
Normal file
@ -0,0 +1,253 @@
|
||||
#include <QtEndian>
|
||||
#include <QPainter>
|
||||
#include <QFileInfo>
|
||||
#include <QPixmapCache>
|
||||
#include "rectd.h"
|
||||
#include "gcs.h"
|
||||
#include "pcs.h"
|
||||
#include "jnxmap.h"
|
||||
|
||||
|
||||
#define ic2dc(x) ((x) * 180.0 / 0x7FFFFFFF)
|
||||
|
||||
struct Level {
|
||||
quint32 count;
|
||||
quint32 offset;
|
||||
quint32 scale;
|
||||
};
|
||||
|
||||
struct Ctx {
|
||||
QPainter *painter;
|
||||
QFile *file;
|
||||
|
||||
Ctx(QPainter *painter, QFile *file) : painter(painter), file(file) {}
|
||||
};
|
||||
|
||||
|
||||
template<class T> bool JNXMap::readValue(T &val)
|
||||
{
|
||||
T data;
|
||||
|
||||
if (_file.read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
|
||||
return false;
|
||||
|
||||
if (sizeof(T) > 1)
|
||||
val = qFromLittleEndian(data);
|
||||
else
|
||||
val = data;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool JNXMap::readString(QByteArray& ba)
|
||||
{
|
||||
char byte;
|
||||
|
||||
while (true) {
|
||||
if (!_file.getChar(&byte))
|
||||
return false;
|
||||
else if (!byte)
|
||||
return true;
|
||||
else
|
||||
ba += byte;
|
||||
}
|
||||
}
|
||||
|
||||
bool JNXMap::readTiles()
|
||||
{
|
||||
qint32 lat1, lon2, lat2, lon1;
|
||||
quint32 version, dummy, levels;
|
||||
|
||||
if (!(readValue(version) && readValue(dummy) && readValue(lat1)
|
||||
&& readValue(lon2) && readValue(lat2) && readValue(lon1)
|
||||
&& readValue(levels)))
|
||||
return false;
|
||||
|
||||
_bounds = RectC(Coordinates(ic2dc(lon1), ic2dc(lat1)),
|
||||
Coordinates(ic2dc(lon2), ic2dc(lat2)));
|
||||
if (!levels || !_bounds.isValid())
|
||||
return false;
|
||||
|
||||
if (!_file.seek(version > 3 ? 0x34 : 0x30))
|
||||
return false;
|
||||
|
||||
QVector<Level> lh(levels);
|
||||
for (int i = 0; i < lh.count(); i++) {
|
||||
Level &l = lh[i];
|
||||
|
||||
if (!(readValue(l.count) && readValue(l.offset) && readValue(l.scale)))
|
||||
return false;
|
||||
if (version > 3) {
|
||||
QByteArray ba;
|
||||
if (!(readValue(dummy) && readString(ba)))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
QByteArray guid;
|
||||
if (!(readValue(dummy) && readString(guid)))
|
||||
return false;
|
||||
/* Use WebMercator projection for nakarte.tk maps */
|
||||
if (guid == "12345678-1234-1234-1234-123456789ABC")
|
||||
_projection = Projection(PCS::pcs(3857));
|
||||
else
|
||||
_projection = Projection(GCS::gcs(4326));
|
||||
|
||||
_zooms = QVector<Zoom>(lh.size());
|
||||
for (int i = 0; i < lh.count(); i++) {
|
||||
Zoom &z = _zooms[i];
|
||||
const Level &l = lh.at(i);
|
||||
|
||||
if (!_file.seek(l.offset))
|
||||
return false;
|
||||
|
||||
z.tiles = QVector<Tile>(l.count);
|
||||
for (quint32 j = 0; j < l.count; j++) {
|
||||
Tile &tile = z.tiles[j];
|
||||
qint32 top, right, bottom, left;
|
||||
quint16 width, height;
|
||||
|
||||
if (!(readValue(top) && readValue(right) && readValue(bottom)
|
||||
&& readValue(left) && readValue(width)
|
||||
&& readValue(height) && readValue(tile.size)
|
||||
&& readValue(tile.offset)))
|
||||
return false;
|
||||
|
||||
RectD rect(_projection.ll2xy(Coordinates(ic2dc(left), ic2dc(top))),
|
||||
_projection.ll2xy(Coordinates(ic2dc(right), ic2dc(bottom))));
|
||||
|
||||
if (j == 0) {
|
||||
ReferencePoint tl(PointD(0, 0), rect.topLeft());
|
||||
ReferencePoint br(PointD(width, height), rect.bottomRight());
|
||||
z.transform = Transform(tl, br);
|
||||
}
|
||||
|
||||
QRectF trect(z.transform.proj2img(rect.topLeft()),
|
||||
z.transform.proj2img(rect.bottomRight()));
|
||||
tile.pos = trect.topLeft();
|
||||
|
||||
qreal min[2], max[2];
|
||||
min[0] = trect.left();
|
||||
min[1] = trect.top();
|
||||
max[0] = trect.right();
|
||||
max[1] = trect.bottom();
|
||||
z.tree.Insert(min, max, &tile);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
JNXMap::JNXMap(const QString &fileName, QObject *parent)
|
||||
: Map(parent), _file(fileName), _zoom(0), _valid(false)
|
||||
{
|
||||
_name = QFileInfo(fileName).fileName();
|
||||
|
||||
if (!_file.open(QIODevice::ReadOnly)) {
|
||||
_errorString = QString("%1: Error opening file").arg(fileName);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!readTiles()) {
|
||||
_errorString = "JNX file format error";
|
||||
return;
|
||||
}
|
||||
|
||||
_valid = true;
|
||||
}
|
||||
|
||||
QPointF JNXMap::ll2xy(const Coordinates &c)
|
||||
{
|
||||
const Zoom &z = _zooms.at(_zoom);
|
||||
return z.transform.proj2img(_projection.ll2xy(c));
|
||||
}
|
||||
|
||||
Coordinates JNXMap::xy2ll(const QPointF &p)
|
||||
{
|
||||
const Zoom &z = _zooms.at(_zoom);
|
||||
return _projection.xy2ll(z.transform.img2proj(p));
|
||||
}
|
||||
|
||||
QRectF JNXMap::bounds()
|
||||
{
|
||||
return QRectF(ll2xy(_bounds.topLeft()), ll2xy(_bounds.bottomRight()));
|
||||
}
|
||||
|
||||
int JNXMap::zoomFit(const QSize &size, const RectC &rect)
|
||||
{
|
||||
if (!rect.isValid())
|
||||
_zoom = _zooms.size() - 1;
|
||||
else {
|
||||
for (int i = 1; i < _zooms.count(); i++) {
|
||||
_zoom = i;
|
||||
QRect sbr(QPoint(ll2xy(rect.topLeft()).toPoint()),
|
||||
QPoint(ll2xy(rect.bottomRight()).toPoint()));
|
||||
if (sbr.size().width() >= size.width() || sbr.size().height()
|
||||
>= size.height()) {
|
||||
_zoom--;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return _zoom;
|
||||
}
|
||||
|
||||
int JNXMap::zoomIn()
|
||||
{
|
||||
_zoom = qMin(_zoom + 1, _zooms.size() - 1);
|
||||
return _zoom;
|
||||
}
|
||||
|
||||
int JNXMap::zoomOut()
|
||||
{
|
||||
_zoom = qMax(_zoom - 1, 0);
|
||||
return _zoom;
|
||||
}
|
||||
|
||||
QPixmap JNXMap::pixmap(const Tile *tile, QFile *file)
|
||||
{
|
||||
QPixmap pm;
|
||||
|
||||
QString key = file->fileName() + "-" + QString::number(tile->offset);
|
||||
if (!QPixmapCache::find(key, &pm)) {
|
||||
QByteArray ba;
|
||||
ba.resize(tile->size + 2);
|
||||
ba[0] = (char)0xFF;
|
||||
ba[1] = (char)0xD8;
|
||||
char *data = ba.data() + 2;
|
||||
|
||||
if (!file->seek(tile->offset))
|
||||
return QPixmap();
|
||||
if (!file->read(data, tile->size))
|
||||
return QPixmap();
|
||||
pm = QPixmap::fromImage(QImage::fromData(ba));
|
||||
|
||||
if (!pm.isNull())
|
||||
QPixmapCache::insert(key, pm);
|
||||
}
|
||||
|
||||
return pm;
|
||||
}
|
||||
|
||||
bool JNXMap::cb(Tile *tile, void *context)
|
||||
{
|
||||
Ctx *ctx = static_cast<Ctx*>(context);
|
||||
ctx->painter->drawPixmap(tile->pos, pixmap(tile, ctx->file));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void JNXMap::draw(QPainter *painter, const QRectF &rect, bool block)
|
||||
{
|
||||
Q_UNUSED(block);
|
||||
const RTree<Tile*, qreal, 2> &tree = _zooms.at(_zoom).tree;
|
||||
Ctx ctx(painter, &_file);
|
||||
|
||||
qreal min[2], max[2];
|
||||
min[0] = rect.left();
|
||||
min[1] = rect.top();
|
||||
max[0] = rect.right();
|
||||
max[1] = rect.bottom();
|
||||
tree.Search(min, max, cb, &ctx);
|
||||
}
|
||||
69
src/map/jnxmap.h
Normal file
69
src/map/jnxmap.h
Normal file
@ -0,0 +1,69 @@
|
||||
#ifndef JNXMAP_H
|
||||
#define JNXMAP_H
|
||||
|
||||
#include <QFile>
|
||||
#include <QVector>
|
||||
#include "common/rtree.h"
|
||||
#include "common/rectc.h"
|
||||
#include "transform.h"
|
||||
#include "projection.h"
|
||||
#include "map.h"
|
||||
|
||||
class JNXMap : public Map
|
||||
{
|
||||
public:
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
JNXMap(const QString &fileName, QObject *parent = 0);
|
||||
|
||||
QString name() const {return _name;}
|
||||
|
||||
QRectF bounds();
|
||||
|
||||
int zoom() const {return _zoom;}
|
||||
void setZoom(int zoom) {_zoom = zoom;}
|
||||
int zoomFit(const QSize &size, const RectC &rect);
|
||||
int zoomIn();
|
||||
int zoomOut();
|
||||
|
||||
QPointF ll2xy(const Coordinates &c);
|
||||
Coordinates xy2ll(const QPointF &p);
|
||||
|
||||
void draw(QPainter *painter, const QRectF &rect, bool block);
|
||||
|
||||
bool isValid() const {return _valid;}
|
||||
QString errorString() const {return _errorString;}
|
||||
|
||||
private:
|
||||
struct Tile {
|
||||
QPointF pos;
|
||||
quint32 size;
|
||||
quint32 offset;
|
||||
};
|
||||
|
||||
struct Zoom {
|
||||
Transform transform;
|
||||
QVector<Tile> tiles;
|
||||
RTree<Tile*, qreal, 2> tree;
|
||||
};
|
||||
|
||||
template<class T> bool readValue(T &val);
|
||||
bool readString(QByteArray &ba);
|
||||
bool readTiles();
|
||||
|
||||
static bool cb(Tile *tile, void *context);
|
||||
static QPixmap pixmap(const Tile *tile, QFile *file);
|
||||
|
||||
QString _name;
|
||||
QFile _file;
|
||||
QVector<Zoom> _zooms;
|
||||
int _zoom;
|
||||
RectC _bounds;
|
||||
Projection _projection;
|
||||
|
||||
bool _valid;
|
||||
QString _errorString;
|
||||
};
|
||||
|
||||
#endif // JNXMAP_H
|
||||
70
src/map/krovak.cpp
Normal file
70
src/map/krovak.cpp
Normal file
@ -0,0 +1,70 @@
|
||||
#include "ellipsoid.h"
|
||||
#include "krovak.h"
|
||||
|
||||
Krovak::Krovak(const Ellipsoid *ellipsoid, double standardParallel,
|
||||
double azimuth, double scale, double centerLatitude, double longitudeOrigin,
|
||||
double falseEasting, double falseNorthing)
|
||||
{
|
||||
double phiC = deg2rad(centerLatitude);
|
||||
double sinPhiC = sin(phiC);
|
||||
double sinPhiC2 = sinPhiC * sinPhiC;
|
||||
double cosPhiC = cos(phiC);
|
||||
double cosPhiC2 = cosPhiC * cosPhiC;
|
||||
double cosPhiC4 = cosPhiC2 * cosPhiC2;
|
||||
double alphaC = deg2rad(azimuth);
|
||||
|
||||
_phiP = deg2rad(standardParallel);
|
||||
_e = sqrt(ellipsoid->es());
|
||||
_A = ellipsoid->radius() * sqrt(1.0 - ellipsoid->es())
|
||||
/ (1.0 - ellipsoid->es() * sinPhiC2);
|
||||
_B = sqrt(1.0 + (ellipsoid->es() * cosPhiC4 / (1.0 - ellipsoid->es())));
|
||||
double gamma0 = asin(sinPhiC / _B);
|
||||
_t0 = tan(M_PI_4 + gamma0 / 2.0) * pow((1.0 + _e * sinPhiC) /
|
||||
(1.0 - _e * sinPhiC), _e*_B / 2.0) / pow(tan(M_PI_4 + phiC/2.0), _B);
|
||||
_n = sin(_phiP);
|
||||
_r0 = scale * _A / tan(_phiP);
|
||||
_FE = falseEasting;
|
||||
_FN = falseNorthing;
|
||||
_cosAlphaC = cos(alphaC);
|
||||
_sinAlphaC = sin(alphaC);
|
||||
_lambda0 = deg2rad(longitudeOrigin);
|
||||
}
|
||||
|
||||
PointD Krovak::ll2xy(const Coordinates &c) const
|
||||
{
|
||||
double phi = deg2rad(c.lat());
|
||||
double lambda = deg2rad(c.lon());
|
||||
double eSinPhi = _e * sin(phi);
|
||||
double U = 2.0 * (atan(_t0 * pow(tan(phi/2.0 + M_PI_4), _B)
|
||||
/ pow((1.0 + eSinPhi) / (1.0 - eSinPhi), _e * _B/2.0)) - M_PI_4);
|
||||
double cosU = cos(U);
|
||||
double V = _B * (_lambda0 - lambda);
|
||||
double T = asin(_cosAlphaC * sin(U) + _sinAlphaC * cosU * cos(V));
|
||||
double D = asin(cosU * sin(V) / cos(T));
|
||||
double theta = _n * D;
|
||||
double r = _r0 * pow(tan(M_PI_4 + _phiP/2.0), _n)
|
||||
/ pow(tan(T/2.0 + M_PI_4), _n);
|
||||
|
||||
return PointD(r * sin(theta) + _FE, r * cos(theta) + _FN);
|
||||
}
|
||||
|
||||
Coordinates Krovak::xy2ll(const PointD &p) const
|
||||
{
|
||||
double Xp = p.y() - _FN;
|
||||
double Yp = p.x() - _FE;
|
||||
double Xp2 = Xp * Xp;
|
||||
double Yp2 = Yp * Yp;
|
||||
double r = sqrt(Xp2 + Yp2);
|
||||
double theta = atan(Yp / Xp);
|
||||
double D = theta / sin(_phiP);
|
||||
double T = 2.0 * (atan(pow(_r0 / r, 1.0/_n) * tan(M_PI_4 + _phiP/2.0))
|
||||
- M_PI_4);
|
||||
double U = asin(_cosAlphaC * sin(T) - _sinAlphaC * cos(T) * cos(D));
|
||||
double V = asin(cos(T) * sin(D) / cos(U));
|
||||
double phi = U;
|
||||
for (int i = 0; i < 3; i++)
|
||||
phi = 2.0 * (atan(pow(_t0, -1.0/_B) * pow(tan(U/2.0 + M_PI_4), 1.0/_B)
|
||||
* pow((1.0 + _e * sin(phi))/(1.0 - _e * sin(phi)), _e/2.0)) - M_PI_4);
|
||||
|
||||
return Coordinates(rad2deg(_lambda0 - V/_B), rad2deg(phi));
|
||||
}
|
||||
45
src/map/krovak.h
Normal file
45
src/map/krovak.h
Normal file
@ -0,0 +1,45 @@
|
||||
#ifndef KROVAK_H
|
||||
#define KROVAK_H
|
||||
|
||||
#include "ct.h"
|
||||
|
||||
class Ellipsoid;
|
||||
|
||||
class Krovak : public CT
|
||||
{
|
||||
public:
|
||||
Krovak(const Ellipsoid *ellipsoid, double standardParallel,
|
||||
double azimuth, double scale, double centerLatitude,
|
||||
double longitudeOrigin, double falseEasting, double falseNorthing);
|
||||
|
||||
virtual CT *clone() const {return new Krovak(*this);}
|
||||
|
||||
virtual PointD ll2xy(const Coordinates &c) const;
|
||||
virtual Coordinates xy2ll(const PointD &p) const;
|
||||
|
||||
private:
|
||||
double _e, _A, _B, _t0, _n, _r0, _phiP;
|
||||
double _cosAlphaC, _sinAlphaC, _lambda0, _FE, _FN;
|
||||
};
|
||||
|
||||
class KrovakNE : public CT
|
||||
{
|
||||
public:
|
||||
KrovakNE(const Ellipsoid *ellipsoid, double standardParallel,
|
||||
double azimuth, double scale, double centerLatitude,
|
||||
double longitudeOrigin, double falseEasting, double falseNorthing)
|
||||
: _k(ellipsoid, standardParallel, azimuth, scale, centerLatitude,
|
||||
longitudeOrigin, falseEasting, falseNorthing) {}
|
||||
|
||||
virtual CT *clone() const {return new KrovakNE(*this);}
|
||||
|
||||
virtual PointD ll2xy(const Coordinates &c) const
|
||||
{PointD p(_k.ll2xy(c)); return PointD(-p.x(), -p.y());}
|
||||
virtual Coordinates xy2ll(const PointD &p) const
|
||||
{return _k.xy2ll(PointD(-p.x(), -p.y()));}
|
||||
|
||||
private:
|
||||
Krovak _k;
|
||||
};
|
||||
|
||||
#endif // KROVAK_H
|
||||
@ -16,19 +16,17 @@ LambertAzimuthal::LambertAzimuthal(const Ellipsoid *ellipsoid,
|
||||
_lon0 = deg2rad(longitudeOrigin);
|
||||
|
||||
_a = ellipsoid->radius();
|
||||
_es = ellipsoid->es();
|
||||
_e = sqrt(_es);
|
||||
|
||||
_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
|
||||
double q0 = (1.0 - _es) * ((sin(lat0) / (1.0 - _es * sin2(lat0)))
|
||||
- ((1.0/(2.0*_e)) * log((1.0 - _e * sin(lat0)) / (1.0 + _e
|
||||
* sin(lat0)))));
|
||||
_qP = (1.0 - _es2) * ((1.0 / (1.0 - _es2)) - ((1.0/(2.0*_es))
|
||||
* log((1.0 - _es) / (1.0 + _es))));
|
||||
_qP = (1.0 - _es) * ((1.0 / (1.0 - _es)) - ((1.0/(2.0*_e))
|
||||
* log((1.0 - _e) / (1.0 + _e))));
|
||||
_beta0 = asin(q0 / _qP);
|
||||
_Rq = _a * sqrt(_qP / 2.0);
|
||||
_D = _a * (cos(lat0) / sqrt(1.0 - _es2 * sin2(lat0))) / (_Rq * cos(_beta0));
|
||||
_D = _a * (cos(lat0) / sqrt(1.0 - _es * sin2(lat0))) / (_Rq * cos(_beta0));
|
||||
}
|
||||
|
||||
PointD LambertAzimuthal::ll2xy(const Coordinates &c) const
|
||||
@ -36,8 +34,8 @@ PointD LambertAzimuthal::ll2xy(const Coordinates &c) const
|
||||
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
|
||||
double q = (1.0 - _es) * ((sin(lat) / (1.0 - _es * sin2(lat)))
|
||||
- ((1.0/(2.0*_e)) * log((1.0 - _e * sin(lat)) / (1.0 + _e
|
||||
* sin(lat)))));
|
||||
double beta = asin(q / _qP);
|
||||
double B = _Rq * sqrt(2.0 / (1.0 + sin(_beta0) * sin(beta) + (cos(_beta0)
|
||||
@ -52,8 +50,8 @@ PointD LambertAzimuthal::ll2xy(const Coordinates &c) const
|
||||
|
||||
Coordinates LambertAzimuthal::xy2ll(const PointD &p) const
|
||||
{
|
||||
double es4 = _es2 * _es2;
|
||||
double es6 = _es2 * es4;
|
||||
double es4 = _es * _es;
|
||||
double es6 = _es * es4;
|
||||
|
||||
double rho = sqrt(sqr((p.x() - _falseEasting) / _D) + sqr(_D * (p.y()
|
||||
- _falseNorthing)));
|
||||
@ -64,7 +62,7 @@ Coordinates LambertAzimuthal::xy2ll(const PointD &p) const
|
||||
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)
|
||||
double lat = betaS + ((_es/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));
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ private:
|
||||
double _lon0;
|
||||
double _falseNorthing;
|
||||
double _falseEasting;
|
||||
double _a, _es, _es2, _qP, _beta0, _Rq, _D;
|
||||
double _a, _e, _es, _qP, _beta0, _Rq, _D;
|
||||
};
|
||||
|
||||
#endif // LAMBERTAZIMUTHAL_H
|
||||
|
||||
@ -45,12 +45,6 @@ Defense.
|
||||
#include "ellipsoid.h"
|
||||
#include "lambertconic.h"
|
||||
|
||||
#ifndef M_PI_2
|
||||
#define M_PI_2 1.57079632679489661923
|
||||
#endif // M_PI_2
|
||||
#ifndef M_PI_4
|
||||
#define M_PI_4 0.785398163397448309616
|
||||
#endif /* M_PI_4 */
|
||||
|
||||
#define LAMBERT_m(clat, essin) (clat / sqrt(1.0 - essin * essin))
|
||||
#define LAMBERT2_t(lat, essin, es_over_2) \
|
||||
@ -63,8 +57,7 @@ LambertConic1::LambertConic1(const Ellipsoid *ellipsoid, double latitudeOrigin,
|
||||
double longitudeOrigin, double scale, double falseEasting,
|
||||
double falseNorthing)
|
||||
{
|
||||
double es2;
|
||||
double es_sin;
|
||||
double e_sin;
|
||||
double m0;
|
||||
double lat_orig;
|
||||
|
||||
@ -72,21 +65,19 @@ LambertConic1::LambertConic1(const Ellipsoid *ellipsoid, double latitudeOrigin,
|
||||
lat_orig = deg2rad(latitudeOrigin);
|
||||
_longitudeOrigin = deg2rad(longitudeOrigin);
|
||||
if (_longitudeOrigin > M_PI)
|
||||
_longitudeOrigin -= 2 * M_PI;
|
||||
_longitudeOrigin -= M_2_PI;
|
||||
|
||||
_falseEasting = falseEasting;
|
||||
_falseNorthing = falseNorthing;
|
||||
|
||||
es2 = 2.0 * ellipsoid->flattening() - ellipsoid->flattening()
|
||||
* ellipsoid->flattening();
|
||||
_es = sqrt(es2);
|
||||
_es_over_2 = _es / 2.0;
|
||||
_e = sqrt(ellipsoid->es());
|
||||
_e_over_2 = _e / 2.0;
|
||||
|
||||
_n = sin(lat_orig);
|
||||
|
||||
es_sin = _es * sin(lat_orig);
|
||||
m0 = LAMBERT_m(cos(lat_orig), es_sin);
|
||||
_t0 = LAMBERT1_t(lat_orig, es_sin, _es_over_2);
|
||||
e_sin = _e * sin(lat_orig);
|
||||
m0 = LAMBERT_m(cos(lat_orig), e_sin);
|
||||
_t0 = LAMBERT1_t(lat_orig, e_sin, _e_over_2);
|
||||
|
||||
_rho0 = ellipsoid->radius() * scale * m0 / _n;
|
||||
|
||||
@ -103,7 +94,7 @@ PointD LambertConic1::ll2xy(const Coordinates &c) const
|
||||
|
||||
|
||||
if (fabs(fabs(lat) - M_PI_2) > 1.0e-10) {
|
||||
t = LAMBERT1_t(lat, _es * sin(lat), _es_over_2);
|
||||
t = LAMBERT1_t(lat, _e * sin(lat), _e_over_2);
|
||||
rho = _rho0 * pow(t / _t0, _n);
|
||||
} else
|
||||
rho = 0.0;
|
||||
@ -111,9 +102,9 @@ PointD LambertConic1::ll2xy(const Coordinates &c) const
|
||||
dlam = deg2rad(c.lon()) - _longitudeOrigin;
|
||||
|
||||
if (dlam > M_PI)
|
||||
dlam -= 2 * M_PI;
|
||||
dlam -= M_2_PI;
|
||||
if (dlam < -M_PI)
|
||||
dlam += 2 * M_PI;
|
||||
dlam += M_2_PI;
|
||||
|
||||
theta = _n * dlam;
|
||||
|
||||
@ -154,9 +145,9 @@ Coordinates LambertConic1::xy2ll(const PointD &p) const
|
||||
PHI = M_PI_2 - 2.0 * atan(t);
|
||||
while (fabs(PHI - tempPHI) > tolerance && count) {
|
||||
tempPHI = PHI;
|
||||
es_sin = _es * sin(PHI);
|
||||
es_sin = _e * sin(PHI);
|
||||
PHI = M_PI_2 - 2.0 * atan(t * pow((1.0 - es_sin) / (1.0 + es_sin),
|
||||
_es_over_2));
|
||||
_e_over_2));
|
||||
count--;
|
||||
}
|
||||
|
||||
@ -177,13 +168,13 @@ Coordinates LambertConic1::xy2ll(const PointD &p) const
|
||||
if (lon - M_PI < 3.5e-6)
|
||||
lon = M_PI;
|
||||
else
|
||||
lon -= 2 * M_PI;
|
||||
lon -= M_2_PI;
|
||||
}
|
||||
if (lon < -M_PI) {
|
||||
if (fabs(lon + M_PI) < 3.5e-6)
|
||||
lon = -M_PI;
|
||||
else
|
||||
lon += 2 * M_PI;
|
||||
lon += M_2_PI;
|
||||
}
|
||||
|
||||
if (fabs(lon) < 2.0e-7)
|
||||
@ -207,7 +198,7 @@ LambertConic2::LambertConic2(const Ellipsoid *ellipsoid,
|
||||
double standardParallel1, double standardParallel2, double latitudeOrigin,
|
||||
double longitudeOrigin, double falseEasting, double falseNorthing)
|
||||
{
|
||||
double es, es_over_2, es2, es_sin;
|
||||
double e, e_over_2, e_sin;
|
||||
double lat0;
|
||||
double k0;
|
||||
double t0;
|
||||
@ -227,29 +218,27 @@ LambertConic2::LambertConic2(const Ellipsoid *ellipsoid,
|
||||
sp2 = deg2rad(standardParallel2);
|
||||
|
||||
if (fabs(sp1 - sp2) > 1.0e-10) {
|
||||
es2 = 2 * ellipsoid->flattening() - ellipsoid->flattening()
|
||||
* ellipsoid->flattening();
|
||||
es = sqrt(es2);
|
||||
es_over_2 = es / 2.0;
|
||||
e = sqrt(ellipsoid->es());
|
||||
e_over_2 = e / 2.0;
|
||||
|
||||
es_sin = es * sin(lat_orig);
|
||||
t_olat = LAMBERT2_t(lat_orig, es_sin, es_over_2);
|
||||
e_sin = e * sin(lat_orig);
|
||||
t_olat = LAMBERT2_t(lat_orig, e_sin, e_over_2);
|
||||
|
||||
es_sin = es * sin(sp1);
|
||||
m1 = LAMBERT_m(cos(sp1), es_sin);
|
||||
t1 = LAMBERT2_t(sp1, es_sin, es_over_2);
|
||||
e_sin = e * sin(sp1);
|
||||
m1 = LAMBERT_m(cos(sp1), e_sin);
|
||||
t1 = LAMBERT2_t(sp1, e_sin, e_over_2);
|
||||
|
||||
es_sin = es * sin(sp2);
|
||||
m2 = LAMBERT_m(cos(sp2), es_sin);
|
||||
t2 = LAMBERT2_t(sp2, es_sin, es_over_2);
|
||||
e_sin = e * sin(sp2);
|
||||
m2 = LAMBERT_m(cos(sp2), e_sin);
|
||||
t2 = LAMBERT2_t(sp2, e_sin, e_over_2);
|
||||
|
||||
n = log(m1 / m2) / log(t1 / t2);
|
||||
|
||||
lat0 = asin(n);
|
||||
|
||||
es_sin = es * sin(lat0);
|
||||
m0 = LAMBERT_m(cos(lat0), es_sin);
|
||||
t0 = LAMBERT2_t(lat0, es_sin, es_over_2);
|
||||
e_sin = e * sin(lat0);
|
||||
m0 = LAMBERT_m(cos(lat0), e_sin);
|
||||
t0 = LAMBERT2_t(lat0, e_sin, e_over_2);
|
||||
|
||||
k0 = (m1 / m0) * (pow(t0 / t1, n));
|
||||
|
||||
|
||||
@ -23,8 +23,8 @@ private:
|
||||
double _falseEasting;
|
||||
double _falseNorthing;
|
||||
|
||||
double _es;
|
||||
double _es_over_2;
|
||||
double _e;
|
||||
double _e_over_2;
|
||||
double _n;
|
||||
double _t0;
|
||||
double _rho0;
|
||||
|
||||
@ -15,6 +15,15 @@ LinearUnits::LinearUnits(int code)
|
||||
case 9040:
|
||||
_f = 36.0 / 39.370147;
|
||||
break;
|
||||
case 9041:
|
||||
_f = 12.0 / 39.370147;
|
||||
break;
|
||||
case 9042:
|
||||
_f = 792.0 / 39.370147;
|
||||
break;
|
||||
case 9094:
|
||||
_f = 6378300.0 / 20926201.0;
|
||||
break;
|
||||
default:
|
||||
_f = NAN;
|
||||
}
|
||||
|
||||
14
src/map/map.cpp
Normal file
14
src/map/map.cpp
Normal file
@ -0,0 +1,14 @@
|
||||
#include <QLineF>
|
||||
#include "map.h"
|
||||
|
||||
qreal Map::resolution(const QRectF &rect)
|
||||
{
|
||||
qreal cy = rect.center().y();
|
||||
QPointF cl(rect.left(), cy);
|
||||
QPointF cr(rect.right(), cy);
|
||||
|
||||
qreal ds = xy2ll(cl).distanceTo(xy2ll(cr));
|
||||
qreal ps = QLineF(cl, cr).length();
|
||||
|
||||
return ds/ps;
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QRectF>
|
||||
#include <QColor>
|
||||
#include "common/coordinates.h"
|
||||
|
||||
class QPainter;
|
||||
@ -15,13 +14,13 @@ class Map : public QObject
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Map(QObject *parent = 0) : QObject(parent), _backgroundColor(Qt::white) {}
|
||||
Map(QObject *parent = 0) : QObject(parent) {}
|
||||
virtual ~Map() {}
|
||||
|
||||
virtual const QString &name() const = 0;
|
||||
virtual QString name() const = 0;
|
||||
|
||||
virtual QRectF bounds() const = 0;
|
||||
virtual qreal resolution(const QRectF &rect) const = 0;
|
||||
virtual QRectF bounds() = 0;
|
||||
virtual qreal resolution(const QRectF &rect);
|
||||
|
||||
virtual int zoom() const = 0;
|
||||
virtual void setZoom(int zoom) = 0;
|
||||
@ -41,13 +40,8 @@ public:
|
||||
virtual bool isValid() const {return true;}
|
||||
virtual QString errorString() const {return QString();}
|
||||
|
||||
void setBackgroundColor(const QColor &color) {_backgroundColor = color;}
|
||||
|
||||
signals:
|
||||
void loaded();
|
||||
|
||||
protected:
|
||||
QColor _backgroundColor;
|
||||
};
|
||||
|
||||
#endif // MAP_H
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
#include "mapfile.h"
|
||||
|
||||
|
||||
static double parameter(const QString &str, bool *res)
|
||||
static double parameter(const QString &str, bool *res, double def = 0.0)
|
||||
{
|
||||
QString field = str.trimmed();
|
||||
if (field.isEmpty()) {
|
||||
*res = true;
|
||||
return NAN;
|
||||
return def;
|
||||
}
|
||||
|
||||
return field.toDouble(res);
|
||||
@ -26,7 +26,8 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
|
||||
QByteArray line = device.readLine();
|
||||
|
||||
if (ln == 1) {
|
||||
if (!line.trimmed().startsWith("OziExplorer Map Data File"))
|
||||
QString fileType(QString::fromUtf8(line).trimmed());
|
||||
if (!fileType.startsWith("OziExplorer Map Data File"))
|
||||
return ln;
|
||||
} else if (ln == 2)
|
||||
_name = line.trimmed();
|
||||
@ -116,7 +117,7 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
|
||||
|
||||
setup = Projection::Setup(
|
||||
parameter(list[1], &r[1]), parameter(list[2], &r[2]),
|
||||
parameter(list[3], &r[3]), parameter(list[4], &r[4]),
|
||||
parameter(list[3], &r[3], 1.0), parameter(list[4], &r[4]),
|
||||
parameter(list[5], &r[5]), parameter(list[6], &r[6]),
|
||||
parameter(list[7], &r[7]));
|
||||
|
||||
|
||||
@ -3,33 +3,13 @@
|
||||
#include "atlas.h"
|
||||
#include "offlinemap.h"
|
||||
#include "onlinemap.h"
|
||||
#include "jnxmap.h"
|
||||
#include "mapsource.h"
|
||||
#include "maplist.h"
|
||||
|
||||
|
||||
bool MapList::loadSource(const QString &path, bool dir)
|
||||
bool MapList::loadMap(Map* map, const QString &path, bool dir)
|
||||
{
|
||||
MapSource ms;
|
||||
Map *map;
|
||||
|
||||
if (!(map = ms.loadFile(path))) {
|
||||
if (dir)
|
||||
_errorString += path + ": " + ms.errorString() + "\n";
|
||||
else
|
||||
_errorString = ms.errorString();
|
||||
return false;
|
||||
}
|
||||
|
||||
map->setParent(this);
|
||||
_maps.append(map);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MapList::loadMap(const QString &path, bool dir)
|
||||
{
|
||||
OfflineMap *map = new OfflineMap(path, this);
|
||||
|
||||
if (map->isValid()) {
|
||||
_maps.append(map);
|
||||
return true;
|
||||
@ -38,26 +18,27 @@ bool MapList::loadMap(const QString &path, bool dir)
|
||||
_errorString += path + ": " + map->errorString() + "\n";
|
||||
else
|
||||
_errorString = map->errorString();
|
||||
|
||||
delete map;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool MapList::loadAtlas(const QString &path, bool dir)
|
||||
bool MapList::loadSource(const QString &path, bool dir)
|
||||
{
|
||||
Atlas *atlas = new Atlas(path, this);
|
||||
QString err;
|
||||
Map *map = MapSource::loadMap(path, err);
|
||||
|
||||
if (atlas->isValid()) {
|
||||
_maps.append(atlas);
|
||||
return true;
|
||||
} else {
|
||||
if (!map) {
|
||||
if (dir)
|
||||
_errorString += path + ": " + atlas->errorString() + "\n";
|
||||
_errorString += path + ": " + err + "\n";
|
||||
else
|
||||
_errorString = atlas->errorString();
|
||||
delete atlas;
|
||||
_errorString = err;
|
||||
return false;
|
||||
}
|
||||
map->setParent(this);
|
||||
|
||||
return loadMap(map, path, dir);
|
||||
}
|
||||
|
||||
bool MapList::loadFile(const QString &path, bool *atlas, bool dir)
|
||||
@ -67,14 +48,13 @@ bool MapList::loadFile(const QString &path, bool *atlas, bool dir)
|
||||
|
||||
if (Atlas::isAtlas(path)) {
|
||||
*atlas = true;
|
||||
return loadAtlas(path, dir);
|
||||
} else if (suffix == "xml") {
|
||||
*atlas = false;
|
||||
return loadMap(new Atlas(path, this), path, dir);
|
||||
} else if (suffix == "xml")
|
||||
return loadSource(path, dir);
|
||||
} else {
|
||||
*atlas = false;
|
||||
return loadMap(path, dir);
|
||||
}
|
||||
else if (suffix == "jnx")
|
||||
return loadMap(new JNXMap(path, this), path, dir);
|
||||
else
|
||||
return loadMap(new OfflineMap(path, this), path, dir);
|
||||
}
|
||||
|
||||
bool MapList::loadDirR(const QString &path)
|
||||
@ -83,11 +63,12 @@ bool MapList::loadDirR(const QString &path)
|
||||
md.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
|
||||
md.setSorting(QDir::DirsLast);
|
||||
QFileInfoList ml = md.entryInfoList();
|
||||
bool atlas, ret = true;
|
||||
bool ret = true;
|
||||
|
||||
for (int i = 0; i < ml.size(); i++) {
|
||||
const QFileInfo &fi = ml.at(i);
|
||||
QString suffix = fi.suffix().toLower();
|
||||
bool atlas = false;
|
||||
|
||||
if (fi.isDir() && fi.fileName() != "set") {
|
||||
if (!loadDirR(fi.absoluteFilePath()))
|
||||
@ -127,7 +108,8 @@ void MapList::clear()
|
||||
QString MapList::formats()
|
||||
{
|
||||
return
|
||||
tr("Supported files") + " (*.map *.tar *.tba *.tif *.tiff *.xml);;"
|
||||
tr("Supported files") + " (*.jnx *.map *.tar *.tba *.tif *.tiff *.xml);;"
|
||||
+ tr("Garmin JNX maps") + " (*.jnx);;"
|
||||
+ tr("OziExplorer maps") + " (*.map);;"
|
||||
+ tr("TrekBuddy maps/atlases") + " (*.tar *.tba);;"
|
||||
+ tr("GeoTIFF images") + " (*.tif *.tiff);;"
|
||||
@ -137,6 +119,7 @@ QString MapList::formats()
|
||||
QStringList MapList::filter()
|
||||
{
|
||||
QStringList filter;
|
||||
filter << "*.map" << "*.tba" << "*.tar" << "*.xml" << "*.tif" << "*.tiff";
|
||||
filter << "*.jnx" << "*.map" << "*.tba" << "*.tar" << "*.xml" << "*.tif"
|
||||
<< "*.tiff";
|
||||
return filter;
|
||||
}
|
||||
|
||||
@ -26,12 +26,8 @@ public:
|
||||
private:
|
||||
bool loadFile(const QString &path, bool *atlas, bool dir);
|
||||
bool loadDirR(const QString &path);
|
||||
|
||||
Map *loadListEntry(const QByteArray &line);
|
||||
|
||||
bool loadSource(const QString &path, bool dir);
|
||||
bool loadMap(const QString &path, bool dir);
|
||||
bool loadAtlas(const QString &path, bool dir);
|
||||
bool loadMap(Map *map, const QString &path, bool dir);
|
||||
|
||||
QList<Map*> _maps;
|
||||
QString _errorString;
|
||||
|
||||
@ -164,20 +164,18 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
|
||||
}
|
||||
}
|
||||
|
||||
Map *MapSource::loadFile(const QString &path)
|
||||
Map *MapSource::loadMap(const QString &path, QString &errorString)
|
||||
{
|
||||
QFile file(path);
|
||||
QXmlStreamReader reader;
|
||||
Config config;
|
||||
Map *m;
|
||||
QFile file(path);
|
||||
|
||||
|
||||
if (!file.open(QFile::ReadOnly | QFile::Text)) {
|
||||
_errorString = file.errorString();
|
||||
errorString = file.errorString();
|
||||
return 0;
|
||||
}
|
||||
|
||||
reader.setDevice(&file);
|
||||
QXmlStreamReader reader(&file);
|
||||
if (reader.readNextStartElement()) {
|
||||
if (reader.name() == "map")
|
||||
map(reader, config);
|
||||
@ -185,59 +183,51 @@ Map *MapSource::loadFile(const QString &path)
|
||||
reader.raiseError("Not an online map source file");
|
||||
}
|
||||
if (reader.error()) {
|
||||
_errorString = QString("%1: %2").arg(reader.lineNumber())
|
||||
errorString = QString("%1: %2").arg(reader.lineNumber())
|
||||
.arg(reader.errorString());
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (config.name.isEmpty()) {
|
||||
_errorString = "Missing name definition";
|
||||
errorString = "Missing name definition";
|
||||
return 0;
|
||||
}
|
||||
if (config.url.isEmpty()) {
|
||||
_errorString = "Missing URL definition";
|
||||
errorString = "Missing URL definition";
|
||||
return 0;
|
||||
}
|
||||
if (config.type == WMTS || config.type == WMS) {
|
||||
if (config.layer.isEmpty()) {
|
||||
_errorString = "Missing layer definition";
|
||||
errorString = "Missing layer definition";
|
||||
return 0;
|
||||
}
|
||||
if (config.format.isEmpty()) {
|
||||
_errorString = "Missing format definition";
|
||||
errorString = "Missing format definition";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (config.type == WMTS) {
|
||||
if (config.set.isEmpty()) {
|
||||
_errorString = "Missing set definiton";
|
||||
errorString = "Missing set definiton";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (config.type == WMS) {
|
||||
if (config.crs.isEmpty()) {
|
||||
_errorString = "Missing CRS definiton";
|
||||
errorString = "Missing CRS definiton";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (config.type == WMTS)
|
||||
m = new WMTSMap(config.name, WMTS::Setup(config.url, config.layer,
|
||||
return new WMTSMap(config.name, WMTS::Setup(config.url, config.layer,
|
||||
config.set, config.style, config.format, config.rest,
|
||||
config.coordinateSystem, config.dimensions, config.authorization));
|
||||
else if (config.type == WMS)
|
||||
m = new WMSMap(config.name, WMS::Setup(config.url, config.layer,
|
||||
return new WMSMap(config.name, WMS::Setup(config.url, config.layer,
|
||||
config.style, config.format, config.crs, config.coordinateSystem,
|
||||
config.dimensions, config.authorization));
|
||||
else
|
||||
m = new OnlineMap(config.name, config.url, config.zooms, config.bounds,
|
||||
config.authorization);
|
||||
|
||||
if (!m->isValid()) {
|
||||
_errorString = m->errorString();
|
||||
delete m;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m;
|
||||
return new OnlineMap(config.name, config.url, config.zooms,
|
||||
config.bounds, config.authorization);
|
||||
}
|
||||
|
||||
@ -13,8 +13,7 @@ class QXmlStreamReader;
|
||||
class MapSource
|
||||
{
|
||||
public:
|
||||
Map *loadFile(const QString &path);
|
||||
const QString &errorString() const {return _errorString;}
|
||||
static Map *loadMap(const QString &path, QString &errorString);
|
||||
|
||||
private:
|
||||
enum Type {
|
||||
@ -42,11 +41,9 @@ private:
|
||||
Config();
|
||||
};
|
||||
|
||||
RectC bounds(QXmlStreamReader &reader);
|
||||
Range zooms(QXmlStreamReader &reader);
|
||||
void map(QXmlStreamReader &reader, Config &config);
|
||||
|
||||
QString _errorString;
|
||||
static RectC bounds(QXmlStreamReader &reader);
|
||||
static Range zooms(QXmlStreamReader &reader);
|
||||
static void map(QXmlStreamReader &reader, Config &config);
|
||||
};
|
||||
|
||||
#endif // MAPSOURCE_H
|
||||
|
||||
@ -1,16 +1,123 @@
|
||||
#include <cmath>
|
||||
#include "common/coordinates.h"
|
||||
#include "common/wgs84.h"
|
||||
/*
|
||||
* 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 "ellipsoid.h"
|
||||
#include "mercator.h"
|
||||
|
||||
Mercator::Mercator(const Ellipsoid *ellipsoid, double latitudeOrigin,
|
||||
double longitudeOrigin, double falseEasting, double falseNorthing)
|
||||
{
|
||||
double es = ellipsoid->es();
|
||||
double es2;
|
||||
double es3;
|
||||
double es4;
|
||||
double sin_olat;
|
||||
|
||||
_latitudeOrigin = deg2rad(latitudeOrigin);
|
||||
_longitudeOrigin = deg2rad(longitudeOrigin);
|
||||
if (_longitudeOrigin > M_PI)
|
||||
_longitudeOrigin -= M_2_PI;
|
||||
_falseNorthing = falseNorthing;
|
||||
_falseEasting = falseEasting;
|
||||
|
||||
_a = ellipsoid->radius();
|
||||
_e = sqrt(es);
|
||||
|
||||
sin_olat = sin(_latitudeOrigin);
|
||||
_scaleFactor = 1.0 / (sqrt(1.e0 - es * sin_olat * sin_olat)
|
||||
/ cos(_latitudeOrigin));
|
||||
es2 = es * es;
|
||||
es3 = es2 * es;
|
||||
es4 = es3 * es;
|
||||
_ab = es / 2.e0 + 5.e0 * es2 / 24.e0 + es3 / 12.e0 + 13.e0 * es4 / 360.e0;
|
||||
_bb = 7.e0 * es2 / 48.e0 + 29.e0 * es3 / 240.e0 + 811.e0 * es4 / 11520.e0;
|
||||
_cb = 7.e0 * es3 / 120.e0 + 81.e0 * es4 / 1120.e0;
|
||||
_db = 4279.e0 * es4 / 161280.e0;
|
||||
}
|
||||
|
||||
PointD Mercator::ll2xy(const Coordinates &c) const
|
||||
{
|
||||
return PointD(deg2rad(c.lon()) * WGS84_RADIUS,
|
||||
log(tan(M_PI/4.0 + deg2rad(c.lat())/2.0)) * WGS84_RADIUS);
|
||||
double lon = deg2rad(c.lon());
|
||||
double lat = deg2rad(c.lat());
|
||||
double ctanz2;
|
||||
double e_x_sinlat;
|
||||
double delta_lon;
|
||||
double tan_temp;
|
||||
double pow_temp;
|
||||
|
||||
if (lon > M_PI)
|
||||
lon -= M_2_PI;
|
||||
e_x_sinlat = _e * sin(lat);
|
||||
tan_temp = tan(M_PI_4 + lat / 2.e0);
|
||||
pow_temp = pow((1.e0 - e_x_sinlat) / (1.e0 + e_x_sinlat), _e / 2.e0);
|
||||
ctanz2 = tan_temp * pow_temp;
|
||||
delta_lon = lon - _longitudeOrigin;
|
||||
if (delta_lon > M_PI)
|
||||
delta_lon -= M_2_PI;
|
||||
if (delta_lon < -M_PI)
|
||||
delta_lon += M_2_PI;
|
||||
|
||||
return PointD(_scaleFactor * _a * delta_lon + _falseEasting,
|
||||
_scaleFactor * _a * log(ctanz2) + _falseNorthing);
|
||||
}
|
||||
|
||||
Coordinates Mercator::xy2ll(const PointD &p) const
|
||||
{
|
||||
return Coordinates(rad2deg(p.x() / WGS84_RADIUS),
|
||||
rad2deg(2 * atan(exp(p.y() / WGS84_RADIUS)) - M_PI/2));
|
||||
double dx;
|
||||
double dy;
|
||||
double xphi;
|
||||
double lat, lon;
|
||||
|
||||
dy = p.y() - _falseNorthing;
|
||||
dx = p.x() - _falseEasting;
|
||||
lon = _longitudeOrigin + dx / (_scaleFactor * _a);
|
||||
xphi = M_PI_2 - 2.e0 * atan(1.e0 / exp(dy / (_scaleFactor * _a)));
|
||||
lat = xphi + _ab * sin(2.e0 * xphi) + _bb * sin(4.e0 * xphi)
|
||||
+ _cb * sin(6.e0 * xphi) + _db * sin(8.e0 * xphi);
|
||||
if (lon > M_PI)
|
||||
lon -= M_2_PI;
|
||||
if (lon < -M_PI)
|
||||
lon += M_2_PI;
|
||||
|
||||
return Coordinates(rad2deg(lon), rad2deg(lat));
|
||||
}
|
||||
|
||||
@ -3,13 +3,27 @@
|
||||
|
||||
#include "ct.h"
|
||||
|
||||
class Ellipsoid;
|
||||
|
||||
class Mercator : public CT
|
||||
{
|
||||
public:
|
||||
Mercator(const Ellipsoid *ellipsoid, double latitudeOrigin,
|
||||
double longitudeOrigin, double falseEasting, double falseNorthing);
|
||||
|
||||
virtual CT *clone() const {return new Mercator(*this);}
|
||||
|
||||
virtual PointD ll2xy(const Coordinates &c) const;
|
||||
virtual Coordinates xy2ll(const PointD &p) const;
|
||||
|
||||
private:
|
||||
double _a, _e;
|
||||
double _latitudeOrigin;
|
||||
double _longitudeOrigin;
|
||||
double _falseNorthing;
|
||||
double _falseEasting;
|
||||
double _scaleFactor;
|
||||
double _ab, _bb, _cb, _db;
|
||||
};
|
||||
|
||||
#endif // MERCATOR_H
|
||||
|
||||
@ -262,12 +262,10 @@ void OfflineMap::drawTiled(QPainter *painter, const QRectF &rect) const
|
||||
} else
|
||||
pixmap = QPixmap(tileName);
|
||||
|
||||
if (pixmap.isNull()) {
|
||||
if (pixmap.isNull())
|
||||
qWarning("%s: error loading tile image", qPrintable(
|
||||
_tile.path.arg(QString::number(x), QString::number(y))));
|
||||
painter->fillRect(QRectF(QPoint(x, y), _tile.size),
|
||||
_backgroundColor);
|
||||
} else
|
||||
else
|
||||
painter->drawPixmap(QPoint(x, y), pixmap);
|
||||
}
|
||||
}
|
||||
@ -294,11 +292,9 @@ void OfflineMap::drawOZF(QPainter *painter, const QRectF &rect) const
|
||||
QPixmapCache::insert(key, pixmap);
|
||||
}
|
||||
|
||||
if (pixmap.isNull()) {
|
||||
if (pixmap.isNull())
|
||||
qWarning("%s: error loading tile image", qPrintable(key));
|
||||
painter->fillRect(QRectF(QPoint(x, y), _ozf->tileSize()),
|
||||
_backgroundColor);
|
||||
} else
|
||||
else
|
||||
painter->drawPixmap(QPoint(x, y), pixmap);
|
||||
}
|
||||
}
|
||||
@ -321,17 +317,15 @@ void OfflineMap::draw(QPainter *painter, const QRectF &rect, bool block)
|
||||
drawTiled(painter, rect);
|
||||
else if (_img && !_img->isNull())
|
||||
drawImage(painter, rect);
|
||||
else
|
||||
painter->fillRect(rect, _backgroundColor);
|
||||
}
|
||||
|
||||
QPointF OfflineMap::ll2xy(const Coordinates &c) const
|
||||
QPointF OfflineMap::ll2xy(const Coordinates &c)
|
||||
{
|
||||
QPointF p(_transform.proj2img(_projection.ll2xy(c)));
|
||||
return _ozf ? QPointF(p.x() * _scale.x(), p.y() * _scale.y()) : p;
|
||||
}
|
||||
|
||||
Coordinates OfflineMap::xy2ll(const QPointF &p) const
|
||||
Coordinates OfflineMap::xy2ll(const QPointF &p)
|
||||
{
|
||||
return _ozf
|
||||
? _projection.xy2ll(_transform.img2proj(QPointF(p.x() / _scale.x(),
|
||||
@ -339,24 +333,13 @@ Coordinates OfflineMap::xy2ll(const QPointF &p) const
|
||||
: _projection.xy2ll(_transform.img2proj(p));
|
||||
}
|
||||
|
||||
QRectF OfflineMap::bounds() const
|
||||
QRectF OfflineMap::bounds()
|
||||
{
|
||||
return _ozf
|
||||
? QRectF(QPointF(0, 0), _ozf->size(_zoom))
|
||||
: QRectF(QPointF(0, 0), _map.size);
|
||||
}
|
||||
|
||||
qreal OfflineMap::resolution(const QRectF &rect) const
|
||||
{
|
||||
Coordinates tl = xy2ll((rect.topLeft()));
|
||||
Coordinates br = xy2ll(rect.bottomRight());
|
||||
|
||||
qreal ds = tl.distanceTo(br);
|
||||
qreal ps = QLineF(rect.topLeft(), rect.bottomRight()).length();
|
||||
|
||||
return ds/ps;
|
||||
}
|
||||
|
||||
int OfflineMap::zoomFit(const QSize &size, const RectC &rect)
|
||||
{
|
||||
if (!_ozf)
|
||||
|
||||
@ -18,10 +18,9 @@ public:
|
||||
OfflineMap(const QString &fileName, Tar &tar, QObject *parent = 0);
|
||||
~OfflineMap();
|
||||
|
||||
const QString &name() const {return _name;}
|
||||
QString name() const {return _name;}
|
||||
|
||||
QRectF bounds() const;
|
||||
qreal resolution(const QRectF &rect) const;
|
||||
QRectF bounds();
|
||||
|
||||
int zoom() const {return _zoom;}
|
||||
void setZoom(int zoom) {_zoom = zoom;}
|
||||
@ -29,10 +28,8 @@ public:
|
||||
int zoomIn();
|
||||
int zoomOut();
|
||||
|
||||
QPointF ll2xy(const Coordinates &c)
|
||||
{return static_cast<const OfflineMap &>(*this).ll2xy(c);}
|
||||
Coordinates xy2ll(const QPointF &p)
|
||||
{return static_cast<const OfflineMap &>(*this).xy2ll(p);}
|
||||
QPointF ll2xy(const Coordinates &c);
|
||||
Coordinates xy2ll(const QPointF &p);
|
||||
|
||||
void draw(QPainter *painter, const QRectF &rect, bool block);
|
||||
|
||||
@ -57,9 +54,6 @@ private:
|
||||
bool isValid() const {return size.isValid() && !path.isEmpty();}
|
||||
};
|
||||
|
||||
QPointF ll2xy(const Coordinates &c) const;
|
||||
Coordinates xy2ll(const QPointF &p) const;
|
||||
|
||||
bool setTileInfo(const QStringList &tiles, const QString &path = QString());
|
||||
bool setImageInfo(const QString &path);
|
||||
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
static QPointF ll2m(const Coordinates &c)
|
||||
{
|
||||
return QPointF(c.lon(), rad2deg(log(tan(M_PI/4.0 + deg2rad(c.lat())/2.0))));
|
||||
return QPointF(c.lon(), rad2deg(log(tan(M_PI_4 + deg2rad(c.lat())/2.0))));
|
||||
}
|
||||
|
||||
static Coordinates m2ll(const QPointF &p)
|
||||
{
|
||||
return Coordinates(p.x(), rad2deg(2 * atan(exp(deg2rad(p.y()))) - M_PI/2));
|
||||
return Coordinates(p.x(), rad2deg(2.0 * atan(exp(deg2rad(p.y()))) - M_PI_2));
|
||||
}
|
||||
|
||||
static QPoint mercator2tile(const QPointF &m, int z)
|
||||
@ -64,7 +64,7 @@ OnlineMap::OnlineMap(const QString &name, const QString &url,
|
||||
_valid = true;
|
||||
}
|
||||
|
||||
QRectF OnlineMap::bounds() const
|
||||
QRectF OnlineMap::bounds()
|
||||
{
|
||||
return QRectF(ll2xy(_bounds.topLeft()), ll2xy(_bounds.bottomRight()));
|
||||
}
|
||||
@ -92,7 +92,7 @@ int OnlineMap::zoomFit(const QSize &size, const RectC &rect)
|
||||
return _zoom;
|
||||
}
|
||||
|
||||
qreal OnlineMap::resolution(const QRectF &rect) const
|
||||
qreal OnlineMap::resolution(const QRectF &rect)
|
||||
{
|
||||
qreal scale = zoom2scale(_zoom);
|
||||
|
||||
@ -136,22 +136,19 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, bool block)
|
||||
Tile &t = tiles[i];
|
||||
QPoint tp(tl.x() + (t.xy().x() - tile.x()) * TILE_SIZE,
|
||||
tl.y() + (t.xy().y() - tile.y()) * TILE_SIZE);
|
||||
if (t.pixmap().isNull())
|
||||
painter->fillRect(QRect(tp, QSize(TILE_SIZE, TILE_SIZE)),
|
||||
_backgroundColor);
|
||||
else
|
||||
if (!t.pixmap().isNull())
|
||||
painter->drawPixmap(tp, t.pixmap());
|
||||
}
|
||||
}
|
||||
|
||||
QPointF OnlineMap::ll2xy(const Coordinates &c) const
|
||||
QPointF OnlineMap::ll2xy(const Coordinates &c)
|
||||
{
|
||||
qreal scale = zoom2scale(_zoom);
|
||||
QPointF m = ll2m(c);
|
||||
return QPointF(m.x() / scale, m.y() / -scale);
|
||||
}
|
||||
|
||||
Coordinates OnlineMap::xy2ll(const QPointF &p) const
|
||||
Coordinates OnlineMap::xy2ll(const QPointF &p)
|
||||
{
|
||||
qreal scale = zoom2scale(_zoom);
|
||||
return m2ll(QPointF(p.x() * scale, -p.y() * scale));
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user