root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-01 05:19:15 +02:00
Code Issues Projects Releases Activity

Compare commits

base: root:3.8
Branches Tags
root:master root:android-latest root:gh-pages
root:13.44 root:13.43 root:13.42 root:13.41 root:13.40 root:13.39 root:13.38 root:13.37 root:13.36 root:13.35 root:13.34 root:13.33 root:13.32 root:13.31 root:13.30 root:13.29 root:13.28 root:13.27 root:13.26 root:13.25 root:13.24 root:13.23 root:13.22 root:13.21 root:13.20 root:13.19 root:13.18 root:13.17 root:13.16 root:13.15 root:13.14 root:13.13 root:13.12 root:13.11 root:13.10 root:13.9 root:13.8 root:13.7 root:13.6 root:13.5 root:13.4 root:13.3 root:13.2 root:13.1 root:13.0 root:12.4 root:12.3 root:12.2 root:12.1 root:12.0 root:11.12 root:11.11 root:11.10 root:11.9 root:11.8 root:11.7 root:11.6 root:11.5 root:11.4 root:11.3 root:11.2 root:11.1 root:11.0 root:10.7 root:10.6 root:10.5 root:10.4 root:10.3 root:10.2 root:10.1 root:10.0 root:9.12 root:9.11 root:9.10 root:9.9 root:9.8 root:9.7 root:9.6 root:9.5 root:9.4 root:9.3 root:9.2 root:9.1 root:9.0 root:8.9 root:8.8 root:8.7 root:8.6 root:8.5 root:8.4 root:8.3 root:8.2 root:8.1 root:8.0 root:7.38 root:7.37 root:7.36 root:7.35 root:7.34 root:7.33 root:7.32 root:7.31 root:7.30 root:7.29 root:7.28 root:7.27 root:7.26 root:7.25 root:7.24 root:7.23 root:7.22 root:7.21 root:7.20 root:7.19 root:7.18 root:7.17 root:7.16 root:7.15 root:7.14 root:7.13 root:7.12 root:7.11 root:7.10 root:7.9 root:7.8 root:7.7 root:7.6 root:7.5 root:7.4 root:7.3 root:7.2 root:7.1 root:7.0 root:6.3 root:6.2 root:6.1 root:6.0 root:5.18 root:5.17 root:5.16 root:5.15 root:5.14 root:5.13 root:5.12 root:5.11 root:5.10 root:5.9 root:5.8 root:5.7 root:5.6 root:5.5 root:5.4 root:5.3 root:5.2 root:5.1 root:5.0 root:4.19 root:4.18 root:4.17 root:4.16 root:4.15 root:4.14 root:4.13 root:4.12 root:4.11 root:4.10 root:4.9 root:4.8 root:4.7 root:4.6 root:4.5 root:4.4 root:4.3 root:4.2 root:4.1 root:4.0 root:3.10 root:3.9 root:3.8 root:3.7 root:3.6 root:3.5 root:3.4 root:3.3 root:3.2 root:3.1 root:3.0 root:2.20 root:2.19 root:2.18 root:2.17 root:2.16 root:2.15 root:2.14 root:2.13 root:2.12 root:2.11 root:2.10 root:2.9 root:2.8 root:2.7 root:2.6 root:2.5 root:2.4 root:2.3 root:2.2 root:2.1 root:2.0 root:1.1 root:1.0
...
compare: root:3.10
Branches Tags
root:master root:android-latest root:gh-pages
root:13.44 root:13.43 root:13.42 root:13.41 root:13.40 root:13.39 root:13.38 root:13.37 root:13.36 root:13.35 root:13.34 root:13.33 root:13.32 root:13.31 root:13.30 root:13.29 root:13.28 root:13.27 root:13.26 root:13.25 root:13.24 root:13.23 root:13.22 root:13.21 root:13.20 root:13.19 root:13.18 root:13.17 root:13.16 root:13.15 root:13.14 root:13.13 root:13.12 root:13.11 root:13.10 root:13.9 root:13.8 root:13.7 root:13.6 root:13.5 root:13.4 root:13.3 root:13.2 root:13.1 root:13.0 root:12.4 root:12.3 root:12.2 root:12.1 root:12.0 root:11.12 root:11.11 root:11.10 root:11.9 root:11.8 root:11.7 root:11.6 root:11.5 root:11.4 root:11.3 root:11.2 root:11.1 root:11.0 root:10.7 root:10.6 root:10.5 root:10.4 root:10.3 root:10.2 root:10.1 root:10.0 root:9.12 root:9.11 root:9.10 root:9.9 root:9.8 root:9.7 root:9.6 root:9.5 root:9.4 root:9.3 root:9.2 root:9.1 root:9.0 root:8.9 root:8.8 root:8.7 root:8.6 root:8.5 root:8.4 root:8.3 root:8.2 root:8.1 root:8.0 root:7.38 root:7.37 root:7.36 root:7.35 root:7.34 root:7.33 root:7.32 root:7.31 root:7.30 root:7.29 root:7.28 root:7.27 root:7.26 root:7.25 root:7.24 root:7.23 root:7.22 root:7.21 root:7.20 root:7.19 root:7.18 root:7.17 root:7.16 root:7.15 root:7.14 root:7.13 root:7.12 root:7.11 root:7.10 root:7.9 root:7.8 root:7.7 root:7.6 root:7.5 root:7.4 root:7.3 root:7.2 root:7.1 root:7.0 root:6.3 root:6.2 root:6.1 root:6.0 root:5.18 root:5.17 root:5.16 root:5.15 root:5.14 root:5.13 root:5.12 root:5.11 root:5.10 root:5.9 root:5.8 root:5.7 root:5.6 root:5.5 root:5.4 root:5.3 root:5.2 root:5.1 root:5.0 root:4.19 root:4.18 root:4.17 root:4.16 root:4.15 root:4.14 root:4.13 root:4.12 root:4.11 root:4.10 root:4.9 root:4.8 root:4.7 root:4.6 root:4.5 root:4.4 root:4.3 root:4.2 root:4.1 root:4.0 root:3.10 root:3.9 root:3.8 root:3.7 root:3.6 root:3.5 root:3.4 root:3.3 root:3.2 root:3.1 root:3.0 root:2.20 root:2.19 root:2.18 root:2.17 root:2.16 root:2.15 root:2.14 root:2.13 root:2.12 root:2.11 root:2.10 root:2.9 root:2.8 root:2.7 root:2.6 root:2.5 root:2.4 root:2.3 root:2.2 root:2.1 root:2.0 root:1.1 root:1.0

20 Commits
3.8 ... 3.10

Author SHA1 Message Date
Martin Tůma
f83e3376b4 Version++ 2017-02-13 20:17:05 +01:00
Martin Tůma
311aeecb27 Fixed broken OpenSSL/ANGLE install when MSVC runtime is installed. 2017-02-13 20:13:13 +01:00
Martin Tůma
338ace6dff Added missing inicialization 2017-02-13 20:12:48 +01:00
Martin Tůma
51e9ef4416 Merge pull request #20 from eson57/patch-3 
Update gpxsee_sv.ts
 2017-02-13 10:19:29 +01:00
Åke Engelbrektson
ebefe54510 Update gpxsee_sv.ts 2017-02-13 04:19:23 +01:00
Martin Tůma
1ec732c78d Version++ 2017-02-12 20:13:04 +01:00
Martin Tůma
ff733b2705 Indicate moving time in status bar 2017-02-12 20:11:36 +01:00
Martin Tůma
99e32b1a15 Made the moving time switch affect all related values 
More standardized time type switching (menu)
 2017-02-12 19:57:55 +01:00
Martin Tůma
f4a992a66f Added missing background color definition (OpenGL issue fix) 2017-02-12 17:49:54 +01:00
Martin Tůma
f52fa9a9ef Removed obsolete stuff 2017-02-12 17:38:20 +01:00
Martin Tůma
61f3a1c932 Added OpenSSL to Windows builds 
Skipped Windows XP support in Windows builds
 2017-02-12 17:34:13 +01:00
Martin Tůma
93313da01d Fixed QNetworkManager related crashes on program termination. 2017-02-07 23:36:06 +01:00
Martin Tůma
a253ac1796 Localization update 2017-02-05 16:10:42 +01:00
Martin Tůma
e6a0eeefcc Better Time/Moving Time display approach. 2017-02-05 16:01:54 +01:00
Martin Tůma
214d7c40dc Added missing coordinates bounding rectangle normalization 
(Fixes issue #19)
 2017-02-03 00:54:57 +01:00
Martin Tůma
cd89706d74 Do not use hardcoded control keys info 2017-02-02 20:06:17 +01:00
Martin Tůma
961eac9324 Added moving time info. 
Added special track data processing for "pause states".
 2017-01-31 09:37:01 +01:00
Martin Tůma
ddacac8d2e Added Open Topo Map to default map sources 2017-01-26 09:46:36 +01:00
Martin Tůma
bd9b5dbc6a Merge pull request #17 from eson57/patch-2 
Update gpxsee_sv.ts
 2017-01-24 23:57:29 +01:00
Åke Engelbrektson
8b813b5879 Update gpxsee_sv.ts 2017-01-24 21:32:49 +01:00
34 changed files with 649 additions and 379 deletions
Expand all files Collapse all files

6
build/env.bat
View File

@ -1,6 +0,0 @@
CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
set PATH=C:\qt\qtbase\bin;%PATH%
set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib;%LIB%
set CL=/D_USING_V110_SDK71_

6
build/env64.bat
View File

@ -1,6 +0,0 @@
CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
set PATH=C:\qt64\qtbase\bin;%PATH%
set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\x64;%LIB%
set CL=/D_USING_V110_SDK71_

5
gpxsee.pro
View File

@ -1,5 +1,5 @@
TARGET = GPXSee
VERSION = 3.8
VERSION = 3.10
QT += core \
gui \
network
@ -76,7 +76,8 @@ HEADERS += src/config.h \
src/optionsdialog.h \
src/colorbox.h \
src/stylecombobox.h \
src/opengl.h
src/opengl.h \
src/timetype.h
SOURCES += src/main.cpp \
src/gui.cpp \
src/poi.cpp \

234
lang/gpxsee_cs.ts
View File

@ -190,290 +190,301 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/gui.cpp" line="552"/>
<location filename="../src/gui.cpp" line="569"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
</message>
<message>
<location filename="../src/gui.cpp" line="616"/>
<location filename="../src/gui.cpp" line="633"/>
<source>Open file</source>
<translation>Otevřít soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="705"/>
<location filename="../src/gui.cpp" line="723"/>
<source>Open POI file</source>
<translation>Otevřít POI soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="223"/>
<location filename="../src/gui.cpp" line="227"/>
<source>Open</source>
<translation>Otevřít</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="207"/>
<location filename="../src/gui.cpp" line="211"/>
<source>Quit</source>
<translation>Ukončit</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="215"/>
<location filename="../src/gui.cpp" line="568"/>
<location filename="../src/gui.cpp" line="569"/>
<location filename="../src/gui.cpp" line="219"/>
<location filename="../src/gui.cpp" line="585"/>
<location filename="../src/gui.cpp" line="586"/>
<source>Keyboard controls</source>
<translation>Ovládací klávesy</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="239"/>
<location filename="../src/gui.cpp" line="243"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="245"/>
<location filename="../src/gui.cpp" line="249"/>
<source>Reload</source>
<translation>Znovu načíst</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="478"/>
<location filename="../src/gui.cpp" line="497"/>
<source>Show</source>
<translation>Zobrazit</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="399"/>
<location filename="../src/gui.cpp" line="472"/>
<location filename="../src/gui.cpp" line="415"/>
<location filename="../src/gui.cpp" line="491"/>
<source>File</source>
<translation>Soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="102"/>
<location filename="../src/gui.cpp" line="104"/>
<source>FIT files (*.fit)</source>
<translation>Soubory FIT (*.fit)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="103"/>
<location filename="../src/gui.cpp" line="105"/>
<source>IGC files (*.igc)</source>
<translation>Soubory IGC (*.igc)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="104"/>
<location filename="../src/gui.cpp" line="106"/>
<source>NMEA files (*.nmea)</source>
<translation>Soubory NMEA (*.nmea)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="213"/>
<location filename="../src/gui.cpp" line="591"/>
<location filename="../src/gui.cpp" line="592"/>
<location filename="../src/gui.cpp" line="217"/>
<location filename="../src/gui.cpp" line="608"/>
<location filename="../src/gui.cpp" line="609"/>
<source>Data sources</source>
<translation>Zdroje dat</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="253"/>
<location filename="../src/gui.cpp" line="257"/>
<source>Load POI file</source>
<translation>Nahrát POI soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="256"/>
<location filename="../src/gui.cpp" line="260"/>
<source>Close POI files</source>
<translation>Zavřit POI soubory</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="258"/>
<location filename="../src/gui.cpp" line="262"/>
<source>Overlap POIs</source>
<translation>Překrývat POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="262"/>
<location filename="../src/gui.cpp" line="266"/>
<source>Show POI labels</source>
<translation>Zobrazit názvy POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="267"/>
<location filename="../src/gui.cpp" line="271"/>
<source>Show POIs</source>
<translation>Zobrazit POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="276"/>
<location filename="../src/gui.cpp" line="280"/>
<source>Show map</source>
<translation>Zobrazit mapu</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="282"/>
<location filename="../src/gui.cpp" line="286"/>
<source>Clear tile cache</source>
<translation>Vymazat mezipaměť dlaždic</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="291"/>
<location filename="../src/gui.cpp" line="295"/>
<location filename="../src/gui.cpp" line="578"/>
<location filename="../src/gui.cpp" line="299"/>
<location filename="../src/gui.cpp" line="597"/>
<source>Next map</source>
<translation>Následující mapa</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="302"/>
<location filename="../src/gui.cpp" line="306"/>
<source>Show tracks</source>
<translation>Zobrazit cesty</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="306"/>
<location filename="../src/gui.cpp" line="310"/>
<source>Show routes</source>
<translation>Zobrazit trasy</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="310"/>
<location filename="../src/gui.cpp" line="314"/>
<source>Show waypoints</source>
<translation>Zobrazit navigační body</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="314"/>
<location filename="../src/gui.cpp" line="318"/>
<source>Waypoint labels</source>
<translation>Názvy navigačních bodů</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="325"/>
<location filename="../src/gui.cpp" line="329"/>
<source>Show graphs</source>
<translation>Zobrazit grafy</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="347"/>
<location filename="../src/gui.cpp" line="351"/>
<source>Show grid</source>
<translation>Zobrazit mřížku</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="353"/>
<location filename="../src/gui.cpp" line="357"/>
<source>Show toolbars</source>
<translation>Zobrazovat nástrojové lišty</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="359"/>
<location filename="../src/gui.cpp" line="363"/>
<source>Total time</source>
<translation>Celkový čas</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="368"/>
<location filename="../src/gui.cpp" line="876"/>
<source>Moving time</source>
<translation>Čistý čas</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="375"/>
<source>Metric</source>
<translation>Metrické</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="364"/>
<location filename="../src/gui.cpp" line="380"/>
<source>Imperial</source>
<translation>Imperiální</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="370"/>
<location filename="../src/gui.cpp" line="386"/>
<source>Fullscreen mode</source>
<translation>Celoobrazovkový režim</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="376"/>
<location filename="../src/gui.cpp" line="392"/>
<source>Options...</source>
<translation>Nastavení...</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="381"/>
<location filename="../src/gui.cpp" line="397"/>
<source>Next</source>
<translation>Následující</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="384"/>
<location filename="../src/gui.cpp" line="400"/>
<source>Previous</source>
<translation>Předchozí</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="388"/>
<location filename="../src/gui.cpp" line="404"/>
<source>Last</source>
<translation>Poslední</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="391"/>
<location filename="../src/gui.cpp" line="407"/>
<source>First</source>
<translation>První</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="413"/>
<location filename="../src/gui.cpp" line="429"/>
<source>Map</source>
<translation>Mapa</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="420"/>
<location filename="../src/gui.cpp" line="436"/>
<source>Graph</source>
<translation>Graf</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="428"/>
<location filename="../src/gui.cpp" line="444"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="429"/>
<location filename="../src/gui.cpp" line="445"/>
<source>POI files</source>
<translation>POI soubory</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="440"/>
<location filename="../src/gui.cpp" line="456"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="441"/>
<location filename="../src/gui.cpp" line="457"/>
<source>Display</source>
<translation>Zobrazit</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="449"/>
<location filename="../src/gui.cpp" line="465"/>
<source>Settings</source>
<translation>Nastavení</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="450"/>
<location filename="../src/gui.cpp" line="469"/>
<source>Units</source>
<translation>Jednotky</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="459"/>
<location filename="../src/gui.cpp" line="478"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="580"/>
<location filename="../src/gui.cpp" line="598"/>
<source>Previous map</source>
<translation>Předchozí mapa</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="1060"/>
<location filename="../src/gui.cpp" line="1082"/>
<source>No files loaded</source>
<translation>Nejsou načteny žádné soubory</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="103"/>
<location filename="../src/gui.cpp" line="105"/>
<source>GPX files (*.gpx)</source>
<translation>Soubory GPX (*.gpx)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="105"/>
<location filename="../src/gui.cpp" line="107"/>
<source>TCX files (*.tcx)</source>
<translation>Soubory TCX (*.tcx)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="104"/>
<location filename="../src/gui.cpp" line="106"/>
<source>KML files (*.kml)</source>
<translation>Soubory KML (*.kml)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="102"/>
<location filename="../src/gui.cpp" line="104"/>
<source>CSV files (*.csv)</source>
<translation>Soubory CSV (*.csv)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="105"/>
<location filename="../src/gui.cpp" line="107"/>
<source>All files (*)</source>
<translation>Všechny soubory (*)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="844"/>
<location filename="../src/gui.cpp" line="847"/>
<location filename="../src/gui.cpp" line="862"/>
<location filename="../src/gui.cpp" line="865"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="836"/>
<location filename="../src/gui.cpp" line="854"/>
<source>Routes</source>
<translation>Trasy</translation>
</message>
<message numerus="yes">
<location filename="../src/gui.cpp" line="1064"/>
<location filename="../src/gui.cpp" line="1086"/>
<source>%n files</source>
<translation>
<numerusform>%n soubor</numerusform>
@ -482,131 +493,132 @@
</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="571"/>
<location filename="../src/gui.cpp" line="588"/>
<source>Next file</source>
<translation>Následující soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="548"/>
<location filename="../src/gui.cpp" line="566"/>
<source>Version </source>
<translation>Verze </translation>
</message>
<message>
<location filename="../src/gui.cpp" line="228"/>
<location filename="../src/gui.cpp" line="232"/>
<source>Print...</source>
<translation>Tisknout...</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="233"/>
<location filename="../src/gui.cpp" line="237"/>
<source>Export to PDF...</source>
<translation>Exportovat do PDF...</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="838"/>
<location filename="../src/gui.cpp" line="856"/>
<source>Waypoints</source>
<translation>Navigační body</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="572"/>
<location filename="../src/gui.cpp" line="590"/>
<source>Previous file</source>
<translation>Předchozí soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="101"/>
<location filename="../src/gui.cpp" line="103"/>
<source>Supported files (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</source>
<translation>Podporované soubory (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="318"/>
<location filename="../src/gui.cpp" line="322"/>
<source>Route waypoints</source>
<translation>Body tras</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="574"/>
<location filename="../src/gui.cpp" line="592"/>
<source>First file</source>
<translation>První soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="575"/>
<location filename="../src/gui.cpp" line="594"/>
<source>Last file</source>
<translation>Poslední soubor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="576"/>
<location filename="../src/gui.cpp" line="595"/>
<source>Append modifier</source>
<translation>Modifikátor nahradit/přidat</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="595"/>
<location filename="../src/gui.cpp" line="612"/>
<source>Map (tiles) source URLs are read on program startup from the following file:</source>
<translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="598"/>
<location filename="../src/gui.cpp" line="615"/>
<source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
<translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="606"/>
<location filename="../src/gui.cpp" line="623"/>
<source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
<translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="694"/>
<location filename="../src/gui.cpp" line="712"/>
<source>Error loading data file:</source>
<translation>Datový soubor nelze načíst:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="697"/>
<location filename="../src/gui.cpp" line="722"/>
<location filename="../src/gui.cpp" line="715"/>
<location filename="../src/gui.cpp" line="740"/>
<source>Line: %1</source>
<translation>Řádka: %1</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="719"/>
<location filename="../src/gui.cpp" line="737"/>
<source>Error loading POI file:</source>
<translation>Soubor POI nelze načíst:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="830"/>
<location filename="../src/gui.cpp" line="848"/>
<source>Name</source>
<translation>Název</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="834"/>
<location filename="../src/gui.cpp" line="852"/>
<source>Tracks</source>
<translation>Cesty</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="218"/>
<location filename="../src/gui.cpp" line="546"/>
<location filename="../src/gui.cpp" line="222"/>
<location filename="../src/gui.cpp" line="565"/>
<source>About GPXSee</source>
<translation>O aplikaci GPXSee</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="483"/>
<location filename="../src/gui.cpp" line="502"/>
<source>Navigation</source>
<translation>Navigace</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="594"/>
<location filename="../src/gui.cpp" line="611"/>
<source>Map sources</source>
<translation>Mapové zdroje</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="605"/>
<location filename="../src/gui.cpp" line="622"/>
<source>POIs</source>
<translation>POI body</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="333"/>
<location filename="../src/gui.cpp" line="854"/>
<location filename="../src/gui.cpp" line="337"/>
<location filename="../src/gui.cpp" line="872"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="340"/>
<location filename="../src/gui.cpp" line="856"/>
<location filename="../src/gui.cpp" line="344"/>
<location filename="../src/gui.cpp" line="466"/>
<location filename="../src/gui.cpp" line="874"/>
<source>Time</source>
<translation>Čas</translation>
</message>
@ -749,7 +761,7 @@
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="115"/>
<location filename="../src/optionsdialog.cpp" line="180"/>
<location filename="../src/optionsdialog.cpp" line="183"/>
<source>Graphs</source>
<translation>Grafy</translation>
</message>
@ -770,7 +782,7 @@
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="140"/>
<location filename="../src/optionsdialog.cpp" line="221"/>
<location filename="../src/optionsdialog.cpp" line="224"/>
<source>POI</source>
<translation>POI</translation>
</message>
@ -796,42 +808,47 @@
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="155"/>
<source>Moving time</source>
<translation>Čistý čas</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="157"/>
<source>Item count (&gt;1)</source>
<translation>Počet objektů (&gt;1)</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="169"/>
<location filename="../src/optionsdialog.cpp" line="172"/>
<source>Separate graph page</source>
<translation>Samostatná stránka s grafy</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="179"/>
<location filename="../src/optionsdialog.cpp" line="182"/>
<source>Header</source>
<translation>Záhlaví</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="187"/>
<location filename="../src/optionsdialog.cpp" line="190"/>
<source>Use OpenGL</source>
<translation>Používat OpenGL</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="203"/>
<location filename="../src/optionsdialog.cpp" line="224"/>
<location filename="../src/optionsdialog.cpp" line="206"/>
<location filename="../src/optionsdialog.cpp" line="227"/>
<source>System</source>
<translation>Systém</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="219"/>
<location filename="../src/optionsdialog.cpp" line="222"/>
<source>Appearance</source>
<translation>Vzhled</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="222"/>
<location filename="../src/optionsdialog.cpp" line="225"/>
<source>Print &amp; Export</source>
<translation>Tisk a export</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="251"/>
<location filename="../src/optionsdialog.cpp" line="254"/>
<source>Options</source>
<translation>Nastavení</translation>
</message>
@ -910,7 +927,7 @@
<translation>Rychlost</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="74"/>
<location filename="../src/speedgraph.cpp" line="78"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
@ -925,7 +942,7 @@
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="77"/>
<location filename="../src/speedgraph.cpp" line="81"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
@ -983,11 +1000,16 @@
</message>
<message>
<location filename="../src/trackitem.cpp" line="17"/>
<source>Time</source>
<translation>Čas</translation>
<source>Total time</source>
<translation>Celkový čas</translation>
</message>
<message>
<location filename="../src/trackitem.cpp" line="19"/>
<source>Moving time</source>
<translation>Čistý čas</translation>
</message>
<message>
<location filename="../src/trackitem.cpp" line="21"/>
<source>Date</source>
<translation>Datum</translation>
</message>

240
lang/gpxsee_sv.ts
View File

@ -190,254 +190,265 @@
<context>
<name>GUI</name>
<message>
<location filename="../src/gui.cpp" line="552"/>
<location filename="../src/gui.cpp" line="569"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan på </translation>
</message>
<message>
<location filename="../src/gui.cpp" line="616"/>
<location filename="../src/gui.cpp" line="633"/>
<source>Open file</source>
<translation>Öppna fil</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="705"/>
<location filename="../src/gui.cpp" line="723"/>
<source>Open POI file</source>
<translation>Öppna POI-fil</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="223"/>
<location filename="../src/gui.cpp" line="227"/>
<source>Open</source>
<translation>Öppna</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="207"/>
<location filename="../src/gui.cpp" line="211"/>
<source>Quit</source>
<translation>Avsluta</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="215"/>
<location filename="../src/gui.cpp" line="568"/>
<location filename="../src/gui.cpp" line="569"/>
<location filename="../src/gui.cpp" line="219"/>
<location filename="../src/gui.cpp" line="585"/>
<location filename="../src/gui.cpp" line="586"/>
<source>Keyboard controls</source>
<translation>Snabbtangenter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="239"/>
<location filename="../src/gui.cpp" line="243"/>
<source>Close</source>
<translation>Stäng</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="245"/>
<location filename="../src/gui.cpp" line="249"/>
<source>Reload</source>
<translation>Uppdatera</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="478"/>
<location filename="../src/gui.cpp" line="497"/>
<source>Show</source>
<translation>Visa</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="399"/>
<location filename="../src/gui.cpp" line="472"/>
<location filename="../src/gui.cpp" line="415"/>
<location filename="../src/gui.cpp" line="491"/>
<source>File</source>
<translation>Arkiv</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="102"/>
<location filename="../src/gui.cpp" line="104"/>
<source>FIT files (*.fit)</source>
<translation>FIT-filer (*.fit)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="103"/>
<location filename="../src/gui.cpp" line="105"/>
<source>IGC files (*.igc)</source>
<translation>IGC-filer (*.igc)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="104"/>
<location filename="../src/gui.cpp" line="106"/>
<source>NMEA files (*.nmea)</source>
<translation>NMEA-filer (*.nmea)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="213"/>
<location filename="../src/gui.cpp" line="591"/>
<location filename="../src/gui.cpp" line="592"/>
<location filename="../src/gui.cpp" line="217"/>
<location filename="../src/gui.cpp" line="608"/>
<location filename="../src/gui.cpp" line="609"/>
<source>Data sources</source>
<translation>Datakällor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="253"/>
<location filename="../src/gui.cpp" line="257"/>
<source>Load POI file</source>
<translation>Läs in POI-fil</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="256"/>
<location filename="../src/gui.cpp" line="260"/>
<source>Close POI files</source>
<translation>Stäng POI-filer</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="258"/>
<location filename="../src/gui.cpp" line="262"/>
<source>Overlap POIs</source>
<translation>Överlappa POI:er</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="262"/>
<location filename="../src/gui.cpp" line="266"/>
<source>Show POI labels</source>
<translation>Visa POI-namn</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="267"/>
<location filename="../src/gui.cpp" line="271"/>
<source>Show POIs</source>
<translation>Visa POI:er</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="276"/>
<location filename="../src/gui.cpp" line="280"/>
<source>Show map</source>
<translation>Visa karta</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="282"/>
<location filename="../src/gui.cpp" line="286"/>
<source>Clear tile cache</source>
<translation>Rensa kart-cache</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="291"/>
<location filename="../src/gui.cpp" line="295"/>
<location filename="../src/gui.cpp" line="578"/>
<location filename="../src/gui.cpp" line="299"/>
<location filename="../src/gui.cpp" line="597"/>
<source>Next map</source>
<translation>Nästa karta</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="302"/>
<location filename="../src/gui.cpp" line="306"/>
<source>Show tracks</source>
<translation>Visa spår</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="306"/>
<location filename="../src/gui.cpp" line="310"/>
<source>Show routes</source>
<translation>Visa rutter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="310"/>
<location filename="../src/gui.cpp" line="314"/>
<source>Show waypoints</source>
<translation>Visa vägpunkter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="314"/>
<location filename="../src/gui.cpp" line="318"/>
<source>Waypoint labels</source>
<translation>Vägpunktnamn</translation>
<translation>Vägpunktsnamn</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="325"/>
<location filename="../src/gui.cpp" line="329"/>
<source>Show graphs</source>
<translation>Visa diagram</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="347"/>
<location filename="../src/gui.cpp" line="351"/>
<source>Show grid</source>
<translation>Visa stödlinjer</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="353"/>
<location filename="../src/gui.cpp" line="357"/>
<source>Show toolbars</source>
<translation>Visa verktygsfält</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="359"/>
<location filename="../src/gui.cpp" line="363"/>
<source>Total time</source>
<translation>Total tid</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="368"/>
<location filename="../src/gui.cpp" line="876"/>
<source>Moving time</source>
<translation>Förflyttningstid</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="375"/>
<source>Metric</source>
<translation>Meter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="364"/>
<location filename="../src/gui.cpp" line="380"/>
<source>Imperial</source>
<translation>Imperial</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="370"/>
<location filename="../src/gui.cpp" line="386"/>
<source>Fullscreen mode</source>
<translation>Helskärmsläge</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="376"/>
<location filename="../src/gui.cpp" line="392"/>
<source>Options...</source>
<translation>Alternativ...</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="381"/>
<location filename="../src/gui.cpp" line="397"/>
<source>Next</source>
<translation>Nästa</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="384"/>
<location filename="../src/gui.cpp" line="400"/>
<source>Previous</source>
<translation>Föregående</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="388"/>
<location filename="../src/gui.cpp" line="404"/>
<source>Last</source>
<translation>Sista</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="391"/>
<location filename="../src/gui.cpp" line="407"/>
<source>First</source>
<translation>Första</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="413"/>
<location filename="../src/gui.cpp" line="429"/>
<source>Map</source>
<translation>Karta</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="420"/>
<location filename="../src/gui.cpp" line="436"/>
<source>Graph</source>
<translation>Diagram</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="428"/>
<location filename="../src/gui.cpp" line="444"/>
<source>POI</source>
<translation>POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="429"/>
<location filename="../src/gui.cpp" line="445"/>
<source>POI files</source>
<translation>POI-filer</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="440"/>
<location filename="../src/gui.cpp" line="456"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="441"/>
<location filename="../src/gui.cpp" line="457"/>
<source>Display</source>
<translation>Visa</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="449"/>
<location filename="../src/gui.cpp" line="465"/>
<source>Settings</source>
<translation>Inställningar</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="450"/>
<location filename="../src/gui.cpp" line="469"/>
<source>Units</source>
<translation>Enhet</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="459"/>
<location filename="../src/gui.cpp" line="478"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="580"/>
<location filename="../src/gui.cpp" line="598"/>
<source>Previous map</source>
<translation>Föregående karta</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="1060"/>
<location filename="../src/gui.cpp" line="1082"/>
<source>No files loaded</source>
<translation>Inga filer inlästa</translation>
</message>
<message numerus="yes">
<location filename="../src/gui.cpp" line="1064"/>
<location filename="../src/gui.cpp" line="1086"/>
<source>%n files</source>
<translation>
<numerusform>%n filer</numerusform>
@ -445,167 +456,168 @@
</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="103"/>
<location filename="../src/gui.cpp" line="105"/>
<source>GPX files (*.gpx)</source>
<translation>GPX-filer (*.gpx)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="105"/>
<location filename="../src/gui.cpp" line="107"/>
<source>TCX files (*.tcx)</source>
<translation>TCX-filer (*.tcx)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="104"/>
<location filename="../src/gui.cpp" line="106"/>
<source>KML files (*.kml)</source>
<translation>KML-filer (*.kml)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="102"/>
<location filename="../src/gui.cpp" line="104"/>
<source>CSV files (*.csv)</source>
<translation>CSV-filer (*.csv)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="105"/>
<location filename="../src/gui.cpp" line="107"/>
<source>All files (*)</source>
<translation>Alla filer (*)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="844"/>
<location filename="../src/gui.cpp" line="847"/>
<location filename="../src/gui.cpp" line="862"/>
<location filename="../src/gui.cpp" line="865"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="836"/>
<location filename="../src/gui.cpp" line="854"/>
<source>Routes</source>
<translation>Rutter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="571"/>
<location filename="../src/gui.cpp" line="588"/>
<source>Next file</source>
<translation>Nästa fil</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="548"/>
<location filename="../src/gui.cpp" line="566"/>
<source>Version </source>
<translation>Version </translation>
</message>
<message>
<location filename="../src/gui.cpp" line="228"/>
<location filename="../src/gui.cpp" line="232"/>
<source>Print...</source>
<translation>Skriv ut...</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="233"/>
<location filename="../src/gui.cpp" line="237"/>
<source>Export to PDF...</source>
<translation>Exportera till PDF...</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="838"/>
<location filename="../src/gui.cpp" line="856"/>
<source>Waypoints</source>
<translation>Vägpunkter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="572"/>
<location filename="../src/gui.cpp" line="590"/>
<source>Previous file</source>
<translation>Föregående fil</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="101"/>
<location filename="../src/gui.cpp" line="103"/>
<source>Supported files (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</source>
<translation>Filer som stöds (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="318"/>
<location filename="../src/gui.cpp" line="322"/>
<source>Route waypoints</source>
<translation>Ruttvägpunkter</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="574"/>
<location filename="../src/gui.cpp" line="592"/>
<source>First file</source>
<translation>Första filen</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="575"/>
<location filename="../src/gui.cpp" line="594"/>
<source>Last file</source>
<translation>Sista filen</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="576"/>
<location filename="../src/gui.cpp" line="595"/>
<source>Append modifier</source>
<translation>Tillämpa modifierare</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="595"/>
<location filename="../src/gui.cpp" line="612"/>
<source>Map (tiles) source URLs are read on program startup from the following file:</source>
<translation>Kartadresser (URL:er) läses in vid programstart, från följande fil:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="598"/>
<location filename="../src/gui.cpp" line="615"/>
<source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
<translation>Filformatet är en kartpost per rad, bestående av kartnamn och kartrutans URL, avgränsade med ett TAB-tecken. Kartrutans X- och Y-koordinater ersätts med $x och $y i URL:en och zoomnivån ersätts med $z. Exempel på en kartfil kan se ut så här:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="606"/>
<location filename="../src/gui.cpp" line="623"/>
<source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
<translation>För att GPXSee skall läsa in en POI-fdil automatiskt vid programstart, läggs filen i följande mapp:</translation>
<translation>För att GPXSee skall läsa in en POI-fil automatiskt vid programstart, läggs filen i följande mapp:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="694"/>
<location filename="../src/gui.cpp" line="712"/>
<source>Error loading data file:</source>
<translation>Fel vid inläsning av datafil:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="697"/>
<location filename="../src/gui.cpp" line="722"/>
<location filename="../src/gui.cpp" line="715"/>
<location filename="../src/gui.cpp" line="740"/>
<source>Line: %1</source>
<translation>Rad: %1</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="719"/>
<location filename="../src/gui.cpp" line="737"/>
<source>Error loading POI file:</source>
<translation>Fel vid inläsning av POI-fil:</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="830"/>
<location filename="../src/gui.cpp" line="848"/>
<source>Name</source>
<translation>Namn</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="834"/>
<location filename="../src/gui.cpp" line="852"/>
<source>Tracks</source>
<translation>Spår</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="218"/>
<location filename="../src/gui.cpp" line="546"/>
<location filename="../src/gui.cpp" line="222"/>
<location filename="../src/gui.cpp" line="565"/>
<source>About GPXSee</source>
<translation>Om GPXSee</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="483"/>
<location filename="../src/gui.cpp" line="502"/>
<source>Navigation</source>
<translation>Navigation</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="594"/>
<location filename="../src/gui.cpp" line="611"/>
<source>Map sources</source>
<translation>Kartkällor</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="605"/>
<location filename="../src/gui.cpp" line="622"/>
<source>POIs</source>
<translation>POI:er</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="333"/>
<location filename="../src/gui.cpp" line="854"/>
<location filename="../src/gui.cpp" line="337"/>
<location filename="../src/gui.cpp" line="872"/>
<source>Distance</source>
<translation>Avstånd</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="340"/>
<location filename="../src/gui.cpp" line="856"/>
<location filename="../src/gui.cpp" line="344"/>
<location filename="../src/gui.cpp" line="466"/>
<location filename="../src/gui.cpp" line="874"/>
<source>Time</source>
<translation>Tid</translation>
</message>
@ -713,7 +725,7 @@
<message>
<location filename="../src/optionsdialog.cpp" line="60"/>
<source>Route width:</source>
<translation>Rutttjocklek:</translation>
<translation>Ruttjocklek:</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="61"/>
@ -748,7 +760,7 @@
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="115"/>
<location filename="../src/optionsdialog.cpp" line="180"/>
<location filename="../src/optionsdialog.cpp" line="183"/>
<source>Graphs</source>
<translation>Diagram</translation>
</message>
@ -769,7 +781,7 @@
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="140"/>
<location filename="../src/optionsdialog.cpp" line="221"/>
<location filename="../src/optionsdialog.cpp" line="224"/>
<source>POI</source>
<translation>POI</translation>
</message>
@ -795,42 +807,47 @@
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="155"/>
<source>Moving time</source>
<translation>Förflyttningstid</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="157"/>
<source>Item count (&gt;1)</source>
<translation>Objektantal (&gt;1)</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="169"/>
<location filename="../src/optionsdialog.cpp" line="172"/>
<source>Separate graph page</source>
<translation>Separat diagramsida</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="179"/>
<location filename="../src/optionsdialog.cpp" line="182"/>
<source>Header</source>
<translation></translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="187"/>
<location filename="../src/optionsdialog.cpp" line="190"/>
<source>Use OpenGL</source>
<translation>Använd OpenGL</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="203"/>
<location filename="../src/optionsdialog.cpp" line="224"/>
<location filename="../src/optionsdialog.cpp" line="206"/>
<location filename="../src/optionsdialog.cpp" line="227"/>
<source>System</source>
<translation>System</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="219"/>
<location filename="../src/optionsdialog.cpp" line="222"/>
<source>Appearance</source>
<translation>Utseende</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="222"/>
<location filename="../src/optionsdialog.cpp" line="225"/>
<source>Print &amp; Export</source>
<translation>Utskrift &amp; Export</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="251"/>
<location filename="../src/optionsdialog.cpp" line="254"/>
<source>Options</source>
<translation>Alternativ</translation>
</message>
@ -909,7 +926,7 @@
<translation>Hastighet</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="74"/>
<location filename="../src/speedgraph.cpp" line="78"/>
<source>km/h</source>
<translation>km/h</translation>
</message>
@ -924,7 +941,7 @@
<translation>Max</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="77"/>
<location filename="../src/speedgraph.cpp" line="81"/>
<source>mi/h</source>
<translation>mi/h</translation>
</message>
@ -982,11 +999,16 @@
</message>
<message>
<location filename="../src/trackitem.cpp" line="17"/>
<source>Time</source>
<translation>Tid</translation>
<source>Total time</source>
<translation>Total tid</translation>
</message>
<message>
<location filename="../src/trackitem.cpp" line="19"/>
<source>Moving time</source>
<translation>Förflyttningstid</translation>
</message>
<message>
<location filename="../src/trackitem.cpp" line="21"/>
<source>Date</source>
<translation>Datum</translation>
</message>

48
pkg/gpxsee.nsi
View File

@ -1,10 +1,11 @@
!include "MUI2.nsh"
!include "x64.nsh"
!include "WinVer.nsh"
; The name of the installer
Name "GPXSee"
; Program version
!define VERSION "3.8"
!define VERSION "3.10"
; The file to write
OutFile "GPXSee-${VERSION}.exe"
@ -55,9 +56,15 @@ Var StartMenuFolder
; Languages
!insertmacro MUI_LANGUAGE "English"
Function .onInit
${IfNot} ${AtLeastWin7}
MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
Abort
${EndIf}
FunctionEnd
; The stuff to install
Section "GPXSee (required)" SEC_APP
Section "GPXSee" SEC_APP
SectionIn RO
@ -122,16 +129,15 @@ Section "GPXSee (required)" SEC_APP
SectionEnd
Section "QT libs" SEC_QT
Section "QT framework" SEC_QT
SectionIn RO
File "Qt5Core.dll"
File "Qt5Gui.dll"
File "Qt5Widgets.dll"
File "Qt5PrintSupport.dll"
File "Qt5Network.dll"
File "libGLESv2.dll"
File "libEGL.dll"
File "D3DCompiler_47.dll"
File /r "platforms"
File /r "imageformats"
File /r "printsupport"
@ -140,6 +146,8 @@ SectionEnd
Section "MSVC runtime" SEC_MSVC
SectionIn RO
DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
${If} ${RunningX64}
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
@ -155,10 +163,26 @@ Section "MSVC runtime" SEC_MSVC
SetOutPath $TEMP
File "VC_redist.x86.exe"
ExecWait '"$TEMP/VC_redist.x86.exe" /install /quiet /norestart'
SetOutPath $INSTDIR
done:
SectionEnd
Section "OpenSSL" SEC_OPENSSL
File "libeay32.dll"
File "ssleay32.dll"
SectionEnd
Section "ANGLE" SEC_ANGLE
File "libGLESv2.dll"
File "libEGL.dll"
File "D3DCompiler_47.dll"
SectionEnd
;--------------------------------
; Uninstaller
@ -201,15 +225,21 @@ SectionEnd
;Language strings
LangString DESC_QT ${LANG_ENGLISH} \
"QT Library. Unselct only if you have QT already installed!"
"QT cross-platform application framework."
LangString DESC_MSVC ${LANG_ENGLISH} \
"Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
"Visual C++ 2015 runtime components. If already installed, will be skipped."
LangString DESC_OPENSSL ${LANG_ENGLISH} \
"OpenSSL library. Required for HTTPS to work."
LangString DESC_ANGLE ${LANG_ENGLISH} \
"ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
LangString DESC_APP ${LANG_ENGLISH} \
"GPXSee application"
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
!insertmacro MUI_FUNCTION_DESCRIPTION_END

49
pkg/gpxsee64.nsi
View File

@ -1,10 +1,11 @@
!include "MUI2.nsh"
!include "x64.nsh"
!include "WinVer.nsh"
; The name of the installer
Name "GPXSee"
; Program version
!define VERSION "3.8"
!define VERSION "3.10"
; The file to write
OutFile "GPXSee-${VERSION}_x64.exe"
@ -55,7 +56,12 @@ Var StartMenuFolder
; Languages
!insertmacro MUI_LANGUAGE "English"
Function .onInit
Function .onInit
${IfNot} ${AtLeastWin7}
MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
Abort
${EndIf}
${If} ${RunningX64}
SetRegView 64
${Else}
@ -65,7 +71,7 @@ Function .onInit
FunctionEnd
; The stuff to install
Section "GPXSee (required)" SEC_APP
Section "GPXSee" SEC_APP
SectionIn RO
@ -130,16 +136,15 @@ Section "GPXSee (required)" SEC_APP
SectionEnd
Section "QT libs" SEC_QT
Section "QT framework" SEC_QT
SectionIn RO
File "Qt5Core.dll"
File "Qt5Gui.dll"
File "Qt5Widgets.dll"
File "Qt5PrintSupport.dll"
File "Qt5Network.dll"
File "libGLESv2.dll"
File "libEGL.dll"
File "D3DCompiler_47.dll"
File /r "platforms"
File /r "imageformats"
File /r "printsupport"
@ -148,6 +153,8 @@ SectionEnd
Section "MSVC runtime" SEC_MSVC
SectionIn RO
DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
StrCmp $R0 "1" 0 +3
@ -158,10 +165,26 @@ Section "MSVC runtime" SEC_MSVC
SetOutPath $TEMP
File "VC_redist.x64.exe"
ExecWait '"$TEMP/VC_redist.x64.exe" /install /quiet /norestart'
SetOutPath $INSTDIR
done:
SectionEnd
Section "OpenSSL" SEC_OPENSSL
File "libeay32.dll"
File "ssleay32.dll"
SectionEnd
Section "ANGLE" SEC_ANGLE
File "libGLESv2.dll"
File "libEGL.dll"
File "D3DCompiler_47.dll"
SectionEnd
;--------------------------------
; Uninstaller
@ -205,15 +228,21 @@ SectionEnd
;Language strings
LangString DESC_QT ${LANG_ENGLISH} \
"QT Library. Unselct only if you have QT already installed!"
"QT cross-platform application framework."
LangString DESC_MSVC ${LANG_ENGLISH} \
"Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
"Visual C++ 2015 runtime components. If already installed, will be skipped."
LangString DESC_OPENSSL ${LANG_ENGLISH} \
"OpenSSL library. Required for HTTPS to work."
LangString DESC_ANGLE ${LANG_ENGLISH} \
"ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
LangString DESC_APP ${LANG_ENGLISH} \
"GPXSee application"
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
!insertmacro MUI_FUNCTION_DESCRIPTION_END

1
pkg/maps.txt
View File

@ -1,2 +1,3 @@
Open Topo Map https://a.tile.opentopomap.org/$z/$x/$y.png
Thunderforest http://tile.thunderforest.com/outdoors/$z/$x/$y.png
Open Street Map http://tile.openstreetmap.org/$z/$x/$y.png

5
src/coordinates.cpp
View File

@ -64,6 +64,7 @@ QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const
maxLon = MAX_LON;
}
return QPair<Coordinates, Coordinates>(Coordinates(rad2deg(minLon),
rad2deg(minLat)), Coordinates(rad2deg(maxLon), rad2deg(maxLat)));
return QPair<Coordinates, Coordinates>(Coordinates(rad2deg(qMin(minLon,
maxLon)), rad2deg(qMin(minLat, maxLat))), Coordinates(rad2deg(qMax(minLon,
maxLon)), rad2deg(qMax(minLat, maxLat))));
}

4
src/downloader.cpp
View File

@ -1,5 +1,7 @@
#include <QFile>
#include <QFileInfo>
#include <QNetworkRequest>
#include <QNetworkReply>
#include "config.h"
#include "downloader.h"
@ -25,7 +27,7 @@
#define MAX_REDIRECT_LEVEL 5
Downloader::Downloader()
Downloader::Downloader(QObject *parent) : QObject(parent)
{
connect(&_manager, SIGNAL(finished(QNetworkReply*)),
SLOT(downloadFinished(QNetworkReply*)));

13
src/downloader.h
View File

@ -2,13 +2,14 @@
#define DOWNLOADER_H
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QUrl>
#include <QList>
#include <QMap>
#include <QSet>
class QNetworkReply;
class Download
{
public:
@ -28,8 +29,8 @@ class Downloader : public QObject
Q_OBJECT
public:
static Downloader& instance()
{static Downloader i; return i;}
Downloader(QObject *parent = 0);
bool get(const QList<Download> &list);
signals:
@ -56,10 +57,6 @@ private:
int _level;
};
Downloader();
Downloader(Downloader const&);
void operator=(Downloader const&);
bool doDownload(const Download &dl, const Redirect &redirect = Redirect());
bool saveToDisk(const QString &filename, QIODevice *data);

10
src/graphtab.h
View File

@ -4,6 +4,7 @@
#include <QList>
#include "graphview.h"
#include "units.h"
#include "timetype.h"
class Data;
class PathItem;
@ -18,10 +19,11 @@ public:
virtual QString label() const = 0;
virtual void loadData(const Data &data, const QList<PathItem *> &paths) = 0;
virtual void clear() = 0;
virtual void setUnits(enum Units units) = 0;
virtual void showTracks(bool show) = 0;
virtual void showRoutes(bool show) = 0;
virtual void clear() {}
virtual void setUnits(enum Units units) {Q_UNUSED(units)}
virtual void setTimeType(enum TimeType type) {Q_UNUSED(type)}
virtual void showTracks(bool show) {Q_UNUSED(show)}
virtual void showRoutes(bool show) {Q_UNUSED(show)}
};
#endif // GRAPHTAB_H

9
src/graphview.cpp
View File

@ -3,7 +3,6 @@
#include <QMouseEvent>
#include <QPaintEngine>
#include <QPaintDevice>
#include <QSysInfo>
#include "opengl.h"
#include "config.h"
#include "axisitem.h"
@ -25,6 +24,7 @@ GraphView::GraphView(QWidget *parent)
_scene = new QGraphicsScene(this);
setScene(_scene);
setBackgroundBrush(QBrush(Qt::white));
setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
setRenderHint(QPainter::Antialiasing, true);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -458,11 +458,8 @@ void GraphView::setGraphWidth(int width)
void GraphView::useOpenGL(bool use)
{
if (use) {
#ifdef Q_OS_WIN32
if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
#endif // Q_OS_WIN32
if (use)
setViewport(new OPENGL_WIDGET);
} else
else
setViewport(new QWidget);
}

143
src/gui.cpp
View File

@ -36,6 +36,7 @@
#include "powergraph.h"
#include "pathview.h"
#include "trackinfo.h"
#include "downloader.h"
#include "filebrowser.h"
#include "cpuarch.h"
#include "graphtab.h"
@ -78,6 +79,7 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
_trackDistance = 0;
_routeDistance = 0;
_time = 0;
_movingTime = 0;
_sliderPos = 0;
@ -116,10 +118,12 @@ void GUI::createBrowser()
void GUI::loadMaps()
{
MapList ml(new Downloader(this));
if (QFile::exists(USER_MAP_FILE))
_maps = MapList::load(this, USER_MAP_FILE);
_maps = ml.load(USER_MAP_FILE, this);
else
_maps = MapList::load(this, GLOBAL_MAP_FILE);
_maps = ml.load(GLOBAL_MAP_FILE, this);
}
void GUI::loadPOIs()
@ -356,6 +360,18 @@ void GUI::createActions()
SLOT(showToolbars(bool)));
ag = new QActionGroup(this);
ag->setExclusive(true);
_totalTimeAction = new QAction(tr("Total time"), this);
_totalTimeAction->setCheckable(true);
_totalTimeAction->setActionGroup(ag);
connect(_totalTimeAction, SIGNAL(triggered()), this,
SLOT(setTotalTime()));
_movingTimeAction = new QAction(tr("Moving time"), this);
_movingTimeAction->setCheckable(true);
_movingTimeAction->setActionGroup(ag);
connect(_movingTimeAction, SIGNAL(triggered()), this,
SLOT(setMovingTime()));
ag = new QActionGroup(this);
ag->setExclusive(true);
_metricUnitsAction = new QAction(tr("Metric"), this);
_metricUnitsAction->setCheckable(true);
_metricUnitsAction->setActionGroup(ag);
@ -447,6 +463,9 @@ void GUI::createMenus()
dataMenu->addAction(_showWaypointsAction);
QMenu *settingsMenu = menuBar()->addMenu(tr("Settings"));
QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
timeMenu->addAction(_totalTimeAction);
timeMenu->addAction(_movingTimeAction);
QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
unitsMenu->addAction(_metricUnitsAction);
unitsMenu->addAction(_imperialUnitsAction);
@ -544,15 +563,13 @@ void GUI::about()
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("About GPXSee"));
msgBox.setText(QString("<h2>") + QString(APP_NAME) + QString("</h2><p>")
+ QString("<p>") + tr("Version ") + APP_VERSION + QString(" (")
+ CPU_ARCH + QString(", Qt ") + QString(QT_VERSION_STR)
+ QString(")</p>"));
msgBox.setInformativeText(QString("<table width=\"300\"><tr><td>")
msgBox.setText("<h2>" + QString(APP_NAME) + "</h2><p><p>" + tr("Version ")
+ APP_VERSION + " (" + CPU_ARCH + ", Qt " + QT_VERSION_STR + ")</p>");
msgBox.setInformativeText("<table width=\"300\"><tr><td>"
+ tr("GPXSee is distributed under the terms of the GNU General Public "
"License version 3. For more info about GPXSee visit the project "
"homepage at ") + QString("<a href=\"" APP_HOMEPAGE "\">" APP_HOMEPAGE
"</a>.</td></tr></table>"));
"homepage at ") + "<a href=\"" + APP_HOMEPAGE + "\">" + APP_HOMEPAGE
+ "</a>.</td></tr></table>");
QIcon icon = msgBox.windowIcon();
QSize size = icon.actualSize(QSize(64, 64));
@ -566,20 +583,20 @@ void GUI::keys()
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("Keyboard controls"));
msgBox.setText(QString("<h3>") + tr("Keyboard controls") + QString("</h3>"));
msgBox.setText("<h3>" + tr("Keyboard controls") + "</h3>");
msgBox.setInformativeText(
QString("<div><table width=\"300\"><tr><td>") + tr("Next file")
+ QString("</td><td><i>SPACE</i></td></tr><tr><td>") + tr("Previous file")
+ QString("</td><td><i>BACKSPACE</i></td></tr><tr><td>")
+ tr("First file") + QString("</td><td><i>HOME</i></td></tr><tr><td>")
+ tr("Last file") + QString("</td><td><i>END</i></td></tr><tr><td>")
+ tr("Append modifier") + QString("</td><td><i>SHIFT</i></td></tr>"
"<tr><td></td><td></td></tr><tr><td>")
+ tr("Next map") + QString("</td><td><i>")
+ _nextMapAction->shortcut().toString() + QString("</i></td></tr><tr><td>")
+ tr("Previous map") + QString("</td><td><i>")
+ _prevMapAction->shortcut().toString() + QString("</i></td></tr>"
"</table></div>"));
"<div><table width=\"300\"><tr><td>" + tr("Next file")
+ "</td><td><i>" + QKeySequence(NEXT_KEY).toString()
+ "</i></td></tr><tr><td>" + tr("Previous file")
+ "</td><td><i>" + QKeySequence(PREV_KEY).toString()
+ "</i></td></tr><tr><td>" + tr("First file") + "</td><td><i>"
+ QKeySequence(FIRST_KEY).toString() + "</i></td></tr><tr><td>"
+ tr("Last file") + "</td><td><i>" + QKeySequence(LAST_KEY).toString()
+ "</i></td></tr><tr><td>" + tr("Append modifier")
+ "</td><td><i>SHIFT</i></td></tr><tr><td></td><td></td></tr><tr><td>"
+ tr("Next map") + "</td><td><i>" + NEXT_MAP_SHORTCUT.toString()
+ "</i></td></tr><tr><td>" + tr("Previous map") + "</td><td><i>"
+ PREV_MAP_SHORTCUT.toString() + "</i></td></tr></table></div>");
msgBox.exec();
}
@ -589,23 +606,23 @@ void GUI::dataSources()
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("Data sources"));
msgBox.setText(QString("<h3>") + tr("Data sources") + QString("</h3>"));
msgBox.setText("<h3>" + tr("Data sources") + "</h3>");
msgBox.setInformativeText(
QString("<h4>") + tr("Map sources") + QString("</h4><p>")
"<h4>" + tr("Map sources") + "</h4><p>"
+ tr("Map (tiles) source URLs are read on program startup from the "
"following file:")
+ QString("</p><p><code>") + USER_MAP_FILE + QString("</code></p><p>")
+ "</p><p><code>" + USER_MAP_FILE + "</code></p><p>"
+ tr("The file format is one map entry per line, consisting of the map "
"name and tiles URL delimited by a TAB character. The tile X and Y "
"coordinates are replaced with $x and $y in the URL and the zoom "
"level is replaced with $z. An example map file could look like:")
+ QString("</p><p><code>Map1 http://tile.server.com/map/$z/$x/$y.png"
"<br/>Map2 http://mapserver.org/map/$z-$x-$y</code></p>")
+ "</p><p><code>Map1 http://tile.server.com/map/$z/$x/$y.png"
"<br/>Map2 http://mapserver.org/map/$z-$x-$y</code></p>"
+ QString("<h4>") + tr("POIs") + QString("</h4><p>")
+ "<h4>" + tr("POIs") + "</h4><p>"
+ tr("To make GPXSee load a POI file automatically on startup, add "
"the file to the following directory:")
+ QString("</p><p><code>") + USER_POI_DIR + QString("</code></p>")
+ "</p><p><code>" + USER_POI_DIR + "</code></p>"
);
msgBox.exec();
@ -661,6 +678,7 @@ bool GUI::loadFile(const QString &fileName)
for (int i = 0; i < data.tracks().count(); i++) {
_trackDistance += data.tracks().at(i)->distance();
_time += data.tracks().at(i)->time();
_movingTime += data.tracks().at(i)->movingTime();
const QDate &date = data.tracks().at(i)->date().date();
if (_dateRange.first.isNull() || _dateRange.first > date)
_dateRange.first = date;
@ -822,9 +840,9 @@ void GUI::plot(QPrinter *printer)
QPainter p(printer);
TrackInfo info;
qreal ih, gh, mh, ratio;
Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
qreal d = distance();
qreal t = time();
qreal tm = movingTime();
if (!_pathName.isNull() && _options.printName)
info.insert(tr("Name"), _pathName);
@ -851,9 +869,11 @@ void GUI::plot(QPrinter *printer)
}
if (d > 0 && _options.printDistance)
info.insert(tr("Distance"), Format::distance(d, units));
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));
ratio = p.paintEngine()->paintDevice()->logicalDpiX() / SCREEN_DPI;
@ -908,6 +928,7 @@ void GUI::reloadFile()
_trackDistance = 0;
_routeDistance = 0;
_time = 0;
_movingTime = 0;
_dateRange = DateRange(QDate(), QDate());
_pathName = QString();
@ -942,6 +963,7 @@ void GUI::closeFiles()
_trackDistance = 0;
_routeDistance = 0;
_time = 0;
_movingTime = 0;
_dateRange = DateRange(QDate(), QDate());
_pathName = QString();
@ -1063,25 +1085,30 @@ void GUI::updateStatusBarInfo()
else
_fileNameLabel->setText(tr("%n files", "", _files.count()));
qreal d = distance();
Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
if (d > 0)
_distanceLabel->setText(Format::distance(distance(), units));
if (distance() > 0)
_distanceLabel->setText(Format::distance(distance(), units()));
else
_distanceLabel->clear();
qreal t = time();
if (t > 0)
_timeLabel->setText(Format::timeSpan(time()));
else
if (time() > 0) {
if (_movingTimeAction->isChecked()) {
_timeLabel->setText(Format::timeSpan(movingTime())
+ "<sub>M</sub>");
_timeLabel->setToolTip(Format::timeSpan(time()));
} else {
_timeLabel->setText(Format::timeSpan(time()));
_timeLabel->setToolTip(Format::timeSpan(movingTime()));
}
} else {
_timeLabel->clear();
_timeLabel->setToolTip(QString());
}
}
void GUI::updateWindowTitle()
{
if (_files.count() == 1)
setWindowTitle(QFileInfo(_files.at(0)).fileName()
+ QString(" - " APP_NAME));
setWindowTitle(QFileInfo(_files.at(0)).fileName() + " - " + APP_NAME);
else
setWindowTitle(APP_NAME);
}
@ -1184,6 +1211,14 @@ void GUI::updatePathView()
+ _pathView->waypointCount()));
}
void GUI::setTimeType(TimeType type)
{
for (int i = 0; i <_tabs.count(); i++)
_tabs.at(i)->setTimeType(type);
updateStatusBarInfo();
}
void GUI::setUnits(Units units)
{
_export.units = units;
@ -1319,6 +1354,10 @@ void GUI::writeSettings()
settings.endGroup();
settings.beginGroup(SETTINGS_SETTINGS_GROUP);
if ((_movingTimeAction->isChecked() ? Moving : Total) !=
TIME_TYPE_DEFAULT)
settings.setValue(TIME_TYPE_SETTING, _movingTimeAction->isChecked()
? Moving : Total);
if ((_imperialUnitsAction->isChecked() ? Imperial : Metric) !=
UNITS_DEFAULT)
settings.setValue(UNITS_SETTING, _imperialUnitsAction->isChecked()
@ -1429,6 +1468,8 @@ void GUI::writeSettings()
settings.setValue(PRINT_DISTANCE_SETTING, _options.printDistance);
if (_options.printTime != PRINT_TIME_DEFAULT)
settings.setValue(PRINT_TIME_SETTING, _options.printTime);
if (_options.printMovingTime != PRINT_MOVING_TIME_DEFAULT)
settings.setValue(PRINT_MOVING_TIME_SETTING, _options.printMovingTime);
if (_options.printItemCount != PRINT_ITEM_COUNT_DEFAULT)
settings.setValue(PRINT_ITEM_COUNT_SETTING, _options.printItemCount);
if (_options.separateGraphPage != SEPARATE_GRAPH_PAGE_DEFAULT)
@ -1447,6 +1488,14 @@ void GUI::readSettings()
settings.endGroup();
settings.beginGroup(SETTINGS_SETTINGS_GROUP);
if (settings.value(TIME_TYPE_SETTING, TIME_TYPE_DEFAULT).toInt()
== Moving) {
setTimeType(Moving);
_movingTimeAction->setChecked(true);
} else {
setTimeType(Total);
_totalTimeAction->setChecked(true);
}
if (settings.value(UNITS_SETTING, UNITS_DEFAULT).toInt() == Imperial) {
setUnits(Imperial);
_imperialUnitsAction->setChecked(true);
@ -1598,6 +1647,8 @@ void GUI::readSettings()
PRINT_DISTANCE_DEFAULT).toBool();
_options.printTime = settings.value(PRINT_TIME_SETTING, PRINT_TIME_DEFAULT)
.toBool();
_options.printMovingTime = settings.value(PRINT_MOVING_TIME_SETTING,
PRINT_MOVING_TIME_DEFAULT).toBool();
_options.printItemCount = settings.value(PRINT_ITEM_COUNT_SETTING,
PRINT_ITEM_COUNT_DEFAULT).toBool();
_options.separateGraphPage = settings.value(SEPARATE_GRAPH_PAGE_SETTING,
@ -1635,6 +1686,11 @@ int GUI::mapIndex(const QString &name)
return 0;
}
Units GUI::units() const
{
return _imperialUnitsAction->isChecked() ? Imperial : Metric;
}
qreal GUI::distance() const
{
qreal dist = 0;
@ -1651,3 +1707,8 @@ qreal GUI::time() const
{
return (_showTracksAction->isChecked()) ? _time : 0;
}
qreal GUI::movingTime() const
{
return (_showTracksAction->isChecked()) ? _movingTime : 0;
}

10
src/gui.h
View File

@ -7,6 +7,7 @@
#include <QDate>
#include <QPrinter>
#include "units.h"
#include "timetype.h"
#include "graph.h"
#include "poi.h"
#include "exportdialog.h"
@ -67,6 +68,8 @@ private slots:
void last();
void first();
void setTotalTime() {setTimeType(Total);}
void setMovingTime() {setTimeType(Moving);}
void setMetricUnits() {setUnits(Metric);}
void setImperialUnits() {setUnits(Imperial);}
void setDistanceGraph() {setGraphType(Distance);}
@ -102,11 +105,15 @@ private:
void updateGraphTabs();
void updatePathView();
TimeType timeType() const;
Units units() const;
void setTimeType(TimeType type);
void setUnits(Units units);
void setGraphType(GraphType type);
qreal distance() const;
qreal time() const;
qreal movingTime() const;
int mapIndex(const QString &name);
void readSettings();
void writeSettings();
@ -154,6 +161,8 @@ private:
QAction *_firstAction;
QAction *_metricUnitsAction;
QAction *_imperialUnitsAction;
QAction *_totalTimeAction;
QAction *_movingTimeAction;
QAction *_nextMapAction;
QAction *_prevMapAction;
QAction *_showTracksAction;
@ -188,6 +197,7 @@ private:
qreal _trackDistance;
qreal _routeDistance;
qreal _time;
qreal _movingTime;
DateRange _dateRange;
QString _pathName;

2
src/heartrategraph.h
View File

@ -13,9 +13,7 @@ public:
QString label() const {return tr("Heart rate");}
void loadData(const Data &data, const QList<PathItem *> &paths);
void clear();
void setUnits(enum Units) {}
void showTracks(bool show);
void showRoutes(bool show) {Q_UNUSED(show);}
private:
qreal avg() const;

12
src/keys.h
View File

@ -10,15 +10,15 @@
#define LAST_KEY Qt::Key_End
#define MODIFIER Qt::ShiftModifier
#define QUIT_SHORTCUT QKeySequence::Quit
#define OPEN_SHORTCUT QKeySequence::Open
#define CLOSE_SHORTCUT QKeySequence::Close
#define RELOAD_SHORTCUT QKeySequence::Refresh
#define QUIT_SHORTCUT QKeySequence(QKeySequence::Quit)
#define OPEN_SHORTCUT QKeySequence(QKeySequence::Open)
#define CLOSE_SHORTCUT QKeySequence(QKeySequence::Close)
#define RELOAD_SHORTCUT QKeySequence(QKeySequence::Refresh)
#define EXPORT_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_E)
#define SHOW_POI_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_P)
#define SHOW_MAP_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_M)
#define NEXT_MAP_SHORTCUT QKeySequence::Forward
#define PREV_MAP_SHORTCUT QKeySequence::Back
#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 DISTANCE_GRAPH_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_D)
#define TIME_GRAPH_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_T)

16
src/map.cpp
View File

@ -5,14 +5,16 @@
#include "map.h"
Map::Map(QObject *parent, const QString &name, const QString &url)
: QObject(parent)
Map::Map(const QString &name, const QString &url, Downloader *downloader,
QObject *parent) : QObject(parent)
{
_name = name;
_url = url;
connect(&Downloader::instance(), SIGNAL(finished()), this,
SLOT(emitLoaded()));
_downloader = downloader;
connect(_downloader, SIGNAL(finished()), this, SLOT(emitLoaded()));
QString path = TILES_DIR + QString("/") + _name;
if (!QDir().mkpath(path))
@ -49,7 +51,7 @@ void Map::loadTilesAsync(QList<Tile> &list)
}
if (!dl.empty())
Downloader::instance().get(dl);
_downloader->get(dl);
}
void Map::loadTilesSync(QList<Tile> &list)
@ -71,8 +73,8 @@ void Map::loadTilesSync(QList<Tile> &list)
return;
QEventLoop wait;
connect(&Downloader::instance(), SIGNAL(finished()), &wait, SLOT(quit()));
if (Downloader::instance().get(dl))
connect(_downloader, SIGNAL(finished()), &wait, SLOT(quit()));
if (_downloader->get(dl))
wait.exec();
for (int i = 0; i < list.size(); i++) {

8
src/map.h
View File

@ -3,13 +3,15 @@
#include "tile.h"
class Downloader;
class Map : public QObject
{
Q_OBJECT
public:
Map(QObject *parent = 0, const QString &name = QString(),
const QString &url = QString());
Map(const QString &name, const QString &url, Downloader *downloader,
QObject *parent = 0);
const QString &name() const {return _name;}
void loadTiles(QList<Tile> &list, bool block);
@ -30,6 +32,8 @@ private:
void loadTilesAsync(QList<Tile> &list);
void loadTilesSync(QList<Tile> &list);
Downloader *_downloader;
QString _name;
QString _url;
};

6
src/maplist.cpp
View File

@ -4,7 +4,7 @@
#include "maplist.h"
QList<Map*> MapList::load(QObject *parent, const QString &fileName)
QList<Map*> MapList::load(const QString &fileName, QObject *parent)
{
QList<Map*> mapList;
QFileInfo fi(fileName);
@ -33,8 +33,8 @@ QList<Map*> MapList::load(QObject *parent, const QString &fileName)
QByteArray ba1 = list[0].trimmed();
QByteArray ba2 = list[1].trimmed();
mapList.append(new Map(parent, QString::fromUtf8(ba1.data(), ba1.size()),
QString::fromLatin1(ba2.data(), ba2.size())));
mapList.append(new Map(QString::fromUtf8(ba1.data(), ba1.size()),
QString::fromLatin1(ba2.data(), ba2.size()), _downloader, parent));
}
return mapList;

8
src/maplist.h
View File

@ -6,12 +6,16 @@
#include <QObject>
class Map;
class Downloader;
class MapList
{
public:
static QList<Map*> load(QObject *parent = 0,
const QString &fileName = QString());
MapList(Downloader *downloader) : _downloader(downloader) {}
QList<Map*> load(const QString &fileName, QObject *parent = 0);
private:
Downloader *_downloader;
};
#endif // MAPLIST_H

4
src/optionsdialog.cpp
View File

@ -152,6 +152,8 @@ QWidget *OptionsDialog::createExportPage()
_distance->setChecked(_options->printDistance);
_time = new QCheckBox(tr("Time"));
_time->setChecked(_options->printTime);
_movingTime = new QCheckBox(tr("Moving time"));
_movingTime->setChecked(_options->printMovingTime);
_itemCount = new QCheckBox(tr("Item count (>1)"));
_itemCount->setChecked(_options->printItemCount);
@ -160,6 +162,7 @@ QWidget *OptionsDialog::createExportPage()
headerTabLayout->addWidget(_date);
headerTabLayout->addWidget(_distance);
headerTabLayout->addWidget(_time);
headerTabLayout->addWidget(_movingTime);
headerTabLayout->addItem(new QSpacerItem(10, 10));
headerTabLayout->addWidget(_itemCount);
QWidget *headerTab = new QWidget();
@ -277,6 +280,7 @@ void OptionsDialog::accept()
_options->printDate = _date->isChecked();
_options->printDistance = _distance->isChecked();
_options->printTime = _time->isChecked();
_options->printMovingTime = _movingTime->isChecked();
_options->printItemCount = _itemCount->isChecked();
_options->separateGraphPage = _separateGraphPage->isChecked();

2
src/optionsdialog.h
View File

@ -31,6 +31,7 @@ struct Options {
bool printDate;
bool printDistance;
bool printTime;
bool printMovingTime;
bool printItemCount;
bool separateGraphPage;
@ -70,6 +71,7 @@ private:
QCheckBox *_date;
QCheckBox *_distance;
QCheckBox *_time;
QCheckBox *_movingTime;
QCheckBox *_itemCount;
QCheckBox *_separateGraphPage;
};

8
src/pathview.cpp
View File

@ -1,7 +1,6 @@
#include <QGraphicsView>
#include <QGraphicsScene>
#include <QWheelEvent>
#include <QSysInfo>
#include "opengl.h"
#include "rd.h"
#include "wgs84.h"
@ -721,11 +720,8 @@ void PathView::scrollContentsBy(int dx, int dy)
void PathView::useOpenGL(bool use)
{
if (use) {
#ifdef Q_OS_WIN32
if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
#endif // Q_OS_WIN32
if (use)
setViewport(new OPENGL_WIDGET);
} else
else
setViewport(new QWidget);
}

2
src/powergraph.h
View File

@ -13,9 +13,7 @@ public:
QString label() const {return tr("Power");}
void loadData(const Data &data, const QList<PathItem *> &paths);
void clear();
void setUnits(enum Units) {}
void showTracks(bool show);
void showRoutes(bool show) {Q_UNUSED(show);}
private:
qreal avg() const;

4
src/settings.h
View File

@ -11,6 +11,8 @@
#define WINDOW_POS_DEFAULT QPoint(10, 10)
#define SETTINGS_SETTINGS_GROUP "Settings"
#define TIME_TYPE_SETTING "timeType"
#define TIME_TYPE_DEFAULT Total
#define UNITS_SETTING "units"
#define UNITS_DEFAULT (IMPERIAL_UNITS() ? Imperial : Metric)
#define SHOW_TOOLBARS_SETTING "toolbar"
@ -100,6 +102,8 @@
#define PRINT_DISTANCE_DEFAULT true
#define PRINT_TIME_SETTING "printTime"
#define PRINT_TIME_DEFAULT true
#define PRINT_MOVING_TIME_SETTING "printMovingTime"
#define PRINT_MOVING_TIME_DEFAULT false
#define PRINT_ITEM_COUNT_SETTING "printItemCount"
#define PRINT_ITEM_COUNT_DEFAULT true
#define SEPARATE_GRAPH_PAGE_SETTING "separateGraphPage"

15
src/speedgraph.cpp
View File

@ -6,6 +6,7 @@
SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
{
_units = Metric;
_timeType = Total;
_showTracks = true;
setYUnits();
@ -36,6 +37,8 @@ void SpeedGraph::loadData(const Data &data, const QList<PathItem *> &paths)
_avg.append(QPointF(data.tracks().at(i)->distance(),
data.tracks().at(i)->distance() / data.tracks().at(i)->time()));
_avgM.append(QPointF(data.tracks().at(i)->distance(),
data.tracks().at(i)->distance() / data.tracks().at(i)->movingTime()));
GraphView::loadGraph(graph, paths.at(i));
}
@ -52,8 +55,9 @@ qreal SpeedGraph::avg() const
{
qreal sum = 0, w = 0;
QList<QPointF>::const_iterator it;
const QList<QPointF> &list = (_timeType == Moving) ? _avgM : _avg;
for (it = _avg.begin(); it != _avg.end(); it++) {
for (it = list.begin(); it != list.end(); it++) {
sum += it->y() * it->x();
w += it->x();
}
@ -64,6 +68,7 @@ qreal SpeedGraph::avg() const
void SpeedGraph::clear()
{
_avg.clear();
_avgM.clear();
GraphView::clear();
}
@ -90,6 +95,14 @@ void SpeedGraph::setUnits(enum Units units)
redraw();
}
void SpeedGraph::setTimeType(enum TimeType type)
{
_timeType = type;
setInfo();
redraw();
}
void SpeedGraph::showTracks(bool show)
{
_showTracks = show;

4
src/speedgraph.h
View File

@ -15,8 +15,8 @@ public:
void loadData(const Data &data, const QList<PathItem *> &paths);
void clear();
void setUnits(enum Units units);
void setTimeType(enum TimeType type);
void showTracks(bool show);
void showRoutes(bool show) {Q_UNUSED(show);}
private:
qreal avg() const;
@ -25,8 +25,10 @@ private:
void setInfo();
QList<QPointF> _avg;
QList<QPointF> _avgM;
enum Units _units;
enum TimeType _timeType;
bool _showTracks;
};

1
src/temperaturegraph.h
View File

@ -15,7 +15,6 @@ public:
void clear();
void setUnits(enum Units units);
void showTracks(bool show);
void showRoutes(bool show) {Q_UNUSED(show);}
private:
qreal avg() const;

9
src/timetype.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef TIMETYPE_H
#define TIMETYPE_H
enum TimeType {
Total,
Moving
};
#endif // TIMETYPE_H

132
src/track.cpp
View File

@ -9,6 +9,9 @@
#define WINDOW_CF 3
#define WINDOW_PF 3
#define PAUSE_SPEED 0.5
#define PAUSE_TIME_DIFF 10
static qreal median(QVector<qreal> v)
{
@ -43,30 +46,31 @@ static QSet<int> eliminate(const QVector<qreal> &v, int window)
return rm;
}
static Graph filter(const Graph &v, int window)
static Graph filter(const Graph &g, int window)
{
qreal acc = 0;
Graph ret;
if (v.size() < window)
if (g.size() < window)
return ret;
for (int i = 0; i < window; i++)
acc += v.at(i).y();
acc += g.at(i).y();
for (int i = 0; i <= window/2; i++)
ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
ret.append(GraphPoint(g.at(i).s(), g.at(i).t(), acc/window));
for (int i = window/2 + 1; i < v.size() - window/2; i++) {
acc += v.at(i + window/2).y() - v.at(i - (window/2 + 1)).y();
ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
for (int i = window/2 + 1; i < g.size() - window/2; i++) {
acc += g.at(i + window/2).y() - g.at(i - (window/2 + 1)).y();
ret.append(GraphPoint(g.at(i).s(), g.at(i).t(), acc/window));
}
for (int i = v.size() - window/2; i < v.size(); i++)
ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
for (int i = g.size() - window/2; i < g.size(); i++)
ret.append(GraphPoint(g.at(i).s(), g.at(i).t(), acc/window));
return ret;
}
Track::Track(const TrackData &data) : _data(data)
{
qreal dt, ds, total;
@ -98,13 +102,28 @@ Track::Track(const TrackData &data) : _data(data)
}
}
_pause = 0;
for (int i = 1; i < data.count(); i++) {
if (_time.at(i) > _time.at(i-1) + PAUSE_TIME_DIFF
&& _speed.at(i) < PAUSE_SPEED) {
_pause += _time.at(i) - _time.at(i-1);
_stop.insert(i-1);
_stop.insert(i);
}
}
_outliers = eliminate(_speed, WINDOW_OE);
QSet<int>::const_iterator it;
for (it = _stop.constBegin(); it != _stop.constEnd(); ++it)
_outliers.remove(*it);
total = 0;
for (int i = 0; i < _data.size(); i++) {
if (_outliers.contains(i))
continue;
total += _distance.at(i);
if (!discardStopPoint(i))
total += _distance.at(i);
_distance[i] = total;
}
}
@ -113,9 +132,6 @@ Graph Track::elevation() const
{
Graph raw;
if (!_data.size())
return raw;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasElevation() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
@ -126,14 +142,16 @@ Graph Track::elevation() const
Graph Track::speed() const
{
Graph raw;
Graph raw, filtered;
qreal v;
if (!_data.size())
return raw;
QSet<int> stop;
for (int i = 0; i < _data.size(); i++) {
if (_data.at(i).hasSpeed() && !_outliers.contains(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))
v = _data.at(i).speed();
else if (!std::isnan(_speed.at(i)) && !_outliers.contains(i))
v = _speed.at(i);
@ -143,16 +161,19 @@ Graph Track::speed() const
raw.append(GraphPoint(_distance.at(i), _time.at(i), v));
}
return filter(raw, WINDOW_SF);
filtered = filter(raw, WINDOW_SF);
QSet<int>::const_iterator it;
for (it = stop.constBegin(); it != stop.constEnd(); ++it)
filtered[*it].setY(0);
return filtered;
}
Graph Track::heartRate() const
{
Graph raw;
if (!_data.size())
return raw;
for (int i = 0; i < _data.count(); i++)
if (_data.at(i).hasHeartRate() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
@ -175,26 +196,56 @@ Graph Track::temperature() const
Graph Track::cadence() const
{
Graph raw;
Graph raw, filtered;
QSet<int> stop;
qreal c;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasCadence() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).cadence()));
for (int i = 0; i < _data.size(); i++) {
if (_data.at(i).hasCadence() && _stop.contains(i)) {
c = 0;
stop.insert(raw.size());
} else if (_data.at(i).hasCadence() && !_outliers.contains(i))
c = _data.at(i).cadence();
else
continue;
return filter(raw, WINDOW_CF);
raw.append(GraphPoint(_distance.at(i), _time.at(i), c));
}
filtered = filter(raw, WINDOW_CF);
QSet<int>::const_iterator it;
for (it = stop.constBegin(); it != stop.constEnd(); ++it)
filtered[*it].setY(0);
return filtered;
}
Graph Track::power() const
{
Graph raw;
Graph raw, filtered;
QSet<int> stop;
qreal p;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasPower() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).power()));
for (int i = 0; i < _data.size(); i++) {
if (_data.at(i).hasPower() && _stop.contains(i)) {
p = 0;
stop.insert(raw.size());
} else if (_data.at(i).hasPower() && !_outliers.contains(i))
p = _data.at(i).power();
else
continue;
return filter(raw, WINDOW_PF);
raw.append(GraphPoint(_distance.at(i), _time.at(i), p));
}
filtered = filter(raw, WINDOW_PF);
QSet<int>::const_iterator it;
for (it = stop.constBegin(); it != stop.constEnd(); ++it)
filtered[*it].setY(0);
return filtered;
}
qreal Track::distance() const
@ -208,6 +259,11 @@ qreal Track::time() const
(_data.first().timestamp().msecsTo(_data.last().timestamp()) / 1000.0);
}
qreal Track::movingTime() const
{
return (time() - _pause);
}
QDateTime Track::date() const
{
return (_data.size()) ? _data.first().timestamp() : QDateTime();
@ -218,8 +274,14 @@ Path Track::path() const
Path ret;
for (int i = 0; i < _data.size(); i++)
if (!_outliers.contains(i))
if (!_outliers.contains(i) && !discardStopPoint(i))
ret.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));
return ret;
}
bool Track::discardStopPoint(int i) const
{
return (_stop.contains(i) && i > 0 && _stop.contains(i-1)
&& i < _data.size() - 1 && _stop.contains(i+1));
}

6
src/track.h
View File

@ -24,6 +24,7 @@ public:
qreal distance() const;
qreal time() const;
qreal movingTime() const;
QDateTime date() const;
const QString &name() const {return _data.name();}
@ -32,6 +33,8 @@ public:
bool isNull() const {return (_data.size() < 2);}
private:
bool discardStopPoint(int i) const;
const TrackData &_data;
QVector<qreal> _distance;
@ -39,6 +42,9 @@ private:
QVector<qreal> _speed;
QSet<int> _outliers;
QSet<int> _stop;
qreal _pause;
};
#endif // TRACK_H

5
src/trackitem.cpp
View File

@ -14,7 +14,9 @@ QString TrackItem::toolTip()
tt.insert(tr("Description"), _desc);
tt.insert(tr("Distance"), Format::distance(_distance.last(), _units));
if (_time > 0)
tt.insert(tr("Time"), Format::timeSpan(_time));
tt.insert(tr("Total time"), Format::timeSpan(_time));
if (_movingTime > 0)
tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
if (!_date.isNull())
tt.insert(tr("Date"), _date.toString(Qt::SystemLocaleShortDate));
@ -45,6 +47,7 @@ TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
_desc = track.description();
_date = track.date();
_time = track.time();
_movingTime = track.movingTime();
_marker->setPos(_path.elementAt(0));

1
src/trackitem.h
View File

@ -23,6 +23,7 @@ private:
QString _desc;
QDateTime _date;
qreal _time;
qreal _movingTime;
};
#endif // TRACKITEM_H