1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-10 09:14:28 +02:00

Compare commits

..

59 Commits
2.16 ... 2.19

Author SHA1 Message Date
6b8c0231ea Fixed crash on GPX files with empty tracks/routes 2016-09-27 10:19:39 +02:00
eae55b14bb Fixed slider step size in time graphs 2016-09-27 01:48:45 +02:00
29fe054d57 Added proper check for empty graph view. 2016-09-27 01:29:35 +02:00
b95fb80210 Fixed compile issue on Windows.
Some more refactoring.
2016-09-27 01:27:38 +02:00
70f4010f55 Code cleanup 2016-09-26 21:01:58 +02:00
014e260042 Fixed some more display issues 2016-09-26 10:09:56 +02:00
80bf57abfc Back to a correct slider size in PDF output... 2016-09-25 18:57:17 +02:00
473b92e8f7 Fixed route marker display issues.
Code cleanup.
2016-09-25 18:44:33 +02:00
1634b0715c Fixed PDF output on QT4 2016-09-25 18:08:39 +02:00
1a07360d91 Version++ 2016-09-22 21:01:05 +02:00
7e365cb990 Added graph highlighting on track select 2016-09-22 20:59:13 +02:00
19c44f56d6 Added suppport for proxy connections (using system proxy settings) 2016-09-22 20:57:58 +02:00
799079392c Fixed graph slider handling issue 2016-09-21 23:48:11 +02:00
1957a51570 Fixed broken graph handling 2016-09-19 23:35:04 +02:00
e9b32fb582 Fixed Z-order issue 2016-09-19 01:45:28 +02:00
3e421c6aba Added support for time graphs 2016-09-19 00:56:10 +02:00
aa461a04b1 Added support for time graphs 2016-09-19 00:55:03 +02:00
b369ffacef Some more performance improvement magic 2016-09-14 22:37:12 +02:00
6034685fa0 Code cleanup 2016-09-12 23:53:35 +02:00
420e96a2f4 Fixed rendering issues 2016-09-12 23:53:14 +02:00
a5f11cb77b Cosmetics 2016-09-12 02:27:30 +02:00
f9fcbf5de4 Fixed item Z order 2016-09-12 02:25:57 +02:00
058a09a426 Fixed cache issues 2016-09-12 02:01:13 +02:00
ebf3c3bc14 Drawing performance improvement 2016-09-11 17:15:23 +02:00
eeed5ceba3 Better Z-value handling 2016-09-11 13:43:33 +02:00
1827787fc2 Added item shape for better collision detection/hover handling 2016-09-11 13:42:22 +02:00
3074ba9957 Added item hovering 2016-09-10 13:11:46 +02:00
8624b42e0b Various route-releated fixes & improvements 2016-08-30 21:26:28 +02:00
c00ebdeefd version++ 2016-08-30 08:42:32 +02:00
05f1536285 Better handling of empty graphs 2016-08-30 08:39:14 +02:00
bf69ef58ba Fixed some more display issues 2016-08-20 11:28:08 +02:00
adcd603eec Fixed typo 2016-08-19 21:10:19 +02:00
0ee0bd882e Some more graph handling improvements 2016-08-19 19:48:44 +02:00
d48a2aac93 Fixed slider issues 2016-08-16 10:25:08 +02:00
7993e4dcb3 Added initial support for track/route graphs differentiation 2016-08-16 00:27:54 +02:00
d20d94ef05 code cleanup 2016-08-15 08:20:27 +02:00
9f0582cbea Fixed broken track/route handling in some corner cases 2016-08-10 22:16:39 +02:00
1e6925da75 GUI polishing 2016-08-10 21:17:12 +02:00
7cfc05c101 Splited route and track info in status bar 2016-08-10 20:36:09 +02:00
392b829733 Redesigned obscure position marker handling 2016-08-10 20:35:39 +02:00
36083d2fa1 PDF output polishing 2016-08-10 08:20:24 +02:00
63fd7f239c Improved translation 2016-08-10 08:19:55 +02:00
20b107581e Added missing routes related stuff
Refactoring/optimization/cleanup
2016-08-09 23:08:49 +02:00
aacc04520f Added some more data display options 2016-08-09 10:47:49 +02:00
dad85e46a7 Added support for GPX routes 2016-08-09 01:16:19 +02:00
5912506292 Fixed PDF export/print 2016-08-02 23:56:50 +02:00
e3c23d0ffc Error handling fix 2016-08-02 23:05:52 +02:00
efdb31ddc5 version++ 2016-08-02 20:48:46 +02:00
ee2f471ca0 Remaining tool-tip related changes
Improved/fixed POI handling
2016-08-02 20:46:22 +02:00
dafadbab60 Some more tool tips related changes 2016-08-02 00:28:56 +02:00
7de08d116a Fixed track tooltip area handling
Added some more waypoint info to waypoint tooltips.
Refactoring & optimization.
2016-07-28 00:23:22 +02:00
dac06b9537 Added tooltip info to tracks/waypoints 2016-07-25 19:32:36 +02:00
33b6e8954c Added track zoom in/out keyboard controll. 2016-07-21 22:39:53 +02:00
2695745d82 Code cleanup 2016-06-27 20:30:45 +02:00
fc67f6f19a Fixed broken check 2016-06-27 20:29:59 +02:00
07cd536867 Indent cleanup 2016-06-25 11:02:09 +02:00
c3d6294b7a Code cleanup 2016-06-24 00:55:44 +02:00
68671ed994 Refactoring 2016-06-21 00:12:34 +02:00
46989bd7a0 Code cleanup 2016-06-20 23:56:42 +02:00
66 changed files with 3410 additions and 1728 deletions

View File

@ -1,5 +1,5 @@
TARGET = GPXSee TARGET = GPXSee
VERSION = 2.16 VERSION = 2.19
QT += core \ QT += core \
gui \ gui \
network network
@ -27,9 +27,7 @@ HEADERS += src/config.h \
src/downloader.h \ src/downloader.h \
src/units.h \ src/units.h \
src/scaleitem.h \ src/scaleitem.h \
src/nicenum.h \
src/waypoint.h \ src/waypoint.h \
src/trackview.h \
src/track.h \ src/track.h \
src/graphview.h \ src/graphview.h \
src/trackpoint.h \ src/trackpoint.h \
@ -44,7 +42,17 @@ HEADERS += src/config.h \
src/exportdialog.h \ src/exportdialog.h \
src/fileselectwidget.h \ src/fileselectwidget.h \
src/margins.h \ src/margins.h \
src/temperaturegraph.h src/temperaturegraph.h \
src/graphtab.h \
src/misc.h \
src/trackitem.h \
src/tooltip.h \
src/route.h \
src/routeitem.h \
src/graphitem.h \
src/graph.h \
src/pathitem.h \
src/pathview.h
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/gui.cpp \ src/gui.cpp \
src/gpx.cpp \ src/gpx.cpp \
@ -63,8 +71,6 @@ SOURCES += src/main.cpp \
src/maplist.cpp \ src/maplist.cpp \
src/downloader.cpp \ src/downloader.cpp \
src/scaleitem.cpp \ src/scaleitem.cpp \
src/nicenum.cpp \
src/trackview.cpp \
src/track.cpp \ src/track.cpp \
src/graphview.cpp \ src/graphview.cpp \
src/waypointitem.cpp \ src/waypointitem.cpp \
@ -76,7 +82,16 @@ SOURCES += src/main.cpp \
src/exportdialog.cpp \ src/exportdialog.cpp \
src/fileselectwidget.cpp \ src/fileselectwidget.cpp \
src/temperaturegraph.cpp \ src/temperaturegraph.cpp \
src/trackpoint.cpp src/trackpoint.cpp \
src/misc.cpp \
src/waypoint.cpp \
src/trackitem.cpp \
src/tooltip.cpp \
src/route.cpp \
src/routeitem.cpp \
src/graphitem.cpp \
src/pathitem.cpp \
src/pathview.cpp
RESOURCES += gpxsee.qrc RESOURCES += gpxsee.qrc
TRANSLATIONS = lang/gpxsee_cs.ts TRANSLATIONS = lang/gpxsee_cs.ts
macx { macx {

View File

@ -14,6 +14,7 @@
<file>icons/arrow-left-double.png</file> <file>icons/arrow-left-double.png</file>
<file>icons/arrow-right-double.png</file> <file>icons/arrow-right-double.png</file>
<file>icons/view-fullscreen.png</file> <file>icons/view-fullscreen.png</file>
<file>icons/office-chart-line-stacked.png</file>
<file>lang/gpxsee_cs.qm</file> <file>lang/gpxsee_cs.qm</file>
</qresource> </qresource>
</RCC> </RCC>

Binary file not shown.

After

Width:  |  Height:  |  Size: 727 B

View File

@ -1,57 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="cs_CZ"> <TS version="2.1" language="cs_CZ">
<context> <context>
<name>ElevationGraph</name> <name>ElevationGraph</name>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="14"/> <location filename="../src/elevationgraph.cpp" line="48"/>
<source>Distance</source> <location filename="../src/elevationgraph.h" line="16"/>
<translation>Vzdálenost</translation>
</message>
<message>
<location filename="../src/elevationgraph.cpp" line="15"/>
<source>Elevation</source> <source>Elevation</source>
<translation>Výška</translation> <translation>Výška</translation>
</message> </message>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="81"/> <location filename="../src/elevationgraph.cpp" line="141"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../src/elevationgraph.cpp" line="78"/>
<location filename="../src/elevationgraph.cpp" line="98"/>
<source>m</source> <source>m</source>
<translation>m</translation> <translation>m</translation>
</message> </message>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="22"/> <location filename="../src/elevationgraph.cpp" line="58"/>
<source>Ascent</source> <source>Ascent</source>
<translation>Stoupání</translation> <translation>Stoupání</translation>
</message> </message>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="24"/> <location filename="../src/elevationgraph.cpp" line="60"/>
<source>Descent</source> <source>Descent</source>
<translation>Klesání</translation> <translation>Klesání</translation>
</message> </message>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="28"/> <location filename="../src/elevationgraph.cpp" line="64"/>
<source>Minimum</source> <source>Minimum</source>
<translation>Minimum</translation> <translation>Minimum</translation>
</message> </message>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="89"/> <location filename="../src/elevationgraph.cpp" line="144"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/elevationgraph.cpp" line="86"/>
<location filename="../src/elevationgraph.cpp" line="101"/>
<source>ft</source> <source>ft</source>
<translation>ft</translation> <translation>ft</translation>
</message> </message>
<message> <message>
<location filename="../src/elevationgraph.cpp" line="26"/> <location filename="../src/elevationgraph.cpp" line="62"/>
<source>Maximum</source> <source>Maximum</source>
<translation>Maximum</translation> <translation>Maximum</translation>
</message> </message>
@ -162,17 +146,17 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/gui.cpp" line="464"/> <location filename="../src/gui.cpp" line="513"/>
<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> <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> <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>
<message> <message>
<location filename="../src/gui.cpp" line="528"/> <location filename="../src/gui.cpp" line="577"/>
<source>Open file</source> <source>Open file</source>
<translation>Otevřít soubor</translation> <translation>Otevřít soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="606"/> <location filename="../src/gui.cpp" line="658"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Otevřít POI soubor</translation> <translation>Otevřít POI soubor</translation>
</message> </message>
@ -188,8 +172,8 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="196"/> <location filename="../src/gui.cpp" line="196"/>
<location filename="../src/gui.cpp" line="480"/> <location filename="../src/gui.cpp" line="529"/>
<location filename="../src/gui.cpp" line="481"/> <location filename="../src/gui.cpp" line="530"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Ovládací klávesy</translation> <translation>Ovládací klávesy</translation>
</message> </message>
@ -204,20 +188,20 @@
<translation>Znovu načíst</translation> <translation>Znovu načíst</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="382"/> <location filename="../src/gui.cpp" line="446"/>
<source>Show</source> <source>Show</source>
<translation>Zobrazit</translation> <translation>Zobrazit</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="323"/> <location filename="../src/gui.cpp" line="370"/>
<location filename="../src/gui.cpp" line="376"/> <location filename="../src/gui.cpp" line="440"/>
<source>File</source> <source>File</source>
<translation>Soubor</translation> <translation>Soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="194"/> <location filename="../src/gui.cpp" line="194"/>
<location filename="../src/gui.cpp" line="503"/> <location filename="../src/gui.cpp" line="552"/>
<location filename="../src/gui.cpp" line="504"/> <location filename="../src/gui.cpp" line="553"/>
<source>Data sources</source> <source>Data sources</source>
<translation>Zdroje dat</translation> <translation>Zdroje dat</translation>
</message> </message>
@ -232,145 +216,180 @@
<translation>Zavřit POI soubory</translation> <translation>Zavřit POI soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="240"/> <location filename="../src/gui.cpp" line="239"/>
<source>Overlap POIs</source>
<translation>Překrývat POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="243"/>
<source>Show POI labels</source>
<translation>Zobrazovat názvy POI</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="248"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Zobrazit POI</translation> <translation>Zobrazit POI</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="248"/> <location filename="../src/gui.cpp" line="256"/>
<source>Show map</source> <source>Show map</source>
<translation>Zobrazit mapu</translation> <translation>Zobrazit mapu</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="254"/> <location filename="../src/gui.cpp" line="262"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Vymazat mezipaměť dlaždic</translation> <translation>Vymazat mezipaměť dlaždic</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="263"/> <location filename="../src/gui.cpp" line="271"/>
<location filename="../src/gui.cpp" line="267"/> <location filename="../src/gui.cpp" line="275"/>
<location filename="../src/gui.cpp" line="490"/> <location filename="../src/gui.cpp" line="539"/>
<source>Next map</source> <source>Next map</source>
<translation>Následující mapa</translation> <translation>Následující mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="274"/> <location filename="../src/gui.cpp" line="282"/>
<source>Show tracks</source>
<translation>Zobrazit cesty</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="286"/>
<source>Show routes</source>
<translation>Zobrazit trasy</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="290"/>
<source>Show waypoints</source>
<translation>Zobrazit navigační body</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="294"/>
<source>Waypoint labels</source>
<translation>Názvy navigačních bodů</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="305"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Zobrazovat grafy</translation> <translation>Zobrazovat grafy</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="280"/> <location filename="../src/gui.cpp" line="327"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Zobrazovat nástrojové lišty</translation> <translation>Zobrazovat nástrojové lišty</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="286"/> <location filename="../src/gui.cpp" line="333"/>
<source>Metric</source> <source>Metric</source>
<translation>Metrické</translation> <translation>Metrické</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="291"/> <location filename="../src/gui.cpp" line="338"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Imperiální</translation> <translation>Imperiální</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="297"/> <location filename="../src/gui.cpp" line="344"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Celoobrazovkový režim</translation> <translation>Celoobrazovkový režim</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="305"/> <location filename="../src/gui.cpp" line="352"/>
<source>Next</source> <source>Next</source>
<translation>Následující</translation> <translation>Následující</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="308"/> <location filename="../src/gui.cpp" line="355"/>
<source>Previous</source> <source>Previous</source>
<translation>Předchozí</translation> <translation>Předchozí</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="312"/> <location filename="../src/gui.cpp" line="359"/>
<source>Last</source> <source>Last</source>
<translation>Poslední</translation> <translation>Poslední</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="315"/> <location filename="../src/gui.cpp" line="362"/>
<source>First</source> <source>First</source>
<translation>První</translation> <translation>První</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="337"/> <location filename="../src/gui.cpp" line="384"/>
<source>Map</source> <source>Map</source>
<translation>Mapa</translation> <translation>Mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="344"/> <location filename="../src/gui.cpp" line="391"/>
<source>Graph</source>
<translation>Graf</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="397"/>
<source>POI</source> <source>POI</source>
<translation>POI</translation> <translation>POI</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="345"/> <location filename="../src/gui.cpp" line="398"/>
<source>POI files</source> <source>POI files</source>
<translation>POI soubory</translation> <translation>POI soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="353"/> <location filename="../src/gui.cpp" line="409"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="410"/>
<source>Display</source>
<translation>Zobrazit</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="418"/>
<source>Settings</source> <source>Settings</source>
<translation>Nastavení</translation> <translation>Nastavení</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="354"/> <location filename="../src/gui.cpp" line="419"/>
<source>Units</source> <source>Units</source>
<translation>Jednotky</translation> <translation>Jednotky</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="363"/> <location filename="../src/gui.cpp" line="427"/>
<source>Help</source> <source>Help</source>
<translation>Nápověda</translation> <translation>Nápověda</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="426"/> <location filename="../src/gui.cpp" line="541"/>
<source>Temperature</source>
<translation>Teplota</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="492"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Předchozí mapa</translation> <translation>Předchozí mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="691"/> <location filename="../src/gui.cpp" line="746"/>
<location filename="../src/gui.cpp" line="694"/> <location filename="../src/gui.cpp" line="749"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="871"/> <location filename="../src/gui.cpp" line="758"/>
<source>Routes</source>
<translation>Trasy</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="948"/>
<source>No GPX files loaded</source> <source>No GPX files loaded</source>
<translation>Nejsou načteny žádné GPX soubory</translation> <translation>Nejsou načteny žádné GPX soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="423"/> <location filename="../src/gui.cpp" line="952"/>
<source>Elevation</source> <source>%1 files</source>
<translation>Výška</translation> <translation>%1 souborů</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="424"/> <location filename="../src/gui.cpp" line="532"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="425"/>
<source>Heart rate</source>
<translation>Tep</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="483"/>
<source>Next file</source> <source>Next file</source>
<translation>Následující soubor</translation> <translation>Následující soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="460"/> <location filename="../src/gui.cpp" line="509"/>
<source>Version </source> <source>Version </source>
<translation>Verze </translation> <translation>Verze </translation>
</message> </message>
@ -385,135 +404,119 @@
<translation>Exportovat do PDF...</translation> <translation>Exportovat do PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="484"/> <location filename="../src/gui.cpp" line="760"/>
<source>Waypoints</source>
<translation>Navigační body</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="533"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Předchozí soubor</translation> <translation>Předchozí soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="486"/> <location filename="../src/gui.cpp" line="298"/>
<source>Route waypoints</source>
<translation>Body tras</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="535"/>
<source>First file</source> <source>First file</source>
<translation>První soubor</translation> <translation>První soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="487"/> <location filename="../src/gui.cpp" line="536"/>
<source>Last file</source> <source>Last file</source>
<translation>Poslední soubor</translation> <translation>Poslední soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="488"/> <location filename="../src/gui.cpp" line="537"/>
<source>Append modifier</source> <source>Append modifier</source>
<translation>Modifikátor nahradit/přidat</translation> <translation>Modifikátor nahradit/přidat</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="507"/> <location filename="../src/gui.cpp" line="556"/>
<source>Map (tiles) source URLs are read on program startup from the following file:</source> <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> <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="510"/> <location filename="../src/gui.cpp" line="559"/>
<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> <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> <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>
<message> <message>
<location filename="../src/gui.cpp" line="518"/> <location filename="../src/gui.cpp" line="567"/>
<source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source> <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> <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>
<message> <message>
<location filename="../src/gui.cpp" line="529"/> <location filename="../src/gui.cpp" line="578"/>
<source>GPX files (*.gpx);;All files (*)</source> <source>GPX files (*.gpx);;All files (*)</source>
<translation>Soubory GPX (*.gpx);;Všechny soubory (*)</translation> <translation>Soubory GPX (*.gpx);;Všechny soubory (*)</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="597"/> <location filename="../src/gui.cpp" line="649"/>
<location filename="../src/gui.cpp" line="623"/> <location filename="../src/gui.cpp" line="675"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Řádka: %1</translation> <translation>Řádka: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="607"/> <location filename="../src/gui.cpp" line="659"/>
<source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source> <source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source>
<translation>Soubory GPX (*.gpx);;Soubory CSV (*.csv);;Všechny soubory (*)</translation> <translation>Soubory GPX (*.gpx);;Soubory CSV (*.csv);;Všechny soubory (*)</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="697"/> <location filename="../src/gui.cpp" line="756"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Počet tras</translation> <translation>Cesty</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="703"/>
<location filename="../src/gui.cpp" line="886"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="883"/>
<source>ft</source>
<translation>ft</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="199"/> <location filename="../src/gui.cpp" line="199"/>
<location filename="../src/gui.cpp" line="458"/> <location filename="../src/gui.cpp" line="507"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>O aplikaci GPXSee</translation> <translation>O aplikaci GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="386"/> <location filename="../src/gui.cpp" line="451"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigace</translation> <translation>Navigace</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="506"/> <location filename="../src/gui.cpp" line="555"/>
<source>Map sources</source> <source>Map sources</source>
<translation>Mapové zdroje</translation> <translation>Mapové zdroje</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="517"/> <location filename="../src/gui.cpp" line="566"/>
<source>POIs</source> <source>POIs</source>
<translation>POI body</translation> <translation>POI body</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="702"/> <location filename="../src/gui.cpp" line="313"/>
<location filename="../src/gui.cpp" line="705"/> <location filename="../src/gui.cpp" line="763"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="710"/> <location filename="../src/gui.cpp" line="319"/>
<location filename="../src/gui.cpp" line="765"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="890"/> <location filename="../src/gui.cpp" line="651"/>
<source>m</source> <location filename="../src/gui.cpp" line="676"/>
<translation>m</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="878"/>
<source>%1 tracks</source>
<translation>Počet tras: %1</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="706"/>
<location filename="../src/gui.cpp" line="893"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../src/gui.cpp" line="599"/>
<location filename="../src/gui.cpp" line="624"/>
<source>Error</source> <source>Error</source>
<translation>Chyba</translation> <translation>Chyba</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="594"/> <location filename="../src/gui.cpp" line="646"/>
<source>Error loading GPX file: <source>Error loading GPX file:
%1</source> %1</source>
<translation>Soubor GPX nelze otevřít: <translation>Soubor GPX nelze otevřít:
%1</translation> %1</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="620"/> <location filename="../src/gui.cpp" line="672"/>
<source>Error loading POI file: <source>Error loading POI file:
%1</source> %1</source>
<translation>Soubor POI nelze otevřít: <translation>Soubor POI nelze otevřít:
@ -521,185 +524,240 @@
</message> </message>
</context> </context>
<context> <context>
<name>HeartRateGraph</name> <name>GraphView</name>
<message> <message>
<location filename="../src/heartrategraph.cpp" line="10"/> <location filename="../src/graphview.cpp" line="111"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="11"/>
<source>Heart rate</source>
<translation>Tep</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="78"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="9"/>
<source>1/min</source>
<translation>1/min</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="18"/>
<source>Average</source>
<translation>Průměr</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="20"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="75"/>
<source>m</source> <source>m</source>
<translation>m</translation> <translation>m</translation>
</message> </message>
<message> <message>
<location filename="../src/heartrategraph.cpp" line="83"/> <location filename="../src/graphview.cpp" line="114"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="86"/>
<source>mi</source>
<translation>mi</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="../src/scaleitem.cpp" line="81"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/scaleitem.cpp" line="81"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/scaleitem.cpp" line="83"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../src/scaleitem.cpp" line="83"/> <location filename="../src/graphview.cpp" line="119"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/graphview.cpp" line="122"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/graphview.cpp" line="128"/>
<source>s</source>
<translation>s</translation>
</message>
<message>
<location filename="../src/graphview.cpp" line="131"/>
<source>min</source>
<translation>min</translation>
</message>
<message>
<location filename="../src/graphview.cpp" line="134"/>
<source>h</source>
<translation>h</translation>
</message>
<message>
<location filename="../src/graphview.cpp" line="160"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message>
<location filename="../src/graphview.cpp" line="162"/>
<source>Time</source>
<translation>Čas</translation>
</message>
</context>
<context>
<name>HeartRateGraph</name>
<message>
<location filename="../src/heartrategraph.cpp" line="11"/>
<location filename="../src/heartrategraph.h" line="15"/>
<source>Heart rate</source>
<translation>Tep</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="10"/>
<source>1/min</source>
<translation>1/min</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="19"/>
<source>Average</source>
<translation>Průměr</translation>
</message>
<message>
<location filename="../src/heartrategraph.cpp" line="21"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
</context>
<context>
<name>Misc</name>
<message>
<location filename="../src/misc.cpp" line="55"/>
<location filename="../src/misc.cpp" line="76"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/misc.cpp" line="58"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/misc.cpp" line="62"/>
<location filename="../src/misc.cpp" line="73"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
<location filename="../src/misc.cpp" line="65"/>
<source>km</source>
<translation>km</translation>
</message>
</context>
<context>
<name>RouteItem</name>
<message>
<location filename="../src/routeitem.cpp" line="15"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
</context>
<context>
<name>ScaleItem</name>
<message>
<location filename="../src/scaleitem.cpp" line="90"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/scaleitem.cpp" line="91"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/scaleitem.cpp" line="93"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../src/scaleitem.cpp" line="94"/>
<source>m</source> <source>m</source>
<translation>m</translation> <translation>m</translation>
</message> </message>
</context> </context>
<context> <context>
<name>SpeedGraph</name> <name>SpeedGraph</name>
<message>
<location filename="../src/speedgraph.cpp" line="11"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message> <message>
<location filename="../src/speedgraph.cpp" line="12"/> <location filename="../src/speedgraph.cpp" line="12"/>
<location filename="../src/speedgraph.h" line="16"/>
<source>Speed</source> <source>Speed</source>
<translation>Rychlost</translation> <translation>Rychlost</translation>
</message> </message>
<message> <message>
<location filename="../src/speedgraph.cpp" line="72"/> <location filename="../src/speedgraph.cpp" line="74"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="75"/>
<source>km</source>
<translation></translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="80"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="92"/>
<source>km/h</source> <source>km/h</source>
<translation>km/h</translation> <translation>km/h</translation>
</message> </message>
<message> <message>
<location filename="../src/speedgraph.cpp" line="19"/> <location filename="../src/speedgraph.cpp" line="20"/>
<source>Average</source> <source>Average</source>
<translation>Průměr</translation> <translation>Průměr</translation>
</message> </message>
<message> <message>
<location filename="../src/speedgraph.cpp" line="21"/> <location filename="../src/speedgraph.cpp" line="22"/>
<source>Maximum</source> <source>Maximum</source>
<translation>Maximum</translation> <translation>Maximum</translation>
</message> </message>
<message> <message>
<location filename="../src/speedgraph.cpp" line="83"/> <location filename="../src/speedgraph.cpp" line="77"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/speedgraph.cpp" line="95"/>
<source>mi/h</source> <source>mi/h</source>
<translation>mi/h</translation> <translation>mi/h</translation>
</message> </message>
</context> </context>
<context> <context>
<name>TemperatureGraph</name> <name>TemperatureGraph</name>
<message>
<location filename="../src/temperaturegraph.cpp" line="10"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message> <message>
<location filename="../src/temperaturegraph.cpp" line="11"/> <location filename="../src/temperaturegraph.cpp" line="11"/>
<location filename="../src/temperaturegraph.h" line="15"/>
<source>Temperature</source> <source>Temperature</source>
<translation>Teplota</translation> <translation>Teplota</translation>
</message> </message>
<message> <message>
<location filename="../src/temperaturegraph.cpp" line="18"/> <location filename="../src/temperaturegraph.cpp" line="19"/>
<source>Average</source> <source>Average</source>
<translation>Průměr</translation> <translation>Průměr</translation>
</message> </message>
<message> <message>
<location filename="../src/temperaturegraph.cpp" line="20"/> <location filename="../src/temperaturegraph.cpp" line="21"/>
<source>Minimum</source> <source>Minimum</source>
<translation>Minimum</translation> <translation>Minimum</translation>
</message> </message>
<message> <message>
<location filename="../src/temperaturegraph.cpp" line="22"/> <location filename="../src/temperaturegraph.cpp" line="23"/>
<source>Maximum</source> <source>Maximum</source>
<translation>Maximum</translation> <translation>Maximum</translation>
</message> </message>
<message> <message>
<location filename="../src/temperaturegraph.cpp" line="77"/> <location filename="../src/temperaturegraph.cpp" line="81"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
<location filename="../src/temperaturegraph.cpp" line="80"/>
<source>km</source>
<translation>km</translation>
</message>
<message>
<location filename="../src/temperaturegraph.cpp" line="85"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<location filename="../src/temperaturegraph.cpp" line="88"/>
<source>mi</source>
<translation>mi</translation>
</message>
<message>
<location filename="../src/temperaturegraph.cpp" line="97"/>
<source>C</source> <source>C</source>
<translation>C</translation> <translation>C</translation>
</message> </message>
<message> <message>
<location filename="../src/temperaturegraph.cpp" line="100"/> <location filename="../src/temperaturegraph.cpp" line="85"/>
<source>F</source> <source>F</source>
<translation>F</translation> <translation>F</translation>
</message> </message>
</context> </context>
<context>
<name>TrackItem</name>
<message>
<location filename="../src/trackitem.cpp" line="14"/>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
<message>
<location filename="../src/trackitem.cpp" line="17"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
<location filename="../src/trackitem.cpp" line="19"/>
<source>Date</source>
<translation>Datum</translation>
</message>
</context>
<context>
<name>WaypointItem</name>
<message>
<location filename="../src/waypointitem.cpp" line="18"/>
<source>Name</source>
<translation>Název</translation>
</message>
<message>
<location filename="../src/waypointitem.cpp" line="19"/>
<source>Coordinates</source>
<translation>Souřadnice</translation>
</message>
<message>
<location filename="../src/waypointitem.cpp" line="22"/>
<source>Elevation</source>
<translation>Výška</translation>
</message>
<message>
<location filename="../src/waypointitem.cpp" line="25"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location filename="../src/waypointitem.cpp" line="28"/>
<source>Description</source>
<translation>Popis</translation>
</message>
</context>
</TS> </TS>

View File

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

View File

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

View File

@ -2,6 +2,7 @@
#include <QTranslator> #include <QTranslator>
#include <QLocale> #include <QLocale>
#include <QFileOpenEvent> #include <QFileOpenEvent>
#include <QNetworkProxyFactory>
#include "gui.h" #include "gui.h"
#include "app.h" #include "app.h"
@ -18,6 +19,8 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
setAttribute(Qt::AA_DontShowIconsInMenus); setAttribute(Qt::AA_DontShowIconsInMenus);
#endif // Q_OS_MAC #endif // Q_OS_MAC
QNetworkProxyFactory::setUseSystemConfiguration(true);
_gui = new GUI(); _gui = new GUI();
} }

View File

@ -1,10 +1,11 @@
#include <cmath> #include <cmath>
#include <QPainter> #include <QPainter>
#include "config.h" #include "config.h"
#include "nicenum.h" #include "misc.h"
#include "axisitem.h" #include "axisitem.h"
#define AXIS_WIDTH 1
#define TICK 6 #define TICK 6
#define PADDING 6 #define PADDING 6
#define XTICKS 15 #define XTICKS 15
@ -34,6 +35,10 @@ AxisItem::AxisItem(Type type, QGraphicsItem *parent) : QGraphicsItem(parent)
{ {
_type = type; _type = type;
_size = 0; _size = 0;
#ifndef Q_OS_MAC
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
#endif // Q_OS_MAC
} }
void AxisItem::setRange(const RangeF &range) void AxisItem::setRange(const RangeF &range)
@ -41,6 +46,7 @@ void AxisItem::setRange(const RangeF &range)
prepareGeometryChange(); prepareGeometryChange();
_range = range; _range = range;
updateBoundingRect(); updateBoundingRect();
update();
} }
void AxisItem::setSize(qreal size) void AxisItem::setSize(qreal size)
@ -48,6 +54,7 @@ void AxisItem::setSize(qreal size)
prepareGeometryChange(); prepareGeometryChange();
_size = size; _size = size;
updateBoundingRect(); updateBoundingRect();
update();
} }
void AxisItem::setLabel(const QString& label) void AxisItem::setLabel(const QString& label)
@ -55,6 +62,7 @@ void AxisItem::setLabel(const QString& label)
prepareGeometryChange(); prepareGeometryChange();
_label = label; _label = label;
updateBoundingRect(); updateBoundingRect();
update();
} }
void AxisItem::updateBoundingRect() void AxisItem::updateBoundingRect()
@ -75,7 +83,7 @@ void AxisItem::updateBoundingRect()
if (_type == X) { if (_type == X) {
_boundingRect = QRectF(-ss.width()/2, -TICK/2, _boundingRect = QRectF(-ss.width()/2, -TICK/2,
_size + es.width()/2 + ss.width()/2, _size + es.width()/2 + ss.width()/2,
ls.height() + es.height() - fm.descent() + TICK + 2*PADDING); ls.height() + es.height() - fm.descent() + TICK + 2*PADDING + 1);
} else { } else {
int mtw = 0; int mtw = 0;
QRect ts; QRect ts;
@ -88,9 +96,8 @@ void AxisItem::updateBoundingRect()
mtw = qMax(ts.width(), mtw); mtw = qMax(ts.width(), mtw);
} }
_boundingRect = QRectF(-(ls.height() + mtw + 2*PADDING _boundingRect = QRectF(-(ls.height() + mtw + 2*PADDING + TICK/2),
- fm.descent() + TICK/2), -(_size + es.height()/2 -(_size + es.height()/2 + fm.descent()), ls.height() + mtw + 2*PADDING
+ fm.descent()), ls.height() -fm.descent() + mtw + 2*PADDING
+ TICK, _size + es.height()/2 + fm.descent() + ss.height()/2); + TICK, _size + es.height()/2 + fm.descent() + ss.height()/2);
} }
} }
@ -108,9 +115,11 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
struct Label l; struct Label l;
qreal range = _range.size(); qreal range = _range.size();
qreal val; qreal val;
QPen pen = QPen(Qt::black, AXIS_WIDTH);
painter->setFont(font); painter->setFont(font);
painter->setPen(pen);
ls = fm.tightBoundingRect(_label); ls = fm.tightBoundingRect(_label);

View File

@ -73,7 +73,8 @@ void Downloader::downloadFinished(QNetworkReply *reply)
Download dl(redirect, filename); Download dl(redirect, filename);
doDownload(dl); doDownload(dl);
} else } else
saveToDisk(filename, reply); if (!saveToDisk(filename, reply))
_errorDownloads.insert(url);
} }
_currentDownloads.removeAll(reply); _currentDownloads.removeAll(reply);

View File

@ -1,97 +1,140 @@
#include <cmath>
#include "config.h" #include "config.h"
#include "gpx.h" #include "gpx.h"
#include "elevationgraph.h" #include "elevationgraph.h"
ElevationGraph::ElevationGraph(QWidget *parent) : GraphView(parent) static qreal nMin(qreal a, qreal b)
{ {
_ascent = 0; if (!std::isnan(a) && !std::isnan(b))
_descent = 0; return qMin(a, b);
else if (!std::isnan(a))
return a;
else if (!std::isnan(b))
return b;
else
return NAN;
}
static qreal nMax(qreal a, qreal b)
{
if (!std::isnan(a) && !std::isnan(b))
return qMax(a, b);
else if (!std::isnan(a))
return a;
else if (!std::isnan(b))
return b;
else
return NAN;
}
ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
{
_trackAscent = 0;
_routeAscent = 0;
_trackDescent = 0;
_routeDescent = 0;
_trackMin = NAN;
_trackMax = NAN;
_routeMin = NAN;
_routeMax = NAN;
_showRoutes = true;
_showTracks = true;
_units = Metric; _units = Metric;
setYUnits(); setYUnits();
setXLabel(tr("Distance"));
setYLabel(tr("Elevation")); setYLabel(tr("Elevation"));
setMinYRange(50.0); setMinYRange(50.0);
} }
void ElevationGraph::addInfo() void ElevationGraph::setInfo()
{ {
GraphView::addInfo(tr("Ascent"), QString::number(_ascent * yScale(), 'f', 0) if (std::isnan(max()) || std::isnan(min()))
+ UNIT_SPACE + yUnits()); clearInfo();
GraphView::addInfo(tr("Descent"), QString::number(_descent * yScale(), 'f', else {
GraphView::addInfo(tr("Ascent"), QString::number(ascent() * yScale(),
'f', 0) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Descent"), QString::number(descent() * yScale(),
'f', 0) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
0) + UNIT_SPACE + yUnits()); 0) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f', 0) GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f',
+ UNIT_SPACE + yUnits()); 0) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f', 0) }
+ UNIT_SPACE + yUnits());
redraw();
} }
void ElevationGraph::loadGPX(const GPX &gpx) void ElevationGraph::loadGraph(const Graph &graph, Type type, PathItem *path)
{ {
for (int i = 0; i < gpx.trackCount(); i++) {
QVector<QPointF> data;
qreal ascent = 0, descent = 0; qreal ascent = 0, descent = 0;
qreal min, max;
gpx.track(i).elevationGraph(data); if (graph.size() < 2) {
if (data.count() < 2) {
skipColor(); skipColor();
continue; return;
} }
for (int j = 1; j < data.size(); j++) { max = min = graph.at(0).y();
qreal cur = data.at(j).y(); for (int j = 1; j < graph.size(); j++) {
qreal prev = data.at(j-1).y(); qreal cur = graph.at(j).y();
qreal prev = graph.at(j-1).y();
if (cur > prev) if (cur > prev)
ascent += cur - prev; ascent += cur - prev;
if (cur < prev) if (cur < prev)
descent += prev - cur; descent += prev - cur;
if (cur < min)
min = cur;
if (cur > max)
max = cur;
} }
_ascent += ascent; if (type == Track) {
_descent += descent; _trackAscent += ascent;
_trackDescent += descent;
loadData(data); _trackMax = nMax(_trackMax, max);
_trackMin = nMin(_trackMin, min);
} else {
_routeAscent += ascent;
_routeDescent += descent;
_routeMax = nMax(_routeMax, max);
_routeMin = nMin(_routeMin, min);
} }
setXUnits(); GraphView::loadGraph(graph, path, type);
addInfo(); }
void ElevationGraph::loadGPX(const GPX &gpx, const QList<PathItem *> &paths)
{
int p = 0;
for (int i = 0; i < gpx.tracks().count(); i++)
loadGraph(gpx.tracks().at(i)->elevation(), Track, paths.at(p++));
for (int i = 0; i < gpx.routes().count(); i++)
loadGraph(gpx.routes().at(i)->elevation(), Route, paths.at(p++));
setInfo();
redraw();
} }
void ElevationGraph::clear() void ElevationGraph::clear()
{ {
_ascent = 0; _trackAscent = 0;
_descent = 0; _routeAscent = 0;
_trackDescent = 0;
_routeDescent = 0;
_trackMin = NAN;
_trackMax = NAN;
_routeMin = NAN;
_routeMax = NAN;
GraphView::clear(); GraphView::clear();
} }
void ElevationGraph::setXUnits()
{
if (_units == Metric) {
if (bounds().width() < KMINM) {
GraphView::setXUnits(tr("m"));
setXScale(1);
} else {
GraphView::setXUnits(tr("km"));
setXScale(M2KM);
}
} else {
if (bounds().width() < MIINM) {
GraphView::setXUnits(tr("ft"));
setXScale(M2FT);
} else {
GraphView::setXUnits(tr("mi"));
setXScale(M2MI);
}
}
}
void ElevationGraph::setYUnits() void ElevationGraph::setYUnits()
{ {
if (_units == Metric) { if (_units == Metric) {
@ -106,9 +149,86 @@ void ElevationGraph::setYUnits()
void ElevationGraph::setUnits(enum Units units) void ElevationGraph::setUnits(enum Units units)
{ {
_units = units; _units = units;
setXUnits();
setYUnits();
clearInfo(); setYUnits();
addInfo(); setInfo();
GraphView::setUnits(units);
redraw();
}
void ElevationGraph::showTracks(bool show)
{
_showTracks = show;
setInfo();
showGraph(show, Track);
redraw();
}
void ElevationGraph::showRoutes(bool show)
{
_showRoutes = show;
showGraph(show, Route);
setInfo();
redraw();
}
qreal ElevationGraph::ascent() const
{
qreal val = 0;
if (_showRoutes)
val += _routeAscent;
if (_showTracks)
val += _trackAscent;
return val;
}
qreal ElevationGraph::descent() const
{
qreal val = 0;
if (_showRoutes)
val += _routeDescent;
if (_showTracks)
val += _trackDescent;
return val;
}
qreal ElevationGraph::max() const
{
qreal val;
if (_showRoutes && _showTracks)
val = nMax(_routeMax, _trackMax);
else if (_showTracks)
val = _trackMax;
else if (_showRoutes)
val = _routeMax;
else
val = NAN;
return val;
}
qreal ElevationGraph::min() const
{
qreal val;
if (_showRoutes && _showTracks)
val = nMin(_routeMin, _trackMin);
else if (_showTracks)
val = _trackMin;
else if (_showRoutes)
val = _routeMin;
else
val = NAN;
return val;
} }

View File

@ -1,34 +1,45 @@
#ifndef ELEVATIONGRAPH_H #ifndef ELEVATIONGRAPH_H
#define ELEVATIONGRAPH_H #define ELEVATIONGRAPH_H
#include "graphview.h" #include "graphtab.h"
#include "units.h"
class GPX; class GPX;
class PathItem;
class ElevationGraph : public GraphView class ElevationGraph : public GraphTab
{ {
Q_OBJECT Q_OBJECT
public: public:
ElevationGraph(QWidget *parent = 0); ElevationGraph(QWidget *parent = 0);
void loadGPX(const GPX &gpx); QString label() const {return tr("Elevation");}
void loadGPX(const GPX &gpx, const QList<PathItem *> &paths);
void clear(); void clear();
void setUnits(enum Units units); void setUnits(enum Units units);
void showTracks(bool show);
qreal ascent() const {return _ascent;} void showRoutes(bool show);
qreal descent() const {return _descent;}
qreal max() const {return bounds().bottom();}
qreal min() const {return bounds().top();}
private: private:
void setXUnits(); enum Type {Track, Route};
void setYUnits();
void addInfo(); qreal max() const;
qreal min() const;
qreal ascent() const;
qreal descent() const;
void setYUnits();
void setInfo();
void loadGraph(const Graph &graph, Type type, PathItem *path);
qreal _trackAscent, _trackDescent;
qreal _routeAscent, _routeDescent;
qreal _trackMax, _routeMax;
qreal _trackMin, _routeMin;
qreal _ascent, _descent;
enum Units _units; enum Units _units;
bool _showTracks, _showRoutes;
}; };
#endif // ELEVATIONGRAPH_H #endif // ELEVATIONGRAPH_H

View File

@ -4,12 +4,24 @@
#include "gpx.h" #include "gpx.h"
GPX::GPX() : _parser(_track_data, _route_data, _waypoint_data), _errorLine(0)
{
}
GPX::~GPX()
{
for (int i = 0; i < _tracks.count(); i++)
delete _tracks.at(i);
for (int i = 0; i < _routes.count(); i++)
delete _routes.at(i);
}
bool GPX::loadFile(const QString &fileName) bool GPX::loadFile(const QString &fileName)
{ {
QFile file(fileName);
bool ret; bool ret;
QFile file(fileName);
_tracks.clear();
_error.clear(); _error.clear();
_errorLine = 0; _errorLine = 0;
@ -18,11 +30,18 @@ bool GPX::loadFile(const QString &fileName)
return false; return false;
} }
if (!(ret = _parser.loadFile(&file))) { ret = _parser.loadFile(&file);
file.close();
if (ret == false) {
_error = _parser.errorString(); _error = _parser.errorString();
_errorLine = _parser.errorLine(); _errorLine = _parser.errorLine();
return false;
} }
file.close();
return ret; for (int i = 0; i < _track_data.count(); i++)
_tracks.append(new Track(_track_data.at(i)));
for (int i = 0; i < _route_data.count(); i++)
_routes.append(new Route(_route_data.at(i)));
return true;
} }

View File

@ -7,27 +7,34 @@
#include <QString> #include <QString>
#include "waypoint.h" #include "waypoint.h"
#include "track.h" #include "track.h"
#include "route.h"
#include "parser.h" #include "parser.h"
class GPX class GPX
{ {
public: public:
GPX() : _parser(_tracks, _waypoints), _errorLine(0) {} GPX();
~GPX();
bool loadFile(const QString &fileName); bool loadFile(const QString &fileName);
const QString &errorString() const {return _error;} const QString &errorString() const {return _error;}
int errorLine() const {return _errorLine;} int errorLine() const {return _errorLine;}
int trackCount() const {return _tracks.count();} const QList<Track*> &tracks() const {return _tracks;}
Track track(int i) const {return Track(_tracks.at(i));} const QList<Route*> &routes() const {return _routes;}
const QList<Waypoint> &waypoints() const {return _waypoints;} const QList<Waypoint> &waypoints() const {return _waypoint_data;}
private: private:
Parser _parser; Parser _parser;
QString _error; QString _error;
int _errorLine; int _errorLine;
QList<QVector<Trackpoint> > _tracks; QList<Track*> _tracks;
QList<Waypoint> _waypoints; QList<Route*> _routes;
QList<QVector<Trackpoint> > _track_data;
QList<QVector<Waypoint> > _route_data;
QList<Waypoint> _waypoint_data;
}; };
#endif // GPX_H #endif // GPX_H

31
src/graph.h Normal file
View File

@ -0,0 +1,31 @@
#ifndef GRAPH_H
#define GRAPH_H
#include <QVector>
#include <cmath>
enum GraphType {Distance, Time};
class GraphPoint
{
public:
GraphPoint(qreal s = NAN, qreal t = NAN, qreal y = NAN)
: _s(s), _t(t), _y(y) {}
qreal s() const {return _s;}
qreal t() const {return _t;}
qreal y() const {return _y;}
void setS(qreal s) {_s = s;}
void setT(qreal t) {_t = t;}
void setY(qreal y) {_y = y;}
private:
qreal _s;
qreal _t;
qreal _y;
};
typedef QVector<GraphPoint> Graph;
#endif // GRAPH_H

160
src/graphitem.cpp Normal file
View File

@ -0,0 +1,160 @@
#include <QPainter>
#include "graphitem.h"
#define GRAPH_WIDTH 1
#define HOVER_WIDTH 2
static qreal yAtX(const QPainterPath &path, qreal x)
{
int low = 0;
int high = path.elementCount() - 1;
int mid = 0;
Q_ASSERT(high > low);
Q_ASSERT(x >= path.elementAt(low).x && x <= path.elementAt(high).x);
while (low <= high) {
mid = low + ((high - low) / 2);
const QPainterPath::Element &e = path.elementAt(mid);
if (e.x > x)
high = mid - 1;
else if (e.x < x)
low = mid + 1;
else
return e.y;
}
QLineF l;
if (path.elementAt(mid).x < x)
l = QLineF(path.elementAt(mid).x, path.elementAt(mid).y,
path.elementAt(mid+1).x, path.elementAt(mid+1).y);
else
l = QLineF(path.elementAt(mid-1).x, path.elementAt(mid-1).y,
path.elementAt(mid).x, path.elementAt(mid).y);
return l.pointAt((x - l.p1().x()) / (l.p2().x() - l.p1().x())).y();
}
static bool hasTime(const Graph &graph)
{
for (int i = 0; i < graph.count(); i++)
if (std::isnan(graph.at(i).t()))
return false;
return true;
}
GraphItem::GraphItem(const Graph &graph, QGraphicsItem *parent)
: QGraphicsObject(parent)
{
_id = 0;
_type = Distance;
_pen = QPen(Qt::black, GRAPH_WIDTH);
_pen.setCosmetic(true);
_distancePath.moveTo(graph.first().s(), -graph.first().y());
for (int i = 1; i < graph.size(); i++)
_distancePath.lineTo(graph.at(i).s(), -graph.at(i).y());
if (hasTime(graph)) {
_timePath.moveTo(graph.first().t(), -graph.first().y());
for (int i = 1; i < graph.size(); i++)
_timePath.lineTo(graph.at(i).t(), -graph.at(i).y());
}
}
void GraphItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
painter->setPen(_pen);
painter->drawPath((_type == Distance) ? _distancePath : _timePath);
/*
QPen p = QPen(QBrush(Qt::red), 0);
painter->setPen(p);
painter->drawRect(boundingRect());
*/
}
void GraphItem::setGraphType(GraphType type)
{
prepareGeometryChange();
_type = type;
}
void GraphItem::setColor(const QColor &color)
{
_pen.setColor(color);
update();
}
qreal GraphItem::yAtX(qreal x)
{
return ::yAtX((_type == Distance) ? _distancePath : _timePath, x);
}
qreal GraphItem::distanceAtTime(qreal time)
{
int low = 0;
int high = _timePath.elementCount() - 1;
int mid = 0;
Q_ASSERT(high > low);
Q_ASSERT(time >= _timePath.elementAt(low).x
&& time <= _timePath.elementAt(high).x);
while (low <= high) {
mid = low + ((high - low) / 2);
const QPainterPath::Element &e = _timePath.elementAt(mid);
if (e.x > time)
high = mid - 1;
else if (e.x < time)
low = mid + 1;
else
return _distancePath.elementAt(mid).x;
}
QLineF l;
if (_timePath.elementAt(mid).x < time)
l = QLineF(_timePath.elementAt(mid).x, _distancePath.elementAt(mid).x,
_timePath.elementAt(mid+1).x, _distancePath.elementAt(mid+1).x);
else
l = QLineF(_timePath.elementAt(mid-1).x, _distancePath.elementAt(mid-1).x,
_timePath.elementAt(mid).x, _distancePath.elementAt(mid).x);
return l.pointAt((time - l.p1().x()) / (l.p2().x() - l.p1().x())).y();
}
void GraphItem::emitSliderPositionChanged(qreal pos)
{
if (_type == Time) {
if (!_timePath.isEmpty()) {
if (pos <= _timePath.elementAt(_timePath.elementCount() - 1).x)
emit sliderPositionChanged(distanceAtTime(pos));
else
emit sliderPositionChanged(_distancePath.elementAt(
_distancePath.elementCount() - 1).x + 1);
} else
emit sliderPositionChanged(_distancePath.elementAt(
_distancePath.elementCount() - 1).x + 1);
} else
emit sliderPositionChanged(pos);
}
void GraphItem::selected(bool selected)
{
if (selected) {
_pen.setWidth(HOVER_WIDTH);
setZValue(zValue() + 1.0);
} else {
_pen.setWidth(GRAPH_WIDTH);
setZValue(zValue() - 1.0);
}
update();
}

43
src/graphitem.h Normal file
View File

@ -0,0 +1,43 @@
#ifndef GRAPHITEM_H
#define GRAPHITEM_H
#include <QGraphicsObject>
#include <QPen>
#include "graph.h"
class GraphItem : public QGraphicsObject
{
Q_OBJECT
public:
GraphItem(const Graph &graph, QGraphicsItem *parent = 0);
QRectF boundingRect() const
{return (_type == Distance) ? _distancePath.boundingRect()
: _timePath.boundingRect();}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
void setGraphType(GraphType type);
int id() const {return _id;}
void setId(int id) {_id = id;}
void setColor(const QColor &color);
qreal yAtX(qreal x);
qreal distanceAtTime(qreal time);
signals:
void sliderPositionChanged(qreal);
public slots:
void emitSliderPositionChanged(qreal);
void selected(bool selected);
private:
int _id;
QPen _pen;
QPainterPath _distancePath, _timePath;
GraphType _type;
};
#endif // GRAPHITEM_H

27
src/graphtab.h Normal file
View File

@ -0,0 +1,27 @@
#ifndef GRAPHTAB_H
#define GRAPHTAB_H
#include <QList>
#include "graphview.h"
#include "units.h"
class GPX;
class PathItem;
class GraphTab : public GraphView
{
Q_OBJECT
public:
GraphTab(QWidget *parent = 0) : GraphView(parent)
{setFrameShape(QFrame::NoFrame);}
virtual QString label() const = 0;
virtual void loadGPX(const GPX &gpx, 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;
};
#endif // GRAPHTAB_H

View File

@ -1,4 +1,3 @@
#include <QGraphicsView>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QEvent> #include <QEvent>
#include <QPaintEngine> #include <QPaintEngine>
@ -8,11 +7,15 @@
#include "slideritem.h" #include "slideritem.h"
#include "sliderinfoitem.h" #include "sliderinfoitem.h"
#include "infoitem.h" #include "infoitem.h"
#include "graph.h"
#include "graphitem.h"
#include "pathitem.h"
#include "graphview.h" #include "graphview.h"
#define MARGIN 10.0 #define MARGIN 10.0
void Scene::mousePressEvent(QGraphicsSceneMouseEvent *e) void Scene::mousePressEvent(QGraphicsSceneMouseEvent *e)
{ {
if (e->button() == Qt::LeftButton) if (e->button() == Qt::LeftButton)
@ -32,21 +35,20 @@ GraphView::GraphView(QWidget *parent)
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
_xAxis = new AxisItem(AxisItem::X); _xAxis = new AxisItem(AxisItem::X);
_xAxis->setZValue(1.0);
_yAxis = new AxisItem(AxisItem::Y); _yAxis = new AxisItem(AxisItem::Y);
_yAxis->setZValue(1.0);
_slider = new SliderItem(); _slider = new SliderItem();
_slider->setZValue(2.0); _slider->setZValue(2.0);
_sliderInfo = new SliderInfoItem(_slider);
_sliderInfo->setZValue(2.0);
_info = new InfoItem();
connect(_slider, SIGNAL(positionChanged(const QPointF&)), this, connect(_slider, SIGNAL(positionChanged(const QPointF&)), this,
SLOT(emitSliderPositionChanged(const QPointF&))); SLOT(emitSliderPositionChanged(const QPointF&)));
connect(_scene, SIGNAL(mouseClicked(const QPointF&)), this, connect(_scene, SIGNAL(mouseClicked(const QPointF&)), this,
SLOT(newSliderPosition(const QPointF&))); SLOT(newSliderPosition(const QPointF&)));
_info = new InfoItem();
_sliderInfo = new SliderInfoItem(_slider);
_sliderInfo->setZValue(2.0);
_xScale = 1; _xScale = 1;
_yScale = 1; _yScale = 1;
_yOffset = 0; _yOffset = 0;
@ -55,6 +57,12 @@ GraphView::GraphView(QWidget *parent)
_minYRange = 0.01; _minYRange = 0.01;
_sliderPos = 0; _sliderPos = 0;
_units = Metric;
_graphType = Distance;
setGraphType(_graphType);
setUnits(_units);
} }
GraphView::~GraphView() GraphView::~GraphView()
@ -63,24 +71,14 @@ GraphView::~GraphView()
delete _xAxis; delete _xAxis;
if (_yAxis->scene() != _scene) if (_yAxis->scene() != _scene)
delete _yAxis; delete _yAxis;
if (_slider->scene() != _scene) if (_slider->scene() != _scene)
delete _slider; delete _slider;
if (_info->scene() != _scene) if (_info->scene() != _scene)
delete _info; delete _info;
}
void GraphView::updateBounds(const QPointF &point) for (int i = 0; i < _graphs.count(); i++)
{ if (_graphs.at(i)->scene() != _scene)
if (point.x() < _bounds.left()) delete _graphs[i];
_bounds.setLeft(point.x());
if (point.x() > _bounds.right())
_bounds.setRight(point.x());
if (point.y() > _bounds.bottom())
_bounds.setBottom(point.y());
if (point.y() < _bounds.top())
_bounds.setTop(point.y());
} }
void GraphView::createXLabel() void GraphView::createXLabel()
@ -93,64 +91,151 @@ void GraphView::createYLabel()
_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel).arg(_yUnits)); _yAxis->setLabel(QString("%1 [%2]").arg(_yLabel).arg(_yUnits));
} }
void GraphView::setXLabel(const QString &label)
{
_xLabel = label;
createXLabel();
}
void GraphView::setYLabel(const QString &label) void GraphView::setYLabel(const QString &label)
{ {
_yLabel = label; _yLabel = label;
createYLabel(); createYLabel();
} }
void GraphView::setXUnits(const QString &units)
{
_xUnits = units;
createXLabel();
}
void GraphView::setYUnits(const QString &units) void GraphView::setYUnits(const QString &units)
{ {
_yUnits = units; _yUnits = units;
createYLabel(); createYLabel();
} }
void GraphView::loadData(const QVector<QPointF> &data) void GraphView::setXUnits()
{ {
QPainterPath path; if (_graphType == Distance) {
QGraphicsPathItem *pi; if (_units == Metric) {
if (bounds().width() < KMINM) {
_xUnits = tr("m");
if (data.size() < 2) _xScale = 1;
return; } else {
_xUnits = tr("km");
if (!_graphs.size()) _xScale = M2KM;
_bounds.moveTo(data.at(0)); }
} else {
updateBounds(data.at(0)); if (bounds().width() < MIINM) {
path.moveTo(data.at(0).x(), -data.at(0).y()); _xUnits = tr("ft");
for (int i = 1; i < data.size(); i++) { _xScale = M2FT;
const QPointF &p = data.at(i); } else {
path.lineTo(p.x(), -p.y()); _xUnits = tr("mi");
updateBounds(p); _xScale = M2MI;
}
}
} else {
if (bounds().width() < MININS) {
_xUnits = tr("s");
_xScale = 1;
} else if (bounds().width() < HINS) {
_xUnits = tr("min");
_xScale = MIN2S;
} else {
_xUnits = tr("h");
_xScale = H2S;
}
} }
pi = new QGraphicsPathItem(path); createXLabel();
QBrush brush(_palette.color(), Qt::SolidPattern); }
QPen pen(brush, 0);
pi->setPen(pen); void GraphView::setUnits(Units units)
_scene->addItem(pi); {
_graphs.append(pi); _units = units;
setXUnits();
}
void GraphView::setGraphType(GraphType type)
{
_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)->boundingRect();
}
if (type == Distance)
_xLabel = tr("Distance");
else
_xLabel = tr("Time");
setXUnits();
redraw();
}
void GraphView::loadGraph(const Graph &graph, PathItem *path, int id)
{
if (graph.size() < 2)
return;
GraphItem *gi = new GraphItem(graph);
gi->setGraphType(_graphType);
gi->setId(id);
gi->setColor(_palette.color());
connect(this, SIGNAL(sliderPositionChanged(qreal)), gi,
SLOT(emitSliderPositionChanged(qreal)));
connect(gi, SIGNAL(sliderPositionChanged(qreal)), path,
SLOT(moveMarker(qreal)));
connect(path, SIGNAL(selected(bool)), gi, SLOT(selected(bool)));
_graphs.append(gi);
if (!_hide.contains(id)) {
_visible.append(gi);
_scene->addItem(gi);
_bounds |= gi->boundingRect();
setXUnits();
}
}
void GraphView::removeItem(QGraphicsItem *item)
{
if (item->scene() == _scene)
_scene->removeItem(item);
}
void GraphView::addItem(QGraphicsItem *item)
{
if (item->scene() != _scene)
_scene->addItem(item);
}
void GraphView::showGraph(bool show, int id)
{
if (show)
_hide.remove(id);
else
_hide.insert(id);
_visible.clear();
_bounds = QRectF();
for (int i = 0; i < _graphs.count(); i++) {
GraphItem* gi = _graphs.at(i);
if (_hide.contains(gi->id()))
removeItem(gi);
else {
addItem(gi);
_visible.append(gi);
_bounds |= gi->boundingRect();
}
}
} }
void GraphView::redraw() void GraphView::redraw()
{ {
if (!_graphs.isEmpty())
redraw(viewport()->size() - QSizeF(MARGIN, MARGIN)); redraw(viewport()->size() - QSizeF(MARGIN, MARGIN));
} }
QRectF GraphView::bounds() const
{
QRectF br(_bounds);
br.moveTopLeft(QPointF(br.left(), -br.top() - br.height()));
return br;
}
void GraphView::redraw(const QSizeF &size) void GraphView::redraw(const QSizeF &size)
{ {
QRectF r; QRectF r;
@ -160,20 +245,22 @@ void GraphView::redraw(const QSizeF &size)
qreal xs, ys; qreal xs, ys;
if (_xAxis->scene() == _scene) if (_visible.isEmpty() || _bounds.isNull()) {
_scene->removeItem(_xAxis); removeItem(_xAxis);
if (_yAxis->scene() == _scene) removeItem(_yAxis);
_scene->removeItem(_yAxis); removeItem(_slider);
if (_slider->scene() == _scene) removeItem(_info);
_scene->removeItem(_slider); _scene->setSceneRect(QRectF());
if (_info->scene() == _scene) return;
_scene->removeItem(_info); }
for (int i = 0; i < _graphs.size(); i++) addItem(_xAxis);
_graphs.at(i)->resetTransform(); addItem(_yAxis);
addItem(_slider);
addItem(_info);
rx = RangeF(_bounds.left() * _xScale, _bounds.right() * _xScale); rx = RangeF(bounds().left() * _xScale, bounds().right() * _xScale);
ry = RangeF(_bounds.top() * _yScale + _yOffset, _bounds.bottom() * _yScale ry = RangeF(bounds().top() * _yScale + _yOffset, bounds().bottom() * _yScale
+ _yOffset); + _yOffset);
if (ry.size() < _minYRange) if (ry.size() < _minYRange)
ry.resize(_minYRange); ry.resize(_minYRange);
@ -183,7 +270,7 @@ void GraphView::redraw(const QSizeF &size)
mx = _xAxis->margin(); mx = _xAxis->margin();
my = _yAxis->margin(); my = _yAxis->margin();
r = _scene->itemsBoundingRect(); r = _bounds;
if (r.height() < _minYRange) if (r.height() < _minYRange)
r.adjust(0, -(_minYRange/2 - r.height()/2), 0, r.adjust(0, -(_minYRange/2 - r.height()/2), 0,
_minYRange/2 - r.height()/2); _minYRange/2 - r.height()/2);
@ -193,10 +280,12 @@ void GraphView::redraw(const QSizeF &size)
- _info->boundingRect().height()) / r.height(); - _info->boundingRect().height()) / r.height();
transform.scale(xs, ys); transform.scale(xs, ys);
for (int i = 0; i < _graphs.size(); i++) for (int i = 0; i < _visible.size(); i++)
_graphs.at(i)->setTransform(transform); _visible.at(i)->setTransform(transform);
r = _scene->itemsBoundingRect(); QPointF p(r.left() * xs, r.top() * ys);
QSizeF s(r.width() * xs, r.height() * ys);
r = QRectF(p, s);
if (r.height() < _minYRange * ys) if (r.height() < _minYRange * ys)
r.adjust(0, -(_minYRange/2 * ys - r.height()/2), 0, r.adjust(0, -(_minYRange/2 * ys - r.height()/2), 0,
(_minYRange/2) * ys - r.height()/2); (_minYRange/2) * ys - r.height()/2);
@ -205,29 +294,20 @@ void GraphView::redraw(const QSizeF &size)
_yAxis->setSize(r.height()); _yAxis->setSize(r.height());
_xAxis->setPos(r.bottomLeft()); _xAxis->setPos(r.bottomLeft());
_yAxis->setPos(r.bottomLeft()); _yAxis->setPos(r.bottomLeft());
_scene->addItem(_xAxis);
_scene->addItem(_yAxis);
_slider->setArea(r); _slider->setArea(r);
if (_sliderPos > _bounds.right() || _sliderPos < _bounds.left()) updateSliderPosition();
_slider->setVisible(false);
_slider->setPos((_sliderPos / _bounds.width()) * _slider->area().width(),
r.bottom());
_scene->addItem(_slider);
updateSliderInfo(); r |= _xAxis->sceneBoundingRect();
r |= _yAxis->sceneBoundingRect();
r = _scene->itemsBoundingRect();
_info->setPos(r.topLeft() + QPointF(r.width()/2 _info->setPos(r.topLeft() + QPointF(r.width()/2
- _info->boundingRect().width()/2, -_info->boundingRect().height())); - _info->boundingRect().width()/2, -_info->boundingRect().height()));
_scene->addItem(_info);
_scene->setSceneRect(_scene->itemsBoundingRect()); _scene->setSceneRect(_scene->itemsBoundingRect());
} }
void GraphView::resizeEvent(QResizeEvent *) void GraphView::resizeEvent(QResizeEvent *)
{ {
if (!_graphs.empty())
redraw(); redraw();
} }
@ -249,19 +329,14 @@ void GraphView::plot(QPainter *painter, const QRectF &target)
void GraphView::clear() void GraphView::clear()
{ {
if (_xAxis->scene() == _scene)
_scene->removeItem(_xAxis);
if (_yAxis->scene() == _scene)
_scene->removeItem(_yAxis);
if (_slider->scene() == _scene)
_scene->removeItem(_slider);
if (_info->scene() == _scene)
_scene->removeItem(_info);
_slider->clear(); _slider->clear();
_info->clear(); _info->clear();
_scene->clear();
for (int i = 0; i < _graphs.count(); i++)
delete _graphs[i];
_graphs.clear(); _graphs.clear();
_visible.clear();
_palette.reset(); _palette.reset();
_bounds = QRectF(); _bounds = QRectF();
@ -270,54 +345,38 @@ void GraphView::clear()
_scene->setSceneRect(0, 0, 0, 0); _scene->setSceneRect(0, 0, 0, 0);
} }
static qreal yAtX(const QPainterPath &path, qreal x) void GraphView::updateSliderPosition()
{ {
int low = 0; if (bounds().width() <= 0)
int high = path.elementCount() - 1; return;
int mid = 0;
Q_ASSERT(high > low); if (_sliderPos <= bounds().right() && _sliderPos >= bounds().left()) {
Q_ASSERT(x >= path.elementAt(low).x && x <= path.elementAt(high).x); _slider->setPos((_sliderPos / bounds().width())
* _slider->area().width(), _slider->area().bottom());
while (low <= high) { _slider->setVisible(!_visible.isEmpty());
mid = low + ((high - low) / 2); } else {
const QPainterPath::Element &e = path.elementAt(mid); _slider->setPos(_slider->area().left(), _slider->area().bottom());
if (e.x > x) _slider->setVisible(false);
high = mid - 1;
else if (e.x < x)
low = mid + 1;
else
return e.y;
} }
QLineF l; updateSliderInfo();
if (path.elementAt(mid).x < x)
l = QLineF(path.elementAt(mid).x, path.elementAt(mid).y,
path.elementAt(mid+1).x, path.elementAt(mid+1).y);
else
l = QLineF(path.elementAt(mid-1).x, path.elementAt(mid-1).y,
path.elementAt(mid).x, path.elementAt(mid).y);
return l.pointAt((x - l.p1().x()) / (l.p2().x() - l.p1().x())).y();
} }
void GraphView::updateSliderInfo() void GraphView::updateSliderInfo()
{ {
_sliderInfo->setVisible(_graphs.size() == 1); _sliderInfo->setVisible(_visible.count() == 1);
if (!_sliderInfo->isVisible())
if (!_slider->isVisible())
return; return;
const QPainterPath &path = _graphs.at(0)->path(); QRectF br(_visible.first()->boundingRect());
QRectF br = path.boundingRect();
if (br.height() < _minYRange) if (br.height() < _minYRange)
br.adjust(0, -(_minYRange/2 - br.height()/2), 0, br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
_minYRange/2 - br.height()/2); _minYRange/2 - br.height()/2);
qreal y = yAtX(path, _sliderPos); qreal y = _visible.first()->yAtX(_sliderPos);
qreal r = (y - br.bottom()) / br.height(); qreal r = (y - br.bottom()) / br.height();
qreal pos = (_sliderPos / _bounds.width()) * _slider->area().width(); qreal pos = (_sliderPos / bounds().width()) * _slider->area().width();
SliderInfoItem::Side s = (pos + _sliderInfo->boundingRect().width() SliderInfoItem::Side s = (pos + _sliderInfo->boundingRect().width()
> _slider->area().right()) ? SliderInfoItem::Left : SliderInfoItem::Right; > _slider->area().right()) ? SliderInfoItem::Left : SliderInfoItem::Right;
@ -329,37 +388,28 @@ void GraphView::updateSliderInfo()
void GraphView::emitSliderPositionChanged(const QPointF &pos) void GraphView::emitSliderPositionChanged(const QPointF &pos)
{ {
if (_graphs.isEmpty()) if (_slider->area().width() <= 0)
return; return;
_sliderPos = (pos.x() / _slider->area().width()) * _bounds.width(); _sliderPos = (pos.x() / _slider->area().width()) * bounds().width();
emit sliderPositionChanged(_sliderPos); updateSliderPosition();
updateSliderInfo(); emit sliderPositionChanged(_sliderPos);
} }
void GraphView::setSliderPosition(qreal pos) void GraphView::setSliderPosition(qreal pos)
{ {
_sliderPos = pos; if (_visible.isEmpty())
if (_graphs.isEmpty())
return; return;
if (pos > _bounds.right() || pos < _bounds.left()) _sliderPos = pos;
_slider->setVisible(false); updateSliderPosition();
else {
_slider->setPos((pos / _bounds.width()) * _slider->area().width(), 0);
_slider->setVisible(true);
}
} }
void GraphView::newSliderPosition(const QPointF &pos) void GraphView::newSliderPosition(const QPointF &pos)
{ {
if (_slider->area().contains(pos)) { if (_slider->area().contains(pos))
_slider->setPos(pos); _slider->setPos(pos);
_slider->setVisible(true);
emitSliderPositionChanged(pos);
}
} }
void GraphView::addInfo(const QString &key, const QString &value) void GraphView::addInfo(const QString &key, const QString &value)

View File

@ -5,14 +5,19 @@
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QVector> #include <QVector>
#include <QList> #include <QList>
#include <QSet>
#include <QPointF> #include <QPointF>
#include "palette.h" #include "palette.h"
#include "units.h"
#include "graph.h"
class AxisItem; class AxisItem;
class SliderItem; class SliderItem;
class SliderInfoItem; class SliderInfoItem;
class InfoItem; class InfoItem;
class GraphItem;
class PathItem;
class Scene : public QGraphicsScene class Scene : public QGraphicsScene
{ {
@ -34,26 +39,21 @@ public:
GraphView(QWidget *parent = 0); GraphView(QWidget *parent = 0);
~GraphView(); ~GraphView();
void loadData(const QVector<QPointF> &data); void loadGraph(const Graph &graph, PathItem *path, int id = 0);
int count() const {return _graphs.count();}
void redraw(); void redraw();
void clear(); void clear();
int count() const {return _graphs.count();} void showGraph(bool show, int id = 0);
void setGraphType(GraphType type);
void setUnits(Units units);
const QString &xLabel() const {return _xLabel;}
const QString &yLabel() const {return _yLabel;} const QString &yLabel() const {return _yLabel;}
const QString &xUnits() const {return _xUnits;}
const QString &yUnits() const {return _yUnits;} const QString &yUnits() const {return _yUnits;}
qreal xScale() const {return _xScale;}
qreal yScale() const {return _yScale;} qreal yScale() const {return _yScale;}
qreal yOffset() const {return _yOffset;} qreal yOffset() const {return _yOffset;}
void setXLabel(const QString &label);
void setYLabel(const QString &label); void setYLabel(const QString &label);
void setXUnits(const QString &units);
void setYUnits(const QString &units); void setYUnits(const QString &units);
void setXScale(qreal scale) {_xScale = scale;}
void setYScale(qreal scale) {_yScale = scale;} void setYScale(qreal scale) {_yScale = scale;}
void setYOffset(qreal offset) {_yOffset = offset;} void setYOffset(qreal offset) {_yOffset = offset;}
@ -69,22 +69,25 @@ signals:
void sliderPositionChanged(qreal); void sliderPositionChanged(qreal);
protected: protected:
const QRectF &bounds() const {return _bounds;} QRectF bounds() const;
void resizeEvent(QResizeEvent *);
void redraw(const QSizeF &size); void redraw(const QSizeF &size);
void addInfo(const QString &key, const QString &value); void addInfo(const QString &key, const QString &value);
void clearInfo(); void clearInfo();
void skipColor() {_palette.color();} void skipColor() {_palette.color();}
void resizeEvent(QResizeEvent *);
private slots: private slots:
void emitSliderPositionChanged(const QPointF &pos); void emitSliderPositionChanged(const QPointF &pos);
void newSliderPosition(const QPointF &pos); void newSliderPosition(const QPointF &pos);
private: private:
void setXUnits();
void createXLabel(); void createXLabel();
void createYLabel(); void createYLabel();
void updateBounds(const QPointF &point); void updateSliderPosition();
void updateSliderInfo(); void updateSliderInfo();
void removeItem(QGraphicsItem *item);
void addItem(QGraphicsItem *item);
qreal _xScale, _yScale; qreal _xScale, _yScale;
qreal _yOffset; qreal _yOffset;
@ -101,9 +104,14 @@ private:
SliderInfoItem *_sliderInfo; SliderInfoItem *_sliderInfo;
InfoItem *_info; InfoItem *_info;
QList<QGraphicsPathItem*> _graphs; QList<GraphItem*> _graphs;
QList<GraphItem*> _visible;
QSet<int> _hide;
QRectF _bounds; QRectF _bounds;
Palette _palette; Palette _palette;
Units _units;
GraphType _graphType;
}; };
#endif // GRAPHVIEW_H #endif // GRAPHVIEW_H

View File

@ -18,6 +18,7 @@
#include <QLabel> #include <QLabel>
#include <QSettings> #include <QSettings>
#include <QLocale> #include <QLocale>
#include <QPixmapCache>
#include "config.h" #include "config.h"
#include "icons.h" #include "icons.h"
#include "keys.h" #include "keys.h"
@ -29,44 +30,34 @@
#include "speedgraph.h" #include "speedgraph.h"
#include "heartrategraph.h" #include "heartrategraph.h"
#include "temperaturegraph.h" #include "temperaturegraph.h"
#include "trackview.h" #include "pathview.h"
#include "trackinfo.h" #include "trackinfo.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "cpuarch.h" #include "cpuarch.h"
#include "exportdialog.h" #include "exportdialog.h"
#include "graphtab.h"
#include "misc.h"
#include "gui.h" #include "gui.h"
static QString timeSpan(qreal time)
{
unsigned h, m, s;
h = time / 3600;
m = (time - (h * 3600)) / 60;
s = time - (h * 3600) - (m * 60);
return QString("%1:%2:%3").arg(h).arg(m, 2, 10, QChar('0'))
.arg(s, 2, 10, QChar('0'));
}
GUI::GUI(QWidget *parent) : QMainWindow(parent) GUI::GUI(QWidget *parent) : QMainWindow(parent)
{ {
loadMaps(); loadMaps();
loadPOIs(); loadPOIs();
createPathView();
createGraphTabs();
createStatusBar();
createActions(); createActions();
createMenus(); createMenus();
createToolBars(); createToolBars();
createTrackView();
createTrackGraphs();
createStatusBar();
_browser = new FileBrowser(this); _browser = new FileBrowser(this);
_browser->setFilter(QStringList("*.gpx")); _browser->setFilter(QStringList("*.gpx"));
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(_track); layout->addWidget(_pathView);
layout->addWidget(_trackGraphs); layout->addWidget(_graphTabWidget);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
layout->setSpacing(0); layout->setSpacing(0);
@ -80,14 +71,18 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
setWindowTitle(APP_NAME); setWindowTitle(APP_NAME);
setUnifiedTitleAndToolBarOnMac(true); setUnifiedTitleAndToolBarOnMac(true);
_distance = 0;
_time = 0;
_trackCount = 0; _trackCount = 0;
_routeCount = 0;
_waypointCount = 0;
_trackDistance = 0;
_routeDistance = 0;
_time = 0;
_sliderPos = 0; _sliderPos = 0;
updateGraphTabs(); updateGraphTabs();
updateTrackView(); updateTrackView();
updateStatusBarInfo();
readSettings(); readSettings();
@ -96,13 +91,15 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
_exportOrientation = QPrinter::Portrait; _exportOrientation = QPrinter::Portrait;
_exportFileName = QString("%1/export.pdf").arg(QDir::currentPath()); _exportFileName = QString("%1/export.pdf").arg(QDir::currentPath());
_exportMargins = MarginsF(5.0, 5.0, 5.0, 5.0); _exportMargins = MarginsF(5.0, 5.0, 5.0, 5.0);
QPixmapCache::setCacheLimit(65536);
} }
GUI::~GUI() GUI::~GUI()
{ {
for (int i = 0; i < _tabs.size(); i++) { for (int i = 0; i < _tabs.size(); i++) {
if (_trackGraphs->indexOf(_tabs.at(i).first) < 0) if (_graphTabWidget->indexOf(_tabs.at(i)) < 0)
delete _tabs.at(i).first; delete _tabs.at(i);
} }
} }
@ -176,6 +173,9 @@ QAction *GUI::createPOIFileAction(int index)
void GUI::createActions() void GUI::createActions()
{ {
QActionGroup *ag;
// Action Groups // Action Groups
_fileActionGroup = new QActionGroup(this); _fileActionGroup = new QActionGroup(this);
_fileActionGroup->setExclusive(false); _fileActionGroup->setExclusive(false);
@ -199,7 +199,7 @@ void GUI::createActions()
tr("About GPXSee"), this); tr("About GPXSee"), this);
connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about())); connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about()));
// File related actions // File actions
_openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)), _openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
tr("Open"), this); tr("Open"), this);
_openFileAction->setShortcut(OPEN_SHORTCUT); _openFileAction->setShortcut(OPEN_SHORTCUT);
@ -236,6 +236,14 @@ void GUI::createActions()
_closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)), _closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
tr("Close POI files"), this); tr("Close POI files"), this);
connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles())); connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
_overlapPOIAction = new QAction(tr("Overlap POIs"), this);
_overlapPOIAction->setCheckable(true);
connect(_overlapPOIAction, SIGNAL(triggered(bool)), _pathView,
SLOT(setPOIOverlap(bool)));
_showPOILabelsAction = new QAction(tr("Show POI labels"), this);
_showPOILabelsAction->setCheckable(true);
connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _pathView,
SLOT(showPOILabels(bool)));
_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)), _showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
tr("Show POIs"), this); tr("Show POIs"), this);
_showPOIAction->setCheckable(true); _showPOIAction->setCheckable(true);
@ -270,18 +278,57 @@ void GUI::createActions()
addAction(_prevMapAction); addAction(_prevMapAction);
} }
// Settings actions // Data actions
_showGraphsAction = new QAction(tr("Show graphs"), this); _showTracksAction = new QAction(tr("Show tracks"), this);
_showTracksAction->setCheckable(true);
connect(_showTracksAction, SIGNAL(triggered(bool)), this,
SLOT(showTracks(bool)));
_showRoutesAction = new QAction(tr("Show routes"), this);
_showRoutesAction->setCheckable(true);
connect(_showRoutesAction, SIGNAL(triggered(bool)), this,
SLOT(showRoutes(bool)));
_showWaypointsAction = new QAction(tr("Show waypoints"), this);
_showWaypointsAction->setCheckable(true);
connect(_showWaypointsAction, SIGNAL(triggered(bool)), _pathView,
SLOT(showWaypoints(bool)));
_showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this);
_showWaypointLabelsAction->setCheckable(true);
connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _pathView,
SLOT(showWaypointLabels(bool)));
_showRouteWaypointsAction = new QAction(tr("Route waypoints"), this);
_showRouteWaypointsAction->setCheckable(true);
connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _pathView,
SLOT(showRouteWaypoints(bool)));
// Graph actions
_showGraphsAction = new QAction(QIcon(QPixmap(SHOW_GRAPHS_ICON)),
tr("Show graphs"), this);
_showGraphsAction->setCheckable(true); _showGraphsAction->setCheckable(true);
_showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT); _showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT);
connect(_showGraphsAction, SIGNAL(triggered(bool)), this, connect(_showGraphsAction, SIGNAL(triggered(bool)), this,
SLOT(showGraphs(bool))); SLOT(showGraphs(bool)));
addAction(_showGraphsAction); addAction(_showGraphsAction);
ag = new QActionGroup(this);
ag->setExclusive(true);
_distanceGraphAction = new QAction(tr("Distance"), this);
_distanceGraphAction->setCheckable(true);
_distanceGraphAction->setActionGroup(ag);
_distanceGraphAction->setShortcut(DISTANCE_GRAPH_SHORTCUT);
connect(_distanceGraphAction, SIGNAL(triggered()), this,
SLOT(setDistanceGraph()));
_timeGraphAction = new QAction(tr("Time"), this);
_timeGraphAction->setCheckable(true);
_timeGraphAction->setActionGroup(ag);
_timeGraphAction->setShortcut(TIME_GRAPH_SHORTCUT);
connect(_timeGraphAction, SIGNAL(triggered()), this,
SLOT(setTimeGraph()));
// Settings actions
_showToolbarsAction = new QAction(tr("Show toolbars"), this); _showToolbarsAction = new QAction(tr("Show toolbars"), this);
_showToolbarsAction->setCheckable(true); _showToolbarsAction->setCheckable(true);
connect(_showToolbarsAction, SIGNAL(triggered(bool)), this, connect(_showToolbarsAction, SIGNAL(triggered(bool)), this,
SLOT(showToolbars(bool))); SLOT(showToolbars(bool)));
QActionGroup *ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_metricUnitsAction = new QAction(tr("Metric"), this); _metricUnitsAction = new QAction(tr("Metric"), this);
_metricUnitsAction->setCheckable(true); _metricUnitsAction->setCheckable(true);
@ -320,51 +367,68 @@ void GUI::createActions()
void GUI::createMenus() void GUI::createMenus()
{ {
_fileMenu = menuBar()->addMenu(tr("File")); QMenu *fileMenu = menuBar()->addMenu(tr("File"));
_fileMenu->addAction(_openFileAction); fileMenu->addAction(_openFileAction);
_fileMenu->addSeparator(); fileMenu->addSeparator();
_fileMenu->addAction(_printFileAction); fileMenu->addAction(_printFileAction);
_fileMenu->addAction(_exportFileAction); fileMenu->addAction(_exportFileAction);
_fileMenu->addSeparator(); fileMenu->addSeparator();
_fileMenu->addAction(_reloadFileAction); fileMenu->addAction(_reloadFileAction);
_fileMenu->addSeparator(); fileMenu->addSeparator();
_fileMenu->addAction(_closeFileAction); fileMenu->addAction(_closeFileAction);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
_fileMenu->addSeparator(); fileMenu->addSeparator();
_fileMenu->addAction(_exitAction); fileMenu->addAction(_exitAction);
#endif // Q_OS_MAC #endif // Q_OS_MAC
_mapMenu = menuBar()->addMenu(tr("Map")); QMenu *mapMenu = menuBar()->addMenu(tr("Map"));
_mapMenu->addActions(_mapActions); mapMenu->addActions(_mapActions);
_mapMenu->addSeparator(); mapMenu->addSeparator();
_mapMenu->addAction(_clearMapCacheAction); mapMenu->addAction(_clearMapCacheAction);
_mapMenu->addSeparator(); mapMenu->addSeparator();
_mapMenu->addAction(_showMapAction); mapMenu->addAction(_showMapAction);
_poiMenu = menuBar()->addMenu(tr("POI")); QMenu *graphMenu = menuBar()->addMenu(tr("Graph"));
_poiFilesMenu = _poiMenu->addMenu(tr("POI files")); graphMenu->addAction(_distanceGraphAction);
graphMenu->addAction(_timeGraphAction);
graphMenu->addSeparator();
graphMenu->addAction(_showGraphsAction);
QMenu *poiMenu = menuBar()->addMenu(tr("POI"));
_poiFilesMenu = poiMenu->addMenu(tr("POI files"));
_poiFilesMenu->addActions(_poiFilesActions); _poiFilesMenu->addActions(_poiFilesActions);
_poiMenu->addSeparator(); poiMenu->addSeparator();
_poiMenu->addAction(_openPOIAction); poiMenu->addAction(_openPOIAction);
_poiMenu->addAction(_closePOIAction); poiMenu->addAction(_closePOIAction);
_poiMenu->addSeparator(); poiMenu->addSeparator();
_poiMenu->addAction(_showPOIAction); poiMenu->addAction(_showPOILabelsAction);
poiMenu->addAction(_overlapPOIAction);
poiMenu->addSeparator();
poiMenu->addAction(_showPOIAction);
_settingsMenu = menuBar()->addMenu(tr("Settings")); QMenu *dataMenu = menuBar()->addMenu(tr("Data"));
_unitsMenu = _settingsMenu->addMenu(tr("Units")); QMenu *displayMenu = dataMenu->addMenu(tr("Display"));
_unitsMenu->addAction(_metricUnitsAction); displayMenu->addAction(_showWaypointLabelsAction);
_unitsMenu->addAction(_imperialUnitsAction); displayMenu->addAction(_showRouteWaypointsAction);
_settingsMenu->addSeparator(); dataMenu->addSeparator();
_settingsMenu->addAction(_showToolbarsAction); dataMenu->addAction(_showTracksAction);
_settingsMenu->addAction(_showGraphsAction); dataMenu->addAction(_showRoutesAction);
_settingsMenu->addSeparator(); dataMenu->addAction(_showWaypointsAction);
_settingsMenu->addAction(_fullscreenAction);
_helpMenu = menuBar()->addMenu(tr("Help")); QMenu *settingsMenu = menuBar()->addMenu(tr("Settings"));
_helpMenu->addAction(_dataSourcesAction); QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
_helpMenu->addAction(_keysAction); unitsMenu->addAction(_metricUnitsAction);
_helpMenu->addSeparator(); unitsMenu->addAction(_imperialUnitsAction);
_helpMenu->addAction(_aboutAction); settingsMenu->addSeparator();
settingsMenu->addAction(_showToolbarsAction);
settingsMenu->addSeparator();
settingsMenu->addAction(_fullscreenAction);
QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
helpMenu->addAction(_dataSourcesAction);
helpMenu->addAction(_keysAction);
helpMenu->addSeparator();
helpMenu->addAction(_aboutAction);
} }
void GUI::createToolBars() void GUI::createToolBars()
@ -382,6 +446,7 @@ void GUI::createToolBars()
_showToolBar = addToolBar(tr("Show")); _showToolBar = addToolBar(tr("Show"));
_showToolBar->addAction(_showPOIAction); _showToolBar->addAction(_showPOIAction);
_showToolBar->addAction(_showMapAction); _showToolBar->addAction(_showMapAction);
_showToolBar->addAction(_showGraphsAction);
_navigationToolBar = addToolBar(tr("Navigation")); _navigationToolBar = addToolBar(tr("Navigation"));
_navigationToolBar->addAction(_firstAction); _navigationToolBar->addAction(_firstAction);
@ -390,48 +455,34 @@ void GUI::createToolBars()
_navigationToolBar->addAction(_lastAction); _navigationToolBar->addAction(_lastAction);
} }
void GUI::createTrackView() void GUI::createPathView()
{ {
_track = new TrackView(this); _pathView = new PathView(this);
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
_track->setFrameShape(QFrame::NoFrame); _pathView->setFrameShape(QFrame::NoFrame);
#endif // Q_OS_WIN32 #endif // Q_OS_WIN32
} }
void GUI::createTrackGraphs() void GUI::createGraphTabs()
{ {
_elevationGraph = new ElevationGraph; _graphTabWidget = new QTabWidget;
_elevationGraph->setFrameShape(QFrame::NoFrame); connect(_graphTabWidget, SIGNAL(currentChanged(int)), this,
_speedGraph = new SpeedGraph;
_speedGraph->setFrameShape(QFrame::NoFrame);
_heartRateGraph = new HeartRateGraph;
_heartRateGraph->setFrameShape(QFrame::NoFrame);
_temperatureGraph = new TemperatureGraph;
_temperatureGraph->setFrameShape(QFrame::NoFrame);
_trackGraphs = new QTabWidget;
connect(_trackGraphs, SIGNAL(currentChanged(int)), this,
SLOT(graphChanged(int))); SLOT(graphChanged(int)));
_trackGraphs->setFixedHeight(200); _graphTabWidget->setFixedHeight(200);
_trackGraphs->setSizePolicy( _graphTabWidget->setSizePolicy(
QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed)); QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed));
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
_trackGraphs->setDocumentMode(true); _graphTabWidget->setDocumentMode(true);
#endif // Q_OS_WIN32 #endif // Q_OS_WIN32
_tabs.append(GraphTab(_elevationGraph, tr("Elevation"))); _tabs.append(new ElevationGraph);
_tabs.append(GraphTab(_speedGraph, tr("Speed"))); _tabs.append(new SpeedGraph);
_tabs.append(GraphTab(_heartRateGraph, tr("Heart rate"))); _tabs.append(new HeartRateGraph);
_tabs.append(GraphTab(_temperatureGraph, tr("Temperature"))); _tabs.append(new TemperatureGraph);
connect(_elevationGraph, SIGNAL(sliderPositionChanged(qreal)), this, for (int i = 0; i < _tabs.count(); i++)
SLOT(sliderPositionChanged(qreal))); connect(_tabs.at(i), SIGNAL(sliderPositionChanged(qreal)), this,
connect(_speedGraph, SIGNAL(sliderPositionChanged(qreal)), this,
SLOT(sliderPositionChanged(qreal)));
connect(_heartRateGraph, SIGNAL(sliderPositionChanged(qreal)), this,
SLOT(sliderPositionChanged(qreal)));
connect(_temperatureGraph, SIGNAL(sliderPositionChanged(qreal)), this,
SLOT(sliderPositionChanged(qreal))); SLOT(sliderPositionChanged(qreal)));
} }
@ -447,8 +498,6 @@ void GUI::createStatusBar()
statusBar()->addPermanentWidget(_distanceLabel, 1); statusBar()->addPermanentWidget(_distanceLabel, 1);
statusBar()->addPermanentWidget(_timeLabel, 1); statusBar()->addPermanentWidget(_timeLabel, 1);
statusBar()->setSizeGripEnabled(false); statusBar()->setSizeGripEnabled(false);
updateStatusBarInfo();
} }
void GUI::about() void GUI::about()
@ -563,30 +612,33 @@ bool GUI::openFile(const QString &fileName)
bool GUI::loadFile(const QString &fileName) bool GUI::loadFile(const QString &fileName)
{ {
GPX gpx; GPX gpx;
QList<PathItem*> paths;
if (gpx.loadFile(fileName)) { if (gpx.loadFile(fileName)) {
_elevationGraph->loadGPX(gpx); paths = _pathView->loadGPX(gpx);
_speedGraph->loadGPX(gpx); for (int i = 0; i < _tabs.count(); i++)
_heartRateGraph->loadGPX(gpx); _tabs.at(i)->loadGPX(gpx, paths);
_temperatureGraph->loadGPX(gpx);
updateGraphTabs(); updateGraphTabs();
_track->setHidden(false); _pathView->setHidden(false);
_track->loadGPX(gpx);
if (_showPOIAction->isChecked()) if (_showPOIAction->isChecked())
_track->loadPOI(_poi); _pathView->loadPOI(_poi);
_track->movePositionMarker(_sliderPos);
for (int i = 0; i < gpx.trackCount(); i++) { for (int i = 0; i < gpx.tracks().count(); i++) {
_distance += gpx.track(i).distance(); _trackDistance += gpx.tracks().at(i)->distance();
_time += gpx.track(i).time(); _time += gpx.tracks().at(i)->time();
const QDate &date = gpx.track(i).date().date(); const QDate &date = gpx.tracks().at(i)->date().date();
if (_dateRange.first.isNull() || _dateRange.first > date) if (_dateRange.first.isNull() || _dateRange.first > date)
_dateRange.first = date; _dateRange.first = date;
if (_dateRange.second.isNull() || _dateRange.second < date) if (_dateRange.second.isNull() || _dateRange.second < date)
_dateRange.second = date; _dateRange.second = date;
} }
_trackCount += gpx.tracks().count();
_trackCount += gpx.trackCount(); for (int i = 0; i < gpx.routes().count(); i++)
_routeDistance += gpx.routes().at(i)->distance();
_routeCount += gpx.routes().count();
_waypointCount += gpx.waypoints().count();
return true; return true;
} else { } else {
@ -626,9 +678,10 @@ bool GUI::openPOIFile(const QString &fileName)
return false; return false;
} else { } else {
_showPOIAction->setChecked(true); _showPOIAction->setChecked(true);
_track->loadPOI(_poi); _pathView->loadPOI(_poi);
_poiFilesMenu->addAction(createPOIFileAction( QAction *action = createPOIFileAction(_poi.files().indexOf(fileName));
_poi.files().indexOf(fileName))); action->setChecked(true);
_poiFilesMenu->addAction(action);
return true; return true;
} }
@ -642,7 +695,7 @@ void GUI::closePOIFiles()
delete _poiFilesActions[i]; delete _poiFilesActions[i];
_poiFilesActions.clear(); _poiFilesActions.clear();
_track->clearPOI(); _pathView->clearPOI();
_poi.clear(); _poi.clear();
} }
@ -683,7 +736,9 @@ void GUI::plot(QPrinter *printer)
QPainter p(printer); QPainter p(printer);
TrackInfo info; TrackInfo info;
qreal ih, gh, mh, ratio; qreal ih, gh, mh, ratio;
Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
qreal d = distance();
qreal t = time();
if (_dateRange.first.isValid()) { if (_dateRange.first.isValid()) {
if (_dateRange.first == _dateRange.second) { if (_dateRange.first == _dateRange.second) {
@ -694,20 +749,20 @@ void GUI::plot(QPrinter *printer)
info.insert(tr("Date"), QString("%1 - %2") info.insert(tr("Date"), QString("%1 - %2")
.arg(_dateRange.first.toString(format), .arg(_dateRange.first.toString(format),
_dateRange.second.toString(format))); _dateRange.second.toString(format)));
}
}
if (_trackCount > 1)
info.insert(tr("Tracks"), QString::number(_trackCount)); info.insert(tr("Tracks"), QString::number(_trackCount));
} if (_routeCount > 1)
} info.insert(tr("Routes"), QString::number(_routeCount));
if (_distance > 0) { if (_waypointCount > 2)
if (_imperialUnitsAction->isChecked()) { info.insert(tr("Waypoints"), QString::number(_waypointCount));
info.insert(tr("Distance"), QString::number(_distance * M2MI, 'f',
1) + UNIT_SPACE + tr("mi")); if (d > 0)
} else { info.insert(tr("Distance"), ::distance(d, units));
info.insert(tr("Distance"), QString::number(_distance * M2KM, 'f', if (t > 0)
1) + UNIT_SPACE + tr("km")); info.insert(tr("Time"), ::timeSpan(t));
}
}
if (_time > 0)
info.insert(tr("Time"), timeSpan(_time));
ratio = p.paintEngine()->paintDevice()->logicalDpiX() / SCREEN_DPI; ratio = p.paintEngine()->paintDevice()->logicalDpiX() / SCREEN_DPI;
@ -719,32 +774,33 @@ void GUI::plot(QPrinter *printer)
mh = ih / 2; mh = ih / 2;
info.plot(&p, QRectF(0, 0, printer->width(), ih)); info.plot(&p, QRectF(0, 0, printer->width(), ih));
} }
if (_trackGraphs->isVisible()) { if (_graphTabWidget->isVisible()) {
qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height())); qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height()));
gh = (printer->width() > printer->height()) gh = (printer->width() > printer->height())
? 0.15 * r * (printer->height() - ih - 2*mh) ? 0.15 * r * (printer->height() - ih - 2*mh)
: 0.15 * (printer->height() - ih - 2*mh); : 0.15 * (printer->height() - ih - 2*mh);
gh = qMax(gh, ratio * 150); gh = qMax(gh, ratio * 150);
GraphView *gv = static_cast<GraphView*>(_trackGraphs->currentWidget()); GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget());
gv->plot(&p, QRectF(0, printer->height() - gh, printer->width(), gh)); gt->plot(&p, QRectF(0, printer->height() - gh, printer->width(), gh));
} else } else
gh = 0; gh = 0;
_track->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height() _pathView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
- (ih + 2*mh + gh))); - (ih + 2*mh + gh)));
} }
void GUI::reloadFile() void GUI::reloadFile()
{ {
_distance = 0; _trackCount = 0;
_routeCount = 0;
_waypointCount = 0;
_trackDistance = 0;
_routeDistance = 0;
_time = 0; _time = 0;
_dateRange = DateRange(QDate(), QDate()); _dateRange = DateRange(QDate(), QDate());
_trackCount = 0;
_elevationGraph->clear(); for (int i = 0; i < _tabs.count(); i++)
_speedGraph->clear(); _tabs.at(i)->clear();
_heartRateGraph->clear(); _pathView->clear();
_temperatureGraph->clear();
_track->clear();
_sliderPos = 0; _sliderPos = 0;
@ -767,18 +823,19 @@ void GUI::reloadFile()
void GUI::closeFiles() void GUI::closeFiles()
{ {
_distance = 0; _trackCount = 0;
_routeCount = 0;
_waypointCount = 0;
_trackDistance = 0;
_routeDistance = 0;
_time = 0; _time = 0;
_dateRange = DateRange(QDate(), QDate()); _dateRange = DateRange(QDate(), QDate());
_trackCount = 0;
_sliderPos = 0; _sliderPos = 0;
_elevationGraph->clear(); for (int i = 0; i < _tabs.count(); i++)
_speedGraph->clear(); _tabs.at(i)->clear();
_heartRateGraph->clear(); _pathView->clear();
_temperatureGraph->clear();
_track->clear();
_files.clear(); _files.clear();
} }
@ -797,22 +854,22 @@ void GUI::closeAll()
void GUI::showPOI(bool checked) void GUI::showPOI(bool checked)
{ {
if (checked) if (checked)
_track->loadPOI(_poi); _pathView->loadPOI(_poi);
else else
_track->clearPOI(); _pathView->clearPOI();
} }
void GUI::showMap(bool checked) void GUI::showMap(bool checked)
{ {
if (checked) if (checked)
_track->setMap(_currentMap); _pathView->setMap(_currentMap);
else else
_track->setMap(0); _pathView->setMap(0);
} }
void GUI::showGraphs(bool checked) void GUI::showGraphs(bool checked)
{ {
_trackGraphs->setHidden(!checked); _graphTabWidget->setHidden(!checked);
} }
void GUI::showToolbars(bool checked) void GUI::showToolbars(bool checked)
@ -834,7 +891,7 @@ void GUI::showToolbars(bool checked)
void GUI::showFullscreen(bool checked) void GUI::showFullscreen(bool checked)
{ {
if (checked) { if (checked) {
_frameStyle = _track->frameStyle(); _frameStyle = _pathView->frameStyle();
_showGraphs = _showGraphsAction->isChecked(); _showGraphs = _showGraphsAction->isChecked();
statusBar()->hide(); statusBar()->hide();
@ -842,7 +899,7 @@ void GUI::showFullscreen(bool checked)
showToolbars(false); showToolbars(false);
showGraphs(false); showGraphs(false);
_showGraphsAction->setChecked(false); _showGraphsAction->setChecked(false);
_track->setFrameStyle(QFrame::NoFrame); _pathView->setFrameStyle(QFrame::NoFrame);
showFullScreen(); showFullScreen();
} else { } else {
@ -853,46 +910,59 @@ void GUI::showFullscreen(bool checked)
_showGraphsAction->setChecked(_showGraphs); _showGraphsAction->setChecked(_showGraphs);
if (_showGraphsAction->isEnabled()) if (_showGraphsAction->isEnabled())
showGraphs(_showGraphs); showGraphs(_showGraphs);
_track->setFrameStyle(_frameStyle); _pathView->setFrameStyle(_frameStyle);
showNormal(); showNormal();
} }
} }
void GUI::showTracks(bool show)
{
_pathView->showTracks(show);
for (int i = 0; i < _tabs.size(); i++)
_tabs.at(i)->showTracks(show);
updateStatusBarInfo();
}
void GUI::showRoutes(bool show)
{
_pathView->showRoutes(show);
for (int i = 0; i < _tabs.size(); i++)
_tabs.at(i)->showRoutes(show);
updateStatusBarInfo();
}
void GUI::clearMapCache() void GUI::clearMapCache()
{ {
_currentMap->clearCache(); _currentMap->clearCache();
_track->redraw(); _pathView->redraw();
} }
void GUI::updateStatusBarInfo() void GUI::updateStatusBarInfo()
{ {
if (_files.count() == 0) { if (_files.count() == 0)
_fileNameLabel->setText(tr("No GPX files loaded")); _fileNameLabel->setText(tr("No GPX files loaded"));
_distanceLabel->clear(); else if (_files.count() == 1)
_timeLabel->clear();
return;
} else if (_files.count() == 1)
_fileNameLabel->setText(_files.at(0)); _fileNameLabel->setText(_files.at(0));
else else
_fileNameLabel->setText(tr("%1 tracks").arg(_trackCount)); _fileNameLabel->setText(tr("%1 files").arg(_files.count()));
if (_imperialUnitsAction->isChecked()) { qreal d = distance();
if (_distance < MIINM) Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
_distanceLabel->setText(QString::number(_distance * M2FT, 'f', 0) if (d > 0)
+ UNIT_SPACE + tr("ft")); _distanceLabel->setText(::distance(distance(), units));
else else
_distanceLabel->setText(QString::number(_distance * M2MI, 'f', 1) _distanceLabel->clear();
+ UNIT_SPACE + tr("mi"));
} else { qreal t = time();
if (_distance < KMINM) if (t > 0)
_distanceLabel->setText(QString::number(_distance, 'f', 0) _timeLabel->setText(::timeSpan(time()));
+ UNIT_SPACE + tr("m"));
else else
_distanceLabel->setText(QString::number(_distance * M2KM, 'f', 1) _timeLabel->clear();
+ UNIT_SPACE + tr("km"));
}
_timeLabel->setText(timeSpan(_time));
} }
void GUI::updateWindowTitle() void GUI::updateWindowTitle()
@ -909,7 +979,7 @@ void GUI::mapChanged(int index)
_currentMap = _maps.at(index); _currentMap = _maps.at(index);
if (_showMapAction->isChecked()) if (_showMapAction->isChecked())
_track->setMap(_currentMap); _pathView->setMap(_currentMap);
} }
void GUI::nextMap() void GUI::nextMap()
@ -935,15 +1005,14 @@ void GUI::poiFileChecked(int index)
_poi.enableFile(_poi.files().at(index), _poi.enableFile(_poi.files().at(index),
_poiFilesActions.at(index)->isChecked()); _poiFilesActions.at(index)->isChecked());
_track->clearPOI(); _pathView->clearPOI();
if (_showPOIAction->isChecked()) if (_showPOIAction->isChecked())
_track->loadPOI(_poi); _pathView->loadPOI(_poi);
} }
void GUI::sliderPositionChanged(qreal pos) void GUI::sliderPositionChanged(qreal pos)
{ {
_sliderPos = pos; _sliderPos = pos;
_track->movePositionMarker(_sliderPos);
} }
void GUI::graphChanged(int index) void GUI::graphChanged(int index)
@ -951,8 +1020,8 @@ void GUI::graphChanged(int index)
if (index < 0) if (index < 0)
return; return;
GraphView *gv = static_cast<GraphView*>(_trackGraphs->widget(index)); GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->widget(index));
gv->setSliderPosition(_sliderPos); gt->setSliderPosition(_sliderPos);
} }
void GUI::updateNavigationActions() void GUI::updateNavigationActions()
@ -977,53 +1046,52 @@ void GUI::updateNavigationActions()
void GUI::updateGraphTabs() void GUI::updateGraphTabs()
{ {
int index; int index;
GraphView *gv; GraphTab *tab;
for (int i = 0; i < _tabs.size(); i++) { for (int i = 0; i < _tabs.size(); i++) {
gv = _tabs.at(i).first; tab = _tabs.at(i);
if (!gv->count() && (index = _trackGraphs->indexOf(gv)) >= 0) if (!tab->count() && (index = _graphTabWidget->indexOf(tab)) >= 0)
_trackGraphs->removeTab(index); _graphTabWidget->removeTab(index);
} }
for (int i = 0; i < _tabs.size(); i++) { for (int i = 0; i < _tabs.size(); i++) {
gv = _tabs.at(i).first; tab = _tabs.at(i);
if (gv->count() && _trackGraphs->indexOf(gv) < 0) if (tab->count() && _graphTabWidget->indexOf(tab) < 0)
_trackGraphs->insertTab(i, gv, _tabs.at(i).second); _graphTabWidget->insertTab(i, tab, _tabs.at(i)->label());
} }
if (_trackGraphs->count()) { if (_graphTabWidget->count()) {
if (_showGraphsAction->isChecked()) if (_showGraphsAction->isChecked())
_trackGraphs->setHidden(false); _graphTabWidget->setHidden(false);
_showGraphsAction->setEnabled(true); _showGraphsAction->setEnabled(true);
} else { } else {
_trackGraphs->setHidden(true); _graphTabWidget->setHidden(true);
_showGraphsAction->setEnabled(false); _showGraphsAction->setEnabled(false);
} }
} }
void GUI::updateTrackView() void GUI::updateTrackView()
{ {
_track->setHidden(!(_track->trackCount() + _track->waypointCount())); _pathView->setHidden(!(_pathView->trackCount() + _pathView->routeCount()
+ _pathView->waypointCount()));
} }
void GUI::setMetricUnits() void GUI::setUnits(Units units)
{ {
_track->setUnits(Metric); _pathView->setUnits(units);
_elevationGraph->setUnits(Metric); for (int i = 0; i <_tabs.count(); i++)
_speedGraph->setUnits(Metric); _tabs.at(i)->setUnits(units);
_heartRateGraph->setUnits(Metric);
_temperatureGraph->setUnits(Metric);
updateStatusBarInfo(); updateStatusBarInfo();
} }
void GUI::setImperialUnits() void GUI::setGraphType(GraphType type)
{ {
_track->setUnits(Imperial); _sliderPos = 0;
_elevationGraph->setUnits(Imperial);
_speedGraph->setUnits(Imperial); for (int i = 0; i <_tabs.count(); i++) {
_heartRateGraph->setUnits(Imperial); _tabs.at(i)->setGraphType(type);
_temperatureGraph->setUnits(Imperial); _tabs.at(i)->setSliderPosition(0);
updateStatusBarInfo(); }
} }
void GUI::next() void GUI::next()
@ -1118,7 +1186,6 @@ void GUI::writeSettings()
settings.setValue(UNITS_SETTING, _imperialUnitsAction->isChecked() settings.setValue(UNITS_SETTING, _imperialUnitsAction->isChecked()
? Imperial : Metric); ? Imperial : Metric);
settings.setValue(SHOW_TOOLBARS_SETTING, _showToolbarsAction->isChecked()); settings.setValue(SHOW_TOOLBARS_SETTING, _showToolbarsAction->isChecked());
settings.setValue(SHOW_GRAPHS_SETTING, _showGraphsAction->isChecked());
settings.endGroup(); settings.endGroup();
settings.beginGroup(MAP_SETTINGS_GROUP); settings.beginGroup(MAP_SETTINGS_GROUP);
@ -1127,8 +1194,15 @@ void GUI::writeSettings()
settings.setValue(SHOW_MAP_SETTING, _showMapAction->isChecked()); settings.setValue(SHOW_MAP_SETTING, _showMapAction->isChecked());
settings.endGroup(); settings.endGroup();
settings.beginGroup(GRAPH_SETTINGS_GROUP);
settings.setValue(SHOW_GRAPHS_SETTING, _showGraphsAction->isChecked());
settings.setValue(GRAPH_TYPE_SETTING, _timeGraphAction->isChecked()
? Time : Distance);
settings.endGroup();
settings.beginGroup(POI_SETTINGS_GROUP); settings.beginGroup(POI_SETTINGS_GROUP);
settings.setValue(SHOW_POI_SETTING, _showPOIAction->isChecked()); settings.setValue(SHOW_POI_SETTING, _showPOIAction->isChecked());
settings.setValue(OVERLAP_POI_SETTING, _overlapPOIAction->isChecked());
settings.remove(DISABLED_POI_FILE_SETTINGS_PREFIX); settings.remove(DISABLED_POI_FILE_SETTINGS_PREFIX);
settings.beginWriteArray(DISABLED_POI_FILE_SETTINGS_PREFIX); settings.beginWriteArray(DISABLED_POI_FILE_SETTINGS_PREFIX);
@ -1140,6 +1214,18 @@ void GUI::writeSettings()
} }
settings.endArray(); settings.endArray();
settings.endGroup(); settings.endGroup();
settings.beginGroup(DATA_SETTINGS_GROUP);
settings.setValue(SHOW_TRACKS_SETTING, _showTracksAction->isChecked());
settings.setValue(SHOW_ROUTES_SETTING, _showRoutesAction->isChecked());
settings.setValue(SHOW_WAYPOINTS_SETTING,
_showWaypointsAction->isChecked());
settings.setValue(SHOW_WAYPOINT_LABELS_SETTING,
_showWaypointLabelsAction->isChecked());
settings.setValue(SHOW_ROUTE_WAYPOINTS_SETTING,
_showRouteWaypointsAction->isChecked());
settings.endGroup();
} }
void GUI::readSettings() void GUI::readSettings()
@ -1159,16 +1245,10 @@ void GUI::readSettings()
_imperialUnitsAction->setChecked(true); _imperialUnitsAction->setChecked(true);
} else } else
_metricUnitsAction->setChecked(true); _metricUnitsAction->setChecked(true);
if (settings.value(SHOW_TOOLBARS_SETTING, true).toBool() == false) { if (settings.value(SHOW_TOOLBARS_SETTING, true).toBool() == false)
showToolbars(false); showToolbars(false);
_showToolbarsAction->setChecked(false); else
} else
_showToolbarsAction->setChecked(true); _showToolbarsAction->setChecked(true);
if (settings.value(SHOW_GRAPHS_SETTING, true).toBool() == false) {
showGraphs(false);
_showGraphsAction->setChecked(false);
} else
_showGraphsAction->setChecked(true);
settings.endGroup(); settings.endGroup();
settings.beginGroup(MAP_SETTINGS_GROUP); settings.beginGroup(MAP_SETTINGS_GROUP);
@ -1179,12 +1259,32 @@ void GUI::readSettings()
_mapActions.at(index)->setChecked(true); _mapActions.at(index)->setChecked(true);
_currentMap = _maps.at(index); _currentMap = _maps.at(index);
if (_showMapAction->isChecked()) if (_showMapAction->isChecked())
_track->setMap(_currentMap); _pathView->setMap(_currentMap);
} else } else
_currentMap = 0; _currentMap = 0;
settings.endGroup(); settings.endGroup();
settings.beginGroup(GRAPH_SETTINGS_GROUP);
if (settings.value(SHOW_GRAPHS_SETTING, true).toBool() == false)
showGraphs(false);
else
_showGraphsAction->setChecked(true);
if (settings.value(GRAPH_TYPE_SETTING, Distance).toInt() == Time) {
setTimeGraph();
_timeGraphAction->setChecked(true);
} else
_distanceGraphAction->setChecked(true);
settings.endGroup();
settings.beginGroup(POI_SETTINGS_GROUP); settings.beginGroup(POI_SETTINGS_GROUP);
if (settings.value(OVERLAP_POI_SETTING, true).toBool() == false)
_pathView->setPOIOverlap(false);
else
_overlapPOIAction->setChecked(true);
if (settings.value(LABELS_POI_SETTING, true).toBool() == false)
_pathView->showPOILabels(false);
else
_showPOILabelsAction->setChecked(true);
if (settings.value(SHOW_POI_SETTING, false).toBool() == true) if (settings.value(SHOW_POI_SETTING, false).toBool() == true)
_showPOIAction->setChecked(true); _showPOIAction->setChecked(true);
for (int i = 0; i < _poiFilesActions.count(); i++) for (int i = 0; i < _poiFilesActions.count(); i++)
@ -1201,6 +1301,33 @@ void GUI::readSettings()
} }
settings.endArray(); settings.endArray();
settings.endGroup(); settings.endGroup();
settings.beginGroup(DATA_SETTINGS_GROUP);
if (settings.value(SHOW_TRACKS_SETTING, true).toBool() == false) {
_pathView->showTracks(false);
for (int i = 0; i < _tabs.count(); i++)
_tabs.at(i)->showTracks(false);
} else
_showTracksAction->setChecked(true);
if (settings.value(SHOW_ROUTES_SETTING, true).toBool() == false) {
_pathView->showRoutes(false);
for (int i = 0; i < _tabs.count(); i++)
_tabs.at(i)->showRoutes(false);
} else
_showRoutesAction->setChecked(true);
if (settings.value(SHOW_WAYPOINTS_SETTING, true).toBool() == false)
_pathView->showWaypoints(false);
else
_showWaypointsAction->setChecked(true);
if (settings.value(SHOW_WAYPOINT_LABELS_SETTING, true).toBool() == false)
_pathView->showWaypointLabels(false);
else
_showWaypointLabelsAction->setChecked(true);
if (settings.value(SHOW_ROUTE_WAYPOINTS_SETTING, true).toBool() == false)
_pathView->showRouteWaypoints(false);
else
_showRouteWaypointsAction->setChecked(true);
settings.endGroup();
} }
int GUI::mapIndex(const QString &name) int GUI::mapIndex(const QString &name)
@ -1211,3 +1338,20 @@ int GUI::mapIndex(const QString &name)
return 0; return 0;
} }
qreal GUI::distance()
{
qreal dist = 0;
if (_showTracksAction->isChecked())
dist += _trackDistance;
if (_showRoutesAction->isChecked())
dist += _routeDistance;
return dist;
}
qreal GUI::time()
{
return (_showTracksAction->isChecked()) ? _time : 0;
}

View File

@ -6,6 +6,8 @@
#include <QList> #include <QList>
#include <QDate> #include <QDate>
#include <QPrinter> #include <QPrinter>
#include "units.h"
#include "graph.h"
#include "poi.h" #include "poi.h"
#include "margins.h" #include "margins.h"
@ -18,12 +20,8 @@ class QLabel;
class QSignalMapper; class QSignalMapper;
class QPrinter; class QPrinter;
class FileBrowser; class FileBrowser;
class GraphView; class GraphTab;
class ElevationGraph; class PathView;
class SpeedGraph;
class HeartRateGraph;
class TemperatureGraph;
class TrackView;
class Map; class Map;
class GUI : public QMainWindow class GUI : public QMainWindow
@ -52,6 +50,8 @@ private slots:
void showGraphs(bool checked); void showGraphs(bool checked);
void showToolbars(bool checked); void showToolbars(bool checked);
void showFullscreen(bool checked); void showFullscreen(bool checked);
void showTracks(bool show);
void showRoutes(bool show);
void clearMapCache(); void clearMapCache();
void nextMap(); void nextMap();
void prevMap(); void prevMap();
@ -65,13 +65,14 @@ private slots:
void last(); void last();
void first(); void first();
void setMetricUnits(); void setMetricUnits() {setUnits(Metric);}
void setImperialUnits(); void setImperialUnits() {setUnits(Imperial);}
void setDistanceGraph() {setGraphType(Distance);}
void setTimeGraph() {setGraphType(Time);}
void sliderPositionChanged(qreal pos); void sliderPositionChanged(qreal pos);
private: private:
typedef QPair<GraphView *, QString> GraphTab;
typedef QPair<QDate, QDate> DateRange; typedef QPair<QDate, QDate> DateRange;
void loadMaps(); void loadMaps();
@ -86,8 +87,8 @@ private:
void createMenus(); void createMenus();
void createToolBars(); void createToolBars();
void createStatusBar(); void createStatusBar();
void createTrackView(); void createPathView();
void createTrackGraphs(); void createGraphTabs();
bool openPOIFile(const QString &fileName); bool openPOIFile(const QString &fileName);
bool loadFile(const QString &fileName); bool loadFile(const QString &fileName);
@ -98,28 +99,25 @@ private:
void updateGraphTabs(); void updateGraphTabs();
void updateTrackView(); void updateTrackView();
void keyPressEvent(QKeyEvent * event); void setUnits(Units units);
void closeEvent(QCloseEvent *event); void setGraphType(GraphType type);
qreal distance();
qreal time();
int mapIndex(const QString &name); int mapIndex(const QString &name);
void readSettings(); void readSettings();
void writeSettings(); void writeSettings();
QMenu *_fileMenu; void keyPressEvent(QKeyEvent *event);
QMenu *_helpMenu; void closeEvent(QCloseEvent *event);
QMenu *_poiMenu;
QMenu *_mapMenu;
QMenu *_settingsMenu;
QMenu *_unitsMenu;
QMenu *_poiFilesMenu;
QToolBar *_fileToolBar; QToolBar *_fileToolBar;
QToolBar *_showToolBar; QToolBar *_showToolBar;
QToolBar *_navigationToolBar; QToolBar *_navigationToolBar;
QTabWidget *_trackGraphs; QMenu *_poiFilesMenu;
QActionGroup *_fileActionGroup; QActionGroup *_fileActionGroup;
QActionGroup *_navigationActionGroup; QActionGroup *_navigationActionGroup;
QAction *_exitAction; QAction *_exitAction;
QAction *_keysAction; QAction *_keysAction;
QAction *_dataSourcesAction; QAction *_dataSourcesAction;
@ -133,10 +131,14 @@ private:
QAction *_openPOIAction; QAction *_openPOIAction;
QAction *_closePOIAction; QAction *_closePOIAction;
QAction *_showPOIAction; QAction *_showPOIAction;
QAction *_overlapPOIAction;
QAction *_showPOILabelsAction;
QAction *_showMapAction; QAction *_showMapAction;
QAction *_fullscreenAction; QAction *_fullscreenAction;
QAction *_clearMapCacheAction; QAction *_clearMapCacheAction;
QAction *_showGraphsAction; QAction *_showGraphsAction;
QAction *_distanceGraphAction;
QAction *_timeGraphAction;
QAction *_showToolbarsAction; QAction *_showToolbarsAction;
QAction *_nextAction; QAction *_nextAction;
QAction *_prevAction; QAction *_prevAction;
@ -146,6 +148,11 @@ private:
QAction *_imperialUnitsAction; QAction *_imperialUnitsAction;
QAction *_nextMapAction; QAction *_nextMapAction;
QAction *_prevMapAction; QAction *_prevMapAction;
QAction *_showTracksAction;
QAction *_showRoutesAction;
QAction *_showWaypointsAction;
QAction *_showWaypointLabelsAction;
QAction *_showRouteWaypointsAction;
QList<QAction*> _mapActions; QList<QAction*> _mapActions;
QList<QAction*> _poiFilesActions; QList<QAction*> _poiFilesActions;
@ -155,12 +162,9 @@ private:
QLabel *_distanceLabel; QLabel *_distanceLabel;
QLabel *_timeLabel; QLabel *_timeLabel;
TrackView *_track; PathView *_pathView;
ElevationGraph *_elevationGraph; QTabWidget *_graphTabWidget;
SpeedGraph *_speedGraph; QList<GraphTab*> _tabs;
HeartRateGraph *_heartRateGraph;
TemperatureGraph *_temperatureGraph;
QList<GraphTab> _tabs;
POI _poi; POI _poi;
QList<Map*> _maps; QList<Map*> _maps;
@ -170,7 +174,10 @@ private:
Map *_currentMap; Map *_currentMap;
int _trackCount; int _trackCount;
qreal _distance; int _routeCount;
int _waypointCount;
qreal _trackDistance;
qreal _routeDistance;
qreal _time; qreal _time;
DateRange _dateRange; DateRange _dateRange;

View File

@ -2,50 +2,55 @@
#include "heartrategraph.h" #include "heartrategraph.h"
HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphView(parent) HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
{ {
_units = Metric; _units = Metric;
_showTracks = true;
GraphView::setYUnits(tr("1/min")); GraphView::setYUnits(tr("1/min"));
setXLabel(tr("Distance"));
setYLabel(tr("Heart rate")); setYLabel(tr("Heart rate"));
setSliderPrecision(0); setSliderPrecision(0);
} }
void HeartRateGraph::addInfo() void HeartRateGraph::setInfo()
{ {
GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f', 0) if (_showTracks) {
+ UNIT_SPACE + yUnits()); GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f',
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f', 0) 0) + UNIT_SPACE + yUnits());
+ UNIT_SPACE + yUnits()); GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
0) + UNIT_SPACE + yUnits());
redraw(); } else
clearInfo();
} }
void HeartRateGraph::loadGPX(const GPX &gpx) void HeartRateGraph::loadGPX(const GPX &gpx, const QList<PathItem *> &paths)
{ {
for (int i = 0; i < gpx.trackCount(); i++) { for (int i = 0; i < gpx.tracks().count(); i++) {
QVector<QPointF> data; const Graph &graph = gpx.tracks().at(i)->heartRate();
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
gpx.track(i).heartRateGraph(data); if (graph.size() < 2) {
if (data.count() < 2) {
skipColor(); skipColor();
continue; continue;
} }
for (int j = 1; j < data.size(); j++) { for (int j = 1; j < graph.size(); j++) {
sum += data.at(j).y() * (data.at(j).x() - data.at(j-1).x()); qreal ds = graph.at(j).s() - graph.at(j-1).s();
w += data.at(j).x() - data.at(j-1).x(); sum += graph.at(j).y() * ds;
w += ds;
} }
_avg.append(QPointF(gpx.track(i).distance(), sum/w)); _avg.append(QPointF(gpx.tracks().at(i)->distance(), sum/w));
loadData(data); GraphView::loadGraph(graph, paths.at(i));
} }
setXUnits(); for (int i = 0; i < gpx.routes().count(); i++)
addInfo(); skipColor();
setInfo();
redraw();
} }
qreal HeartRateGraph::avg() const qreal HeartRateGraph::avg() const
@ -68,32 +73,12 @@ void HeartRateGraph::clear()
GraphView::clear(); GraphView::clear();
} }
void HeartRateGraph::setXUnits() void HeartRateGraph::showTracks(bool show)
{ {
if (_units == Metric) { _showTracks = show;
if (bounds().width() < KMINM) {
GraphView::setXUnits(tr("m"));
setXScale(1);
} else {
GraphView::setXUnits(tr("km"));
setXScale(M2KM);
}
} else {
if (bounds().width() < MIINM) {
GraphView::setXUnits(tr("ft"));
setXScale(M2FT);
} else {
GraphView::setXUnits(tr("mi"));
setXScale(M2MI);
}
}
}
void HeartRateGraph::setUnits(enum Units units) showGraph(show);
{ setInfo();
_units = units;
setXUnits();
clearInfo(); redraw();
addInfo();
} }

View File

@ -1,31 +1,33 @@
#ifndef HEARTRATEGRAPH_H #ifndef HEARTRATEGRAPH_H
#define HEARTRATEGRAPH_H #define HEARTRATEGRAPH_H
#include "graphview.h" #include "graphtab.h"
#include "units.h"
class GPX; class GPX;
class HeartRateGraph : public GraphView class HeartRateGraph : public GraphTab
{ {
Q_OBJECT Q_OBJECT
public: public:
HeartRateGraph(QWidget *parent = 0); HeartRateGraph(QWidget *parent = 0);
void loadGPX(const GPX &gpx); QString label() const {return tr("Heart rate");}
void loadGPX(const GPX &gpx, const QList<PathItem *> &paths);
void clear(); void clear();
void setUnits(enum Units units); void setUnits(enum Units) {}
void showTracks(bool show);
qreal avg() const; void showRoutes(bool show) {Q_UNUSED(show);}
qreal max() const {return bounds().bottom();}
private: private:
void setXUnits(); qreal avg() const;
void addInfo(); qreal max() const {return bounds().bottom();}
void setInfo();
QList<QPointF> _avg; QList<QPointF> _avg;
enum Units _units; enum Units _units;
bool _showTracks;
}; };
#endif // HEARTRATEGRAPH_H #endif // HEARTRATEGRAPH_H

View File

@ -8,6 +8,7 @@
#define CLOSE_FILE_ICON ":/icons/dialog-close.png" #define CLOSE_FILE_ICON ":/icons/dialog-close.png"
#define SHOW_POI_ICON ":/icons/flag.png" #define SHOW_POI_ICON ":/icons/flag.png"
#define SHOW_MAP_ICON ":/icons/applications-internet.png" #define SHOW_MAP_ICON ":/icons/applications-internet.png"
#define SHOW_GRAPHS_ICON ":/icons/office-chart-line-stacked.png"
#define QUIT_ICON ":/icons/application-exit.png" #define QUIT_ICON ":/icons/application-exit.png"
#define RELOAD_FILE_ICON ":/icons/view-refresh.png" #define RELOAD_FILE_ICON ":/icons/view-refresh.png"
#define NEXT_FILE_ICON ":/icons/arrow-right.png" #define NEXT_FILE_ICON ":/icons/arrow-right.png"

View File

@ -20,6 +20,8 @@
#define NEXT_MAP_SHORTCUT QKeySequence::Forward #define NEXT_MAP_SHORTCUT QKeySequence::Forward
#define PREV_MAP_SHORTCUT QKeySequence::Back #define PREV_MAP_SHORTCUT QKeySequence::Back
#define SHOW_GRAPHS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_G) #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)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#define FULLSCREEN_SHORTCUT QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F) #define FULLSCREEN_SHORTCUT QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F)
#else // Q_OS_MAC #else // Q_OS_MAC

View File

@ -35,6 +35,16 @@ QPointF ll2mercator(const QPointF &ll)
return m; return m;
} }
QPointF mercator2ll(const QPointF &m)
{
QPointF ll;
ll.setX(m.x());
ll.setY(rad2deg(2 * atan(exp(deg2rad(m.y()))) - M_PI/2));
return ll;
}
QPoint mercator2tile(const QPointF &m, int z) QPoint mercator2tile(const QPointF &m, int z)
{ {
QPoint tile; QPoint tile;

View File

@ -8,6 +8,7 @@
#define ZOOM_MIN 3 #define ZOOM_MIN 3
QPointF ll2mercator(const QPointF &ll); QPointF ll2mercator(const QPointF &ll);
QPointF mercator2ll(const QPointF &m);
qreal llDistance(const QPointF &p1, const QPointF &p2); qreal llDistance(const QPointF &p1, const QPointF &p2);
QPoint mercator2tile(const QPointF &m, int zoom); QPoint mercator2tile(const QPointF &m, int zoom);
QPointF tile2mercator(const QPoint &tile, int zoom); QPointF tile2mercator(const QPoint &tile, int zoom);

86
src/misc.cpp Normal file
View File

@ -0,0 +1,86 @@
#include <cmath>
#include <QApplication>
#include "misc.h"
double niceNum(double x, int round)
{
int expv;
double f;
double nf;
expv = (int)floor(log10(x));
f = x / pow(10.0, expv);
if (round) {
if (f < 1.5)
nf = 1.0;
else if (f < 3.0)
nf = 2.0;
else if (f < 7.0)
nf = 5.0;
else
nf = 10.0;
} else {
if (f <= 1.0)
nf = 1.0;
else if (f <= 2.0)
nf = 2.0;
else if (f <= 5.0)
nf = 5.0;
else
nf = 10.0;
}
return nf * pow(10.0, expv);
}
QString timeSpan(qreal time)
{
unsigned h, m, s;
h = time / 3600;
m = (time - (h * 3600)) / 60;
s = time - (h * 3600) - (m * 60);
return QString("%1:%2:%3").arg(h).arg(m, 2, 10, QChar('0'))
.arg(s, 2, 10, QChar('0'));
}
QString distance(qreal value, Units units)
{
if (units == Imperial) {
if (value < MIINM)
return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+ qApp->translate("Misc", "ft");
else
return QString::number(value * M2MI, 'f', 1) + UNIT_SPACE
+ qApp->translate("Misc", "mi");
} else {
if (value < KMINM)
return QString::number(value, 'f', 0) + UNIT_SPACE
+ qApp->translate("Misc", "m");
else
return QString::number(value * M2KM, 'f', 1) + UNIT_SPACE
+ qApp->translate("Misc", "km");
}
}
QString elevation(qreal value, Units units)
{
if (units == Metric)
return QString::number(value, 'f', 0) + UNIT_SPACE
+ qApp->translate("Misc", "m");
else
return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+ qApp->translate("Misc", "ft");
}
QString coordinates(const QPointF &value)
{
QChar yH = (value.y() < 0) ? 'S' : 'N';
QChar xH = (value.x() < 0) ? 'W' : 'E';
return QString::number(qAbs(value.y()), 'f', 5) + yH + "," + QChar(0x00A0)
+ QString::number(qAbs(value.x()), 'f', 5) + xH;
}

15
src/misc.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef MISC_H
#define MISC_H
#include <QString>
#include <QPoint>
#include "units.h"
double niceNum(double x, int round);
QString timeSpan(qreal time);
QString distance(qreal value, Units units);
QString elevation(qreal value, Units units);
QString coordinates(const QPointF &value);
#endif // MISC_H

View File

@ -1,34 +0,0 @@
#include <cmath>
#include "nicenum.h"
double niceNum(double x, int round)
{
int expv;
double f;
double nf;
expv = (int)floor(log10(x));
f = x / pow(10.0, expv);
if (round) {
if (f < 1.5)
nf = 1.0;
else if (f < 3.0)
nf = 2.0;
else if (f < 7.0)
nf = 5.0;
else
nf = 10.0;
} else {
if (f <= 1.0)
nf = 1.0;
else if (f <= 2.0)
nf = 2.0;
else if (f <= 5.0)
nf = 5.0;
else
nf = 10.0;
}
return nf * pow(10.0, expv);
}

View File

@ -1,6 +0,0 @@
#ifndef NICENUM_H
#define NICENUM_H
double niceNum(double x, int round);
#endif // NICENUM_H

View File

@ -1,40 +1,96 @@
#include "parser.h" #include "parser.h"
void Parser::handleExtensionData(QStringRef element, const QString &value) void Parser::handleTrackpointData(DataType type, const QString &value)
{ {
if (element == "speed") switch (type) {
_track->last().speed = value.toDouble(); case Elevation:
else if (element == "hr" || element == "heartrate") _track->last().setElevation(value.toLatin1().toDouble());
_track->last().heartRate = value.toDouble(); break;
else if (element == "atemp" || element == "temp") case Time:
_track->last().temperature = value.toDouble(); _track->last().setTimestamp(QDateTime::fromString(value.toLatin1(),
Qt::ISODate));
break;
case Geoidheight:
_track->last().setGeoidHeight(value.toLatin1().toDouble());
break;
case Speed:
_track->last().setSpeed(value.toDouble());
break;
case HeartRate:
_track->last().setHeartRate(value.toDouble());
break;
case Temperature:
_track->last().setTemperature(value.toDouble());
break;
default:
break;
}
} }
void Parser::handleTrekPointData(QStringRef element, const QString &value) void Parser::handleWaypointData(DataType type, const QString &value)
{ {
if (element == "ele") switch (type) {
_track->last().elevation = value.toLatin1().toDouble(); case Name:
else if (element == "time") _waypoints.last().setName(value);
_track->last().timestamp = QDateTime::fromString(value.toLatin1(), break;
Qt::ISODate); case Description:
else if (element == "geoidheight")
_track->last().geoidheight = value.toLatin1().toDouble();
}
void Parser::handleWayPointData(QStringRef element, const QString &value)
{
if (element == "name")
_waypoints.last().setDescription(value); _waypoints.last().setDescription(value);
break;
case Time:
_waypoints.last().setTimestamp(QDateTime::fromString(
value.toLatin1(), Qt::ISODate));
break;
case Elevation:
_waypoints.last().setElevation(value.toLatin1().toDouble());
break;
case Geoidheight:
_waypoints.last().setGeoidHeight(value.toLatin1().toDouble());
break;
default:
break;
}
} }
void Parser::handleTrekPointAttributes(const QXmlStreamAttributes &attr) void Parser::handleRoutepointData(DataType type, const QString &value)
{ {
_track->last().coordinates.setY(attr.value("lat").toLatin1().toDouble()); switch (type) {
_track->last().coordinates.setX(attr.value("lon").toLatin1().toDouble()); case Name:
_route->last().setName(value);
break;
case Description:
_route->last().setDescription(value);
break;
case Time:
_route->last().setTimestamp(QDateTime::fromString(
value.toLatin1(), Qt::ISODate));
break;
case Elevation:
_route->last().setElevation(value.toLatin1().toDouble());
break;
case Geoidheight:
_route->last().setGeoidHeight(value.toLatin1().toDouble());
break;
default:
break;
}
} }
void Parser::handleWayPointAttributes(const QXmlStreamAttributes &attr) void Parser::handleTrackpointAttributes(const QXmlStreamAttributes &attr)
{
_track->last().setCoordinates(QPointF(
attr.value("lon").toLatin1().toDouble(),
attr.value("lat").toLatin1().toDouble()));
}
void Parser::handleRoutepointAttributes(const QXmlStreamAttributes &attr)
{
_route->last().setCoordinates(QPointF(
attr.value("lon").toLatin1().toDouble(),
attr.value("lat").toLatin1().toDouble()));
}
void Parser::handleWaypointAttributes(const QXmlStreamAttributes &attr)
{ {
_waypoints.last().setCoordinates(QPointF( _waypoints.last().setCoordinates(QPointF(
attr.value("lon").toLatin1().toDouble(), attr.value("lon").toLatin1().toDouble(),
@ -44,8 +100,10 @@ void Parser::handleWayPointAttributes(const QXmlStreamAttributes &attr)
void Parser::tpExtension() void Parser::tpExtension()
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == "hr" || _reader.name() == "atemp") if (_reader.name() == "hr")
handleExtensionData(_reader.name(), _reader.readElementText()); handleTrackpointData(HeartRate, _reader.readElementText());
else if (_reader.name() == "atemp")
handleTrackpointData(Temperature, _reader.readElementText());
else else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
@ -54,9 +112,12 @@ void Parser::tpExtension()
void Parser::extensions() void Parser::extensions()
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == "speed" || _reader.name() == "hr" if (_reader.name() == "speed")
|| _reader.name() == "heartrate" || _reader.name() == "temp") handleTrackpointData(Speed, _reader.readElementText());
handleExtensionData(_reader.name(), _reader.readElementText()); else if (_reader.name() == "hr" || _reader.name() == "heartrate")
handleTrackpointData(HeartRate, _reader.readElementText());
else if (_reader.name() == "temp")
handleTrackpointData(Temperature, _reader.readElementText());
else if (_reader.name() == "TrackPointExtension") else if (_reader.name() == "TrackPointExtension")
tpExtension(); tpExtension();
else else
@ -64,12 +125,15 @@ void Parser::extensions()
} }
} }
void Parser::trackPointData() void Parser::trackpointData()
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == "ele" || _reader.name() == "time" if (_reader.name() == "ele")
|| _reader.name() == "geoidheight") handleTrackpointData(Elevation, _reader.readElementText());
handleTrekPointData(_reader.name(), _reader.readElementText()); else if (_reader.name() == "time")
handleTrackpointData(Time, _reader.readElementText());
else if (_reader.name() == "geoidheight")
handleTrackpointData(Geoidheight, _reader.readElementText());
else if (_reader.name() == "extensions") else if (_reader.name() == "extensions")
extensions(); extensions();
else else
@ -77,13 +141,43 @@ void Parser::trackPointData()
} }
} }
void Parser::trackPoints() void Parser::routepointData()
{
while (_reader.readNextStartElement()) {
if (_reader.name() == "name")
handleRoutepointData(Name, _reader.readElementText());
else if (_reader.name() == "desc")
handleRoutepointData(Description, _reader.readElementText());
else if (_reader.name() == "ele")
handleRoutepointData(Elevation, _reader.readElementText());
else if (_reader.name() == "geoidheight")
handleRoutepointData(Geoidheight, _reader.readElementText());
else if (_reader.name() == "time")
handleRoutepointData(Time, _reader.readElementText());
else
_reader.skipCurrentElement();
}
}
void Parser::trackpoints()
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == "trkpt") { if (_reader.name() == "trkpt") {
_track->append(Trackpoint()); _track->append(Trackpoint());
handleTrekPointAttributes(_reader.attributes()); handleTrackpointAttributes(_reader.attributes());
trackPointData(); trackpointData();
} else
_reader.skipCurrentElement();
}
}
void Parser::routepoints()
{
while (_reader.readNextStartElement()) {
if (_reader.name() == "rtept") {
_route->append(Waypoint());
handleRoutepointAttributes(_reader.attributes());
routepointData();
} else } else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
@ -93,17 +187,25 @@ void Parser::track()
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == "trkseg") { if (_reader.name() == "trkseg") {
trackPoints(); trackpoints();
} else } else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
} }
void Parser::wayPointData() void Parser::waypointData()
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == "name") if (_reader.name() == "name")
handleWayPointData(_reader.name(), _reader.readElementText()); handleWaypointData(Name, _reader.readElementText());
else if (_reader.name() == "desc")
handleWaypointData(Description, _reader.readElementText());
else if (_reader.name() == "ele")
handleWaypointData(Elevation, _reader.readElementText());
else if (_reader.name() == "geoidheight")
handleWaypointData(Geoidheight, _reader.readElementText());
else if (_reader.name() == "time")
handleWaypointData(Time, _reader.readElementText());
else else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
@ -116,10 +218,14 @@ void Parser::gpx()
_tracks.append(QVector<Trackpoint>()); _tracks.append(QVector<Trackpoint>());
_track = &_tracks.back(); _track = &_tracks.back();
track(); track();
} else if (_reader.name() == "rte") {
_routes.append(QVector<Waypoint>());
_route = &_routes.back();
routepoints();
} else if (_reader.name() == "wpt") { } else if (_reader.name() == "wpt") {
_waypoints.append(Waypoint()); _waypoints.append(Waypoint());
handleWayPointAttributes(_reader.attributes()); handleWaypointAttributes(_reader.attributes());
wayPointData(); waypointData();
} else } else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }

View File

@ -11,32 +11,45 @@
class Parser class Parser
{ {
public: public:
Parser(QList<QVector<Trackpoint> > &tracks, QList<Waypoint> &waypoints) Parser(QList<QVector<Trackpoint> > &tracks,
: _tracks(tracks), _waypoints(waypoints) {_track = 0;} QList<QVector<Waypoint> > &routes, QList<Waypoint> &waypoints)
: _tracks(tracks), _routes(routes), _waypoints(waypoints)
{_track = 0; _route = 0;}
bool loadFile(QIODevice *device); bool loadFile(QIODevice *device);
QString errorString() const {return _reader.errorString();} QString errorString() const {return _reader.errorString();}
int errorLine() const {return _reader.lineNumber();} int errorLine() const {return _reader.lineNumber();}
private: private:
enum DataType {
Name, Description, Elevation, Time, Geoidheight, Speed, HeartRate,
Temperature
};
bool parse(); bool parse();
void gpx(); void gpx();
void track(); void track();
void trackPoints(); void trackpoints();
void routepoints();
void tpExtension(); void tpExtension();
void extensions(); void extensions();
void trackPointData(); void trackpointData();
void wayPointData(); void routepointData();
void waypointData();
void handleWayPointAttributes(const QXmlStreamAttributes &attr); void handleWaypointAttributes(const QXmlStreamAttributes &attr);
void handleWayPointData(QStringRef element, const QString &value); void handleWaypointData(DataType type, const QString &value);
void handleTrekPointAttributes(const QXmlStreamAttributes &attr); void handleTrackpointAttributes(const QXmlStreamAttributes &attr);
void handleTrekPointData(QStringRef element, const QString &value); void handleTrackpointData(DataType type, const QString &value);
void handleExtensionData(QStringRef element, const QString &value); void handleRoutepointAttributes(const QXmlStreamAttributes &attr);
void handleRoutepointData(DataType type, const QString &value);
QXmlStreamReader _reader; QXmlStreamReader _reader;
QList<QVector<Trackpoint> > &_tracks; QList<QVector<Trackpoint> > &_tracks;
QList<QVector<Waypoint> > &_routes;
QList<Waypoint> &_waypoints; QList<Waypoint> &_waypoints;
QVector<Trackpoint> *_track; QVector<Trackpoint> *_track;
QVector<Waypoint> *_route;
}; };
#endif // PARSER_H #endif // PARSER_H

104
src/pathitem.cpp Normal file
View File

@ -0,0 +1,104 @@
#include <QApplication>
#include <QCursor>
#include <QPainter>
#include "tooltip.h"
#include "pathitem.h"
#define PATH_WIDTH 3
#define HOVER_WIDTH 4
void PathItem::updateShape()
{
QPainterPathStroker s;
s.setWidth(HOVER_WIDTH * 1.0/scale());
_shape = s.createStroke(_path);
if (qMax(boundingRect().width(), boundingRect().height()) * scale() <= 768)
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
else
setCacheMode(QGraphicsItem::NoCache);
}
PathItem::PathItem(QGraphicsItem *parent) : QGraphicsObject(parent)
{
QBrush brush(Qt::SolidPattern);
_pen = QPen(brush, PATH_WIDTH);
_units = Metric;
_marker = new MarkerItem(this);
setCursor(Qt::ArrowCursor);
setAcceptHoverEvents(true);
}
void PathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
painter->setPen(_pen);
painter->drawPath(_path);
/*
QPen p = QPen(QBrush(Qt::red), 0);
painter->setPen(p);
painter->drawRect(boundingRect());
*/
}
void PathItem::setScale(qreal scale)
{
prepareGeometryChange();
_pen.setWidthF(PATH_WIDTH * 1.0/scale);
QGraphicsItem::setScale(scale);
_marker->setScale(1.0/scale);
updateShape();
}
void PathItem::setColor(const QColor &color)
{
_pen.setColor(color);
update();
}
void PathItem::setUnits(enum Units units)
{
_units = units;
}
void PathItem::moveMarker(qreal distance)
{
if (distance > _distance)
_marker->setVisible(false);
else {
_marker->setVisible(true);
_marker->setPos(_path.pointAtPercent(distance / _distance));
}
}
void PathItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
Q_UNUSED(event);
_pen.setWidthF(HOVER_WIDTH * 1.0/scale());
setZValue(zValue() + 1.0);
update();
emit selected(true);
}
void PathItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
Q_UNUSED(event);
_pen.setWidthF(PATH_WIDTH * 1.0/scale());
setZValue(zValue() - 1.0);
update();
emit selected(false);
}

51
src/pathitem.h Normal file
View File

@ -0,0 +1,51 @@
#ifndef PATHITEM_H
#define PATHITEM_H
#include <QGraphicsObject>
#include <QPen>
#include "markeritem.h"
#include "units.h"
class PathItem : public QGraphicsObject
{
Q_OBJECT
public:
PathItem(QGraphicsItem *parent = 0);
QPainterPath shape() const {return _shape;}
QRectF boundingRect() const {return _shape.boundingRect();}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
const QPainterPath &path() const {return _path;}
void showMarker(bool show) {_marker->setVisible(show);}
void setScale(qreal scale);
void setUnits(enum Units units);
void setColor(const QColor &color);
public slots:
void moveMarker(qreal distance);
signals:
void selected(bool);
protected:
void updateShape();
QPainterPath _path;
QPainterPath _shape;
QPen _pen;
MarkerItem *_marker;
Units _units;
qreal _distance;
private:
void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
};
#endif // PATHITEM_H

619
src/pathview.cpp Normal file
View File

@ -0,0 +1,619 @@
#include <QGraphicsView>
#include <QGraphicsScene>
#include <QWheelEvent>
#include "ll.h"
#include "poi.h"
#include "gpx.h"
#include "map.h"
#include "trackitem.h"
#include "routeitem.h"
#include "waypointitem.h"
#include "scaleitem.h"
#include "pathview.h"
#define MARGIN 10.0
#define SCALE_OFFSET 7
PathView::PathView(QWidget *parent)
: QGraphicsView(parent)
{
_scene = new QGraphicsScene(this);
setScene(_scene);
setCacheMode(QGraphicsView::CacheBackground);
setDragMode(QGraphicsView::ScrollHandDrag);
setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setRenderHints(QPainter::Antialiasing);
_mapScale = new ScaleItem();
_mapScale->setZValue(2.0);
_zoom = ZOOM_MAX;
_scale = mapScale(_zoom);
_map = 0;
_units = Metric;
_showTracks = true;
_showRoutes = true;
_showWaypoints = true;
_showWaypointLabels = true;
_showPOILabels = true;
_overlapPOIs = true;
_showRouteWaypoints = true;
_plot = false;
}
PathView::~PathView()
{
if (_mapScale->scene() != _scene)
delete _mapScale;
}
PathItem *PathView::addTrack(const Track &track)
{
if (track.isNull()) {
_palette.color();
return 0;
}
TrackItem *ti = new TrackItem(track);
_tracks.append(ti);
_zoom = qMin(_zoom, scale2zoom(trackScale()));
_scale = mapScale(_zoom);
ti->setScale(1.0/_scale);
ti->setColor(_palette.color());
ti->setVisible(_showTracks);
_scene->addItem(ti);
return ti;
}
PathItem *PathView::addRoute(const Route &route)
{
if (route.isNull()) {
_palette.color();
return 0;
}
RouteItem *ri = new RouteItem(route);
_routes.append(ri);
_zoom = qMin(_zoom, scale2zoom(routeScale()));
_scale = mapScale(_zoom);
ri->setScale(1.0/_scale);
ri->setColor(_palette.color());
ri->setVisible(_showRoutes);
ri->showWaypoints(_showRouteWaypoints);
ri->showWaypointLabels(_showWaypointLabels);
_scene->addItem(ri);
return ri;
}
void PathView::addWaypoints(const QList<Waypoint> &waypoints)
{
for (int i = 0; i < waypoints.count(); i++) {
const Waypoint &w = waypoints.at(i);
WaypointItem *wi = new WaypointItem(w);
wi->setScale(1.0/_scale);
wi->setZValue(1);
wi->showLabel(_showWaypointLabels);
wi->setVisible(_showWaypoints);
_scene->addItem(wi);
_waypoints.append(wi);
}
_zoom = qMin(_zoom, scale2zoom(waypointScale()));
_scale = mapScale(_zoom);
}
QList<PathItem *> PathView::loadGPX(const GPX &gpx)
{
QList<PathItem *> paths;
int zoom = _zoom;
for (int i = 0; i < gpx.tracks().count(); i++)
paths.append(addTrack(*(gpx.tracks().at(i))));
for (int i = 0; i < gpx.routes().count(); i++)
paths.append(addRoute(*(gpx.routes().at(i))));
addWaypoints(gpx.waypoints());
if (_tracks.empty() && _routes.empty() && _waypoints.empty())
return paths;
if ((_tracks.size() + _routes.size() > 1 && _zoom < zoom)
|| (_waypoints.size() && _zoom < zoom))
rescale(_scale);
QRectF br = trackBoundingRect() | routeBoundingRect()
| waypointBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
_scene->setSceneRect(ba);
centerOn(ba.center());
_mapScale->setZoom(_zoom, -(br.center().ry() * _scale));
if (_mapScale->scene() != _scene)
_scene->addItem(_mapScale);
return paths;
}
QRectF PathView::trackBoundingRect() const
{
if (_tracks.empty())
return QRectF();
QRectF br = _tracks.at(0)->sceneBoundingRect();
for (int i = 1; i < _tracks.size(); i++)
br |= _tracks.at(i)->sceneBoundingRect();
return br;
}
QRectF PathView::routeBoundingRect() const
{
if (_routes.empty())
return QRectF();
QRectF br = _routes.at(0)->sceneBoundingRect();
for (int i = 1; i < _routes.size(); i++)
br |= _routes.at(i)->sceneBoundingRect();
return br;
}
QRectF PathView::waypointBoundingRect() const
{
qreal bottom, top, left, right;
if (_waypoints.empty())
return QRectF();
const QPointF &p = _waypoints.at(0)->pos();
bottom = p.y();
top = p.y();
left = p.x();
right = p.x();
for (int i = 1; i < _waypoints.size(); i++) {
const QPointF &p = _waypoints.at(i)->pos();
bottom = qMax(bottom, p.y());
top = qMin(top, p.y());
right = qMax(right, p.x());
left = qMin(left, p.x());
}
return QRectF(QPointF(left, top), QPointF(right, bottom));
}
qreal PathView::trackScale() const
{
if (_tracks.empty())
return mapScale(ZOOM_MAX);
QRectF br = _tracks.at(0)->path().boundingRect();
for (int i = 1; i < _tracks.size(); i++)
br |= _tracks.at(i)->path().boundingRect();
QPointF sc(br.width() / (viewport()->width() - MARGIN/2),
br.height() / (viewport()->height() - MARGIN/2));
return qMax(sc.x(), sc.y());
}
qreal PathView::routeScale() const
{
if (_routes.empty())
return mapScale(ZOOM_MAX);
QRectF br = _routes.at(0)->path().boundingRect();
for (int i = 1; i < _routes.size(); i++)
br |= _routes.at(i)->path().boundingRect();
QPointF sc(br.width() / (viewport()->width() - MARGIN/2),
br.height() / (viewport()->height() - MARGIN/2));
return qMax(sc.x(), sc.y());
}
qreal PathView::waypointScale() const
{
qreal bottom, top, left, right;
if (_waypoints.size() < 2)
return mapScale(ZOOM_MAX);
const QPointF &p = _waypoints.at(0)->coordinates();
bottom = p.y();
top = p.y();
left = p.x();
right = p.x();
for (int i = 1; i < _waypoints.size(); i++) {
const QPointF &p = _waypoints.at(i)->coordinates();
bottom = qMax(bottom, p.y());
top = qMin(top, p.y());
right = qMax(right, p.x());
left = qMin(left, p.x());
}
QRectF br(QPointF(left, top), QPointF(right, bottom));
QPointF sc(br.width() / (viewport()->width() - MARGIN/2),
br.height() / (viewport()->height() - MARGIN/2));
return qMax(sc.x(), sc.y());
}
qreal PathView::mapScale(int zoom) const
{
return ((360.0/(qreal)(1<<zoom))/(qreal)TILE_SIZE);
}
void PathView::checkPOIOverlap()
{
QHash<Waypoint, WaypointItem*>::const_iterator it, jt;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
if (it != jt && it.value()->isVisible() && jt.value()->isVisible()
&& it.value()->collidesWithItem(jt.value()))
jt.value()->hide();
}
}
}
void PathView::rescale(qreal scale)
{
for (int i = 0; i < _tracks.size(); i++)
_tracks.at(i)->setScale(1.0/scale);
for (int i = 0; i < _routes.size(); i++)
_routes.at(i)->setScale(1.0/scale);
for (int i = 0; i < _waypoints.size(); i++)
_waypoints.at(i)->setScale(1.0/scale);
QHash<Waypoint, WaypointItem*>::const_iterator it;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
it.value()->setScale(1.0/scale);
it.value()->show();
}
if (!_overlapPOIs)
checkPOIOverlap();
_scale = scale;
}
void PathView::addPOI(const QVector<Waypoint> &waypoints)
{
for (int i = 0; i < waypoints.size(); i++) {
const Waypoint &w = waypoints.at(i);
if (_pois.contains(w))
continue;
WaypointItem *pi = new WaypointItem(w);
pi->setScale(1.0/_scale);
pi->setZValue(1);
pi->showLabel(_showPOILabels);
_scene->addItem(pi);
_pois.insert(w, pi);
}
}
void PathView::loadPOI(const POI &poi)
{
if (!_tracks.size() && !_routes.size() && !_waypoints.size())
return;
for (int i = 0; i < _tracks.size(); i++)
addPOI(poi.points(_tracks.at(i)->path()));
for (int i = 0; i < _routes.size(); i++)
addPOI(poi.points(_routes.at(i)->path()));
addPOI(poi.points(_waypoints));
if (!_overlapPOIs)
checkPOIOverlap();
}
void PathView::setMap(Map *map)
{
_map = map;
if (_map)
connect(_map, SIGNAL(loaded()), this, SLOT(redraw()),
Qt::UniqueConnection);
resetCachedContent();
}
void PathView::setUnits(enum Units units)
{
_units = units;
_mapScale->setUnits(units);
for (int i = 0; i < _tracks.count(); i++)
_tracks[i]->setUnits(units);
for (int i = 0; i < _routes.count(); i++)
_routes[i]->setUnits(units);
for (int i = 0; i < _waypoints.size(); i++)
_waypoints.at(i)->setUnits(units);
QHash<Waypoint, WaypointItem*>::const_iterator it;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
it.value()->setUnits(units);
}
void PathView::redraw()
{
resetCachedContent();
}
void PathView::rescale()
{
_zoom = qMin(qMin(scale2zoom(trackScale()), scale2zoom(routeScale())),
scale2zoom(waypointScale()));
rescale(mapScale(_zoom));
_mapScale->setZoom(_zoom);
}
void PathView::zoom(int z, const QPointF &pos)
{
if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
return;
qreal scale = _scale;
_zoom = z;
rescale(mapScale(_zoom));
QRectF br = trackBoundingRect() | routeBoundingRect()
| waypointBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
_scene->setSceneRect(ba);
if (br.width() < viewport()->size().width()
&& br.height() < viewport()->size().height())
centerOn(br.center());
else
centerOn(pos * scale/_scale);
_mapScale->setZoom(_zoom);
resetCachedContent();
}
void PathView::wheelEvent(QWheelEvent *event)
{
if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
return;
QPointF pos = mapToScene(event->pos());
int z = (event->delta() > 0) ?
qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
zoom(z, pos);
}
void PathView::keyPressEvent(QKeyEvent *event)
{
int z = -1;
if (event->matches(QKeySequence::ZoomIn))
z = qMin(_zoom + 1, ZOOM_MAX);
if (event->matches(QKeySequence::ZoomOut))
z = qMax(_zoom - 1, ZOOM_MIN);
if (z >= 0)
zoom(z, mapToScene(QRect(QPoint(), size()).center()));
else
QWidget::keyPressEvent(event);
}
void PathView::plot(QPainter *painter, const QRectF &target)
{
QRect orig, adj;
qreal ratio, diff;
orig = viewport()->rect();
if (orig.height() * (target.width() / target.height()) - orig.width() < 0) {
ratio = target.height()/target.width();
diff = (orig.width() * ratio) - orig.height();
adj = orig.adjusted(0, -diff/2, 0, diff/2);
} else {
ratio = target.width() / target.height();
diff = (orig.height() * ratio) - orig.width();
adj = orig.adjusted(-diff/2, 0, diff/2, 0);
}
setUpdatesEnabled(false);
_plot = true;
QPointF pos = _mapScale->pos();
_mapScale->setPos(mapToScene(QPoint(adj.bottomRight() + QPoint(
-(SCALE_OFFSET + _mapScale->boundingRect().width()),
-(SCALE_OFFSET + _mapScale->boundingRect().height())))));
render(painter, target, adj);
_mapScale->setPos(pos);
_plot = false;
setUpdatesEnabled(true);
}
void PathView::clearPOI()
{
QHash<Waypoint, WaypointItem*>::const_iterator it;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
_scene->removeItem(it.value());
delete it.value();
}
_pois.clear();
}
void PathView::clear()
{
if (_mapScale->scene() == _scene)
_scene->removeItem(_mapScale);
_pois.clear();
_tracks.clear();
_routes.clear();
_waypoints.clear();
_scene->clear();
_palette.reset();
_zoom = ZOOM_MAX;
_scale = mapScale(_zoom);
_scene->setSceneRect(QRectF());
}
void PathView::showTracks(bool show)
{
_showTracks = show;
for (int i = 0; i < _tracks.count(); i++)
_tracks.at(i)->setVisible(show);
}
void PathView::showRoutes(bool show)
{
_showRoutes = show;
for (int i = 0; i < _routes.count(); i++)
_routes.at(i)->setVisible(show);
}
void PathView::showWaypoints(bool show)
{
_showWaypoints = show;
for (int i = 0; i < _waypoints.count(); i++)
_waypoints.at(i)->setVisible(show);
}
void PathView::showWaypointLabels(bool show)
{
_showWaypointLabels = show;
for (int i = 0; i < _waypoints.size(); i++)
_waypoints.at(i)->showLabel(show);
for (int i = 0; i < _routes.size(); i++)
_routes.at(i)->showWaypointLabels(show);
}
void PathView::showRouteWaypoints(bool show)
{
_showRouteWaypoints = show;
for (int i = 0; i < _routes.size(); i++)
_routes.at(i)->showWaypoints(show);
}
void PathView::showPOILabels(bool show)
{
_showPOILabels = show;
QHash<Waypoint, WaypointItem*>::const_iterator it;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
it.value()->showLabel(show);
setPOIOverlap(_overlapPOIs);
}
void PathView::setPOIOverlap(bool overlap)
{
_overlapPOIs = overlap;
if (_overlapPOIs) {
QHash<Waypoint, WaypointItem*>::const_iterator it;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
it.value()->show();
} else
checkPOIOverlap();
}
void PathView::drawBackground(QPainter *painter, const QRectF &rect)
{
if ((_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
|| !_map) {
painter->fillRect(rect, Qt::white);
return;
}
QRectF rr(rect.topLeft() * _scale, rect.size());
QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
_zoom);
QPointF tm = tile2mercator(tile, _zoom);
QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / _scale,
-tm.y() / _scale))).toPoint();
QList<Tile> tiles;
for (int i = 0; i <= rr.size().width() / TILE_SIZE + 1; i++) {
for (int j = 0; j <= rr.size().height() / TILE_SIZE + 1; j++) {
tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
}
}
_map->loadTiles(tiles, _plot);
for (int i = 0; i < tiles.count(); i++) {
Tile &t = tiles[i];
QPoint tp(tl.x() + (t.xy().x() - tile.x()) * TILE_SIZE,
tl.y() + (t.xy().y() - tile.y()) * TILE_SIZE);
painter->drawPixmap(tp, t.pixmap());
}
}
void PathView::resizeEvent(QResizeEvent *e)
{
if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
return;
rescale();
QRectF br = trackBoundingRect() | routeBoundingRect()
| waypointBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
if (ba.width() < e->size().width()) {
qreal diff = e->size().width() - ba.width();
ba.adjust(-diff/2, 0, diff/2, 0);
}
if (ba.height() < e->size().height()) {
qreal diff = e->size().height() - ba.height();
ba.adjust(0, -diff/2, 0, diff/2);
}
_scene->setSceneRect(ba);
centerOn(br.center());
resetCachedContent();
}
void PathView::paintEvent(QPaintEvent *e)
{
QPointF scenePos = mapToScene(rect().bottomRight() + QPoint(
-(SCALE_OFFSET + _mapScale->boundingRect().width()),
-(SCALE_OFFSET + _mapScale->boundingRect().height())));
if (_mapScale->pos() != scenePos && !_plot)
_mapScale->setPos(scenePos);
QGraphicsView::paintEvent(e);
}

View File

@ -12,19 +12,23 @@
class GPX; class GPX;
class POI; class POI;
class Map; class Map;
class Track;
class Route;
class TrackItem;
class RouteItem;
class WaypointItem; class WaypointItem;
class MarkerItem;
class ScaleItem; class ScaleItem;
class PathItem;
class TrackView : public QGraphicsView class PathView : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
TrackView(QWidget *parent = 0); PathView(QWidget *parent = 0);
~TrackView(); ~PathView();
void loadGPX(const GPX &gpx); QList<PathItem*> loadGPX(const GPX &gpx);
void loadPOI(const POI &poi); void loadPOI(const POI &poi);
void clearPOI(); void clearPOI();
@ -35,48 +39,69 @@ public:
void plot(QPainter *painter, const QRectF &target); void plot(QPainter *painter, const QRectF &target);
int trackCount() const {return _paths.count();} int trackCount() const {return _tracks.count();}
int waypointCount() const {return _locations.count();} int routeCount() const {return _routes.count();}
int waypointCount() const {return _waypoints.count();}
public slots: public slots:
void movePositionMarker(qreal val);
void redraw(); void redraw();
void setPOIOverlap(bool overlap);
void showWaypointLabels(bool show);
void showPOILabels(bool show);
void showTracks(bool show);
void showRoutes(bool show);
void showWaypoints(bool show);
void showRouteWaypoints(bool show);
private: private:
void addTrack(const QVector<QPointF> &track); PathItem *addTrack(const Track &track);
PathItem *addRoute(const Route &route);
void addWaypoints(const QList<Waypoint> &waypoints); void addWaypoints(const QList<Waypoint> &waypoints);
void addPOI(const QVector<Waypoint> &waypoints); void addPOI(const QVector<Waypoint> &waypoints);
QRectF trackBoundingRect() const; QRectF trackBoundingRect() const;
QRectF routeBoundingRect() const;
QRectF waypointBoundingRect() const; QRectF waypointBoundingRect() const;
qreal trackScale() const; qreal trackScale() const;
qreal routeScale() const;
qreal waypointScale() const; qreal waypointScale() const;
qreal mapScale(int zoom) const; qreal mapScale(int zoom) const;
void rescale(qreal scale); void rescale(qreal scale);
void rescale(); void rescale();
void zoom(int z, const QPointF &pos);
void checkPOIOverlap();
void wheelEvent(QWheelEvent *event); void wheelEvent(QWheelEvent *event);
void keyPressEvent(QKeyEvent *event);
void drawBackground(QPainter *painter, const QRectF &rect); void drawBackground(QPainter *painter, const QRectF &rect);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e);
QGraphicsScene *_scene; QGraphicsScene *_scene;
QList<QGraphicsPathItem*> _paths; QList<TrackItem*> _tracks;
QList<MarkerItem*> _markers; QList<RouteItem*> _routes;
QList<WaypointItem*> _locations; QList<WaypointItem*> _waypoints;
QHash<Waypoint, WaypointItem*> _pois; QHash<Waypoint, WaypointItem*> _pois;
QList<QVector<QPointF> > _tracks;
QVector<QPointF> _waypoints;
Map *_map; Map *_map;
ScaleItem *_mapScale; ScaleItem *_mapScale;
Palette _palette; Palette _palette;
qreal _maxPath, _maxDistance;
qreal _scale; qreal _scale;
int _zoom; int _zoom;
Units _units;
bool _showTracks;
bool _showRoutes;
bool _showWaypoints;
bool _showWaypointLabels;
bool _showPOILabels;
bool _overlapPOIs;
bool _showRouteWaypoints;
bool _plot; bool _plot;
}; };

View File

@ -1,6 +1,8 @@
#include <QFile> #include <QFile>
#include <QSet> #include <QSet>
#include <QList> #include <QList>
#include <QPainterPath>
#include "waypointitem.h"
#include "ll.h" #include "ll.h"
#include "gpx.h" #include "gpx.h"
#include "poi.h" #include "poi.h"
@ -105,10 +107,18 @@ bool POI::loadCSVFile(const QString &fileName)
_errorLine = ln; _errorLine = ln;
return false; return false;
} }
QByteArray ba = list[2].trimmed(); Waypoint wp(QPointF(lon, lat));
_data.append(Waypoint(QPointF(lon, lat), QByteArray ba = list[2].trimmed();
QString::fromUtf8(ba.data(), ba.size()))); QString name = QString::fromUtf8(ba.data(), ba.size());
wp.setName(name);
if (list.size() > 3) {
ba = list[3].trimmed();
wp.setDescription(QString::fromUtf8(ba.data(), ba.size()));
}
_data.append(wp);
ln++; ln++;
} }
index.end = _data.size() - 1; index.end = _data.size() - 1;
@ -135,14 +145,39 @@ static bool cb(size_t data, void* context)
return true; return true;
} }
QVector<Waypoint> POI::points(const QVector<QPointF> &path, qreal radius) const QVector<Waypoint> POI::points(const QPainterPath &path, qreal radius) const
{ {
QVector<Waypoint> ret; QVector<Waypoint> ret;
QSet<int> set; QSet<int> set;
qreal min[2], max[2]; qreal min[2], max[2];
for (int i = 0; i < path.count(); i++) { for (int i = 0; i < path.elementCount(); i++) {
const QPointF &p = path.at(i); QPointF p = mercator2ll(path.elementAt(i));
min[0] = p.x() - radius;
min[1] = -p.y() - radius;
max[0] = p.x() + radius;
max[1] = -p.y() + radius;
_tree.Search(min, max, cb, &set);
}
QSet<int>::const_iterator i = set.constBegin();
while (i != set.constEnd()) {
ret.append(_data.at(*i));
++i;
}
return ret;
}
QVector<Waypoint> POI::points(const QList<WaypointItem*> &list, qreal radius)
const
{
QVector<Waypoint> ret;
QSet<int> set;
qreal min[2], max[2];
for (int i = 0; i < list.count(); i++) {
const QPointF &p = list.at(i)->waypoint().coordinates();
min[0] = p.x() - radius; min[0] = p.x() - radius;
min[1] = p.y() - radius; min[1] = p.y() - radius;
max[0] = p.x() + radius; max[0] = p.x() + radius;

View File

@ -8,6 +8,10 @@
#include "waypoint.h" #include "waypoint.h"
#include "rtree.h" #include "rtree.h"
class QPainterPath;
class WaypointItem;
#define POI_RADIUS 0.01
class POI class POI
{ {
@ -17,8 +21,11 @@ public:
const QString &errorString() const {return _error;} const QString &errorString() const {return _error;}
int errorLine() const {return _errorLine;} int errorLine() const {return _errorLine;}
QVector<Waypoint> points(const QVector<QPointF> &path, QVector<Waypoint> points(const QPainterPath &path,
qreal radius = 0.01) const; qreal radius = POI_RADIUS) const;
QVector<Waypoint> points(const QList<WaypointItem*> &list,
qreal radius = POI_RADIUS) const;
const QStringList &files() const {return _files;} const QStringList &files() const {return _files;}
void enableFile(const QString &fileName, bool enable); void enableFile(const QString &fileName, bool enable);
void clear(); void clear();

30
src/route.cpp Normal file
View File

@ -0,0 +1,30 @@
#include "ll.h"
#include "route.h"
Route::Route(const QVector<Waypoint> &data) : _data(data)
{
qreal dist = 0;
_distance.append(dist);
for (int i = 1; i < data.count(); i++) {
dist += llDistance(data.at(i).coordinates(), data.at(i-1).coordinates());
_distance.append(dist);
}
}
Graph Route::elevation() const
{
Graph graph;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasElevation())
graph.append(GraphPoint(_distance.at(i), NAN,
_data.at(i).elevation() - _data.at(i).geoidHeight()));
return graph;
}
qreal Route::distance() const
{
return (_distance.isEmpty()) ? 0 : _distance.last();
}

25
src/route.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef ROUTE_H
#define ROUTE_H
#include <QVector>
#include "waypoint.h"
#include "graph.h"
class Route
{
public:
Route(const QVector<Waypoint> &data);
const QVector<Waypoint> &route() const {return _data;}
Graph elevation() const;
qreal distance() const;
bool isNull() const {return (_data.count() < 2);}
private:
const QVector<Waypoint> &_data;
QVector<qreal> _distance;
};
#endif // ROUTE_H

79
src/routeitem.cpp Normal file
View File

@ -0,0 +1,79 @@
#include <QApplication>
#include <QPainter>
#include "ll.h"
#include "misc.h"
#include "waypoint.h"
#include "waypointitem.h"
#include "tooltip.h"
#include "routeitem.h"
QString RouteItem::toolTip()
{
ToolTip tt;
tt.insert(qApp->translate("RouteItem", "Distance"),
::distance(_distance, _units));
return tt.toString();
}
RouteItem::RouteItem(const Route &route, QGraphicsItem *parent)
: PathItem(parent)
{
QVector<Waypoint> r = route.route();
Q_ASSERT(r.count() >= 2);
new WaypointItem(r.at(0), this);
const QPointF &p = r.at(0).coordinates();
_path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
for (int i = 1; i < r.size(); i++) {
const QPointF &p = r.at(i).coordinates();
_path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
new WaypointItem(r.at(i), this);
}
updateShape();
_distance = route.distance();
_marker->setPos(_path.pointAtPercent(0));
_pen.setStyle(Qt::DotLine);
setToolTip(toolTip());
}
void RouteItem::setScale(qreal scale)
{
QList<QGraphicsItem *> childs = childItems();
for (int i = 0; i < childs.count(); i++)
childs.at(i)->setScale(1.0/scale);
PathItem::setScale(scale);
}
void RouteItem::setUnits(enum Units units)
{
PathItem::setUnits(units);
setToolTip(toolTip());
}
void RouteItem::showWaypoints(bool show)
{
QList<QGraphicsItem *> childs = childItems();
for (int i = 0; i < childs.count(); i++)
if (childs.at(i) != _marker)
childs.at(i)->setVisible(show);
}
void RouteItem::showWaypointLabels(bool show)
{
QList<QGraphicsItem *> childs = childItems();
for (int i = 0; i < childs.count(); i++) {
if (childs.at(i) != _marker) {
WaypointItem *wi = static_cast<WaypointItem*>(childs.at(i));
wi->showLabel(show);
}
}
}

25
src/routeitem.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef ROUTEITEM_H
#define ROUTEITEM_H
#include "pathitem.h"
#include "route.h"
class RouteItem : public PathItem
{
Q_OBJECT
public:
RouteItem(const Route &route, QGraphicsItem *parent = 0);
void setUnits(enum Units units);
void setScale(qreal scale);
void showWaypoints(bool show);
void showWaypointLabels(bool show);
private:
QString toolTip();
};
#endif // ROUTEITEM_H

View File

@ -1,10 +1,11 @@
#include <QPainter> #include <QPainter>
#include "config.h" #include "config.h"
#include "ll.h" #include "ll.h"
#include "nicenum.h" #include "misc.h"
#include "scaleitem.h" #include "scaleitem.h"
#define BORDER_WIDTH 1
#define SCALE_WIDTH 132 #define SCALE_WIDTH 132
#define SCALE_HEIGHT 5 #define SCALE_HEIGHT 5
#define SEGMENTS 3 #define SEGMENTS 3
@ -17,6 +18,10 @@ ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
_units = Metric; _units = Metric;
_zoom = ZOOM_MIN; _zoom = ZOOM_MIN;
_lat = 0; _lat = 0;
#ifndef Q_OS_MAC
setCacheMode(QGraphicsItem::DeviceCoordinateCache);
#endif // Q_OS_MAC
} }
void ScaleItem::updateBoundingRect() void ScaleItem::updateBoundingRect()
@ -31,9 +36,9 @@ void ScaleItem::updateBoundingRect()
es = fm.tightBoundingRect(QString::number(_length * SEGMENTS)); es = fm.tightBoundingRect(QString::number(_length * SEGMENTS));
us = fm.tightBoundingRect(units()); us = fm.tightBoundingRect(units());
_boundingRect = QRectF(-ss.width()/2, 0, _boundingRect = QRectF(-ss.width()/2, 0, _width * SEGMENTS + ss.width()/2
_width * SEGMENTS + ss.width()/2 + qMax(us.width() + PADDING, es.width()/2), + qMax(us.width() + PADDING, es.width()/2) + 1, SCALE_HEIGHT + PADDING
SCALE_HEIGHT + PADDING + ss.height() + 2*fm.descent()); + ss.height() + 2*fm.descent());
} }
void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@ -46,6 +51,7 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
font.setFamily(FONT_FAMILY); font.setFamily(FONT_FAMILY);
QFontMetrics fm(font); QFontMetrics fm(font);
QRect br; QRect br;
QPen pen = QPen(Qt::black, BORDER_WIDTH);
bool aa; bool aa;
@ -53,6 +59,7 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->setRenderHint(QPainter::Antialiasing, false); painter->setRenderHint(QPainter::Antialiasing, false);
painter->setFont(font); painter->setFont(font);
painter->setPen(pen);
for (int i = 0; i <= SEGMENTS; i++) { for (int i = 0; i <= SEGMENTS; i++) {
QString label = QString::number(_length * i); QString label = QString::number(_length * i);
@ -67,10 +74,12 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
for (int i = 0; i < SEGMENTS; i += 2) for (int i = 0; i < SEGMENTS; i += 2)
painter->fillRect(QRectF(i * _width, br.height() + PADDING, _width, painter->fillRect(QRectF(i * _width, br.height() + PADDING, _width,
SCALE_HEIGHT), Qt::black); SCALE_HEIGHT), Qt::black);
/* /*
painter->setPen(Qt::red); painter->setPen(Qt::red);
painter->drawRect(boundingRect()); painter->drawRect(boundingRect());
*/ */
if (aa) if (aa)
painter->setRenderHint(QPainter::Antialiasing, true); painter->setRenderHint(QPainter::Antialiasing, true);
} }
@ -78,9 +87,11 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QString ScaleItem::units() const QString ScaleItem::units() const
{ {
if (_units == Imperial) if (_units == Imperial)
return _scale ? QObject::tr("mi") : QObject::tr("ft"); return _scale ? qApp->translate("ScaleItem", "mi")
: qApp->translate("ScaleItem", "ft");
else else
return _scale ? QObject::tr("km") : QObject::tr("m"); return _scale ? qApp->translate("ScaleItem", "km")
: qApp->translate("ScaleItem", "m");
} }
void ScaleItem::computeScale() void ScaleItem::computeScale()
@ -110,12 +121,14 @@ void ScaleItem::computeScale()
} }
} }
void ScaleItem::setLatitude(qreal lat) void ScaleItem::setZoom(int z, qreal lat)
{ {
prepareGeometryChange(); prepareGeometryChange();
_zoom = z;
_lat = lat; _lat = lat;
computeScale(); computeScale();
updateBoundingRect(); updateBoundingRect();
update();
} }
void ScaleItem::setZoom(int z) void ScaleItem::setZoom(int z)
@ -124,6 +137,7 @@ void ScaleItem::setZoom(int z)
_zoom = z; _zoom = z;
computeScale(); computeScale();
updateBoundingRect(); updateBoundingRect();
update();
} }
void ScaleItem::setUnits(enum Units units) void ScaleItem::setUnits(enum Units units)
@ -132,4 +146,5 @@ void ScaleItem::setUnits(enum Units units)
_units = units; _units = units;
computeScale(); computeScale();
updateBoundingRect(); updateBoundingRect();
update();
} }

View File

@ -13,8 +13,8 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget); QWidget *widget);
void setLatitude(qreal lat);
void setZoom(int z); void setZoom(int z);
void setZoom(int z, qreal lat);
void setUnits(enum Units units); void setUnits(enum Units units);
private: private:

View File

@ -8,15 +8,27 @@
#define SETTINGS_SETTINGS_GROUP "Settings" #define SETTINGS_SETTINGS_GROUP "Settings"
#define UNITS_SETTING "units" #define UNITS_SETTING "units"
#define SHOW_TOOLBARS_SETTING "toolbar" #define SHOW_TOOLBARS_SETTING "toolbar"
#define SHOW_GRAPHS_SETTING "graphs"
#define GRAPH_SETTINGS_GROUP "Graph"
#define SHOW_GRAPHS_SETTING "show"
#define GRAPH_TYPE_SETTING "type"
#define MAP_SETTINGS_GROUP "Map" #define MAP_SETTINGS_GROUP "Map"
#define CURRENT_MAP_SETTING "map" #define CURRENT_MAP_SETTING "map"
#define SHOW_MAP_SETTING "show" #define SHOW_MAP_SETTING "show"
#define POI_SETTINGS_GROUP "POI" #define POI_SETTINGS_GROUP "POI"
#define OVERLAP_POI_SETTING "overlap"
#define LABELS_POI_SETTING "labels"
#define SHOW_POI_SETTING "show" #define SHOW_POI_SETTING "show"
#define DISABLED_POI_FILE_SETTINGS_PREFIX "disabled" #define DISABLED_POI_FILE_SETTINGS_PREFIX "disabled"
#define DISABLED_POI_FILE_SETTING "file" #define DISABLED_POI_FILE_SETTING "file"
#define DATA_SETTINGS_GROUP "Data"
#define SHOW_TRACKS_SETTING "tracks"
#define SHOW_ROUTES_SETTING "routes"
#define SHOW_WAYPOINTS_SETTING "waypoints"
#define SHOW_ROUTE_WAYPOINTS_SETTING "routeWaypoints"
#define SHOW_WAYPOINT_LABELS_SETTING "waypointLabels"
#endif // SETTINGS_H #endif // SETTINGS_H

View File

@ -4,7 +4,7 @@
#define SIZE 10 #define SIZE 10
SliderItem::SliderItem(QGraphicsObject *parent) : QGraphicsObject(parent) SliderItem::SliderItem(QGraphicsItem *parent) : QGraphicsObject(parent)
{ {
setFlag(ItemIsMovable); setFlag(ItemIsMovable);
setFlag(ItemSendsGeometryChanges); setFlag(ItemSendsGeometryChanges);
@ -24,7 +24,7 @@ void SliderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
painter->setPen(Qt::red); painter->setPen(Qt::red);
painter->drawLine(0, 0, 0, -_area.height()); painter->drawLine(0, 0, 0, -_area.height());
//painter->drawRect(boundingRect()); // painter->drawRect(boundingRect());
} }
QVariant SliderItem::itemChange(GraphicsItemChange change, const QVariant &value) QVariant SliderItem::itemChange(GraphicsItemChange change, const QVariant &value)

View File

@ -1,14 +1,14 @@
#ifndef SLIDERITEM_H #ifndef SLIDERITEM_H
#define SLIDERITEM_H #define SLIDERITEM_H
#include <QGraphicsItem> #include <QGraphicsObject>
class SliderItem : public QGraphicsObject class SliderItem : public QGraphicsObject
{ {
Q_OBJECT Q_OBJECT
public: public:
SliderItem(QGraphicsObject *parent = 0); SliderItem(QGraphicsItem *parent = 0);
QRectF boundingRect() const; QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,

View File

@ -3,46 +3,49 @@
#include "speedgraph.h" #include "speedgraph.h"
SpeedGraph::SpeedGraph(QWidget *parent) : GraphView(parent) SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
{ {
_units = Metric; _units = Metric;
_showTracks = true;
setYUnits(); setYUnits();
setXLabel(tr("Distance"));
setYLabel(tr("Speed")); setYLabel(tr("Speed"));
setSliderPrecision(1); setSliderPrecision(1);
} }
void SpeedGraph::addInfo() void SpeedGraph::setInfo()
{ {
GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f', 1) if (_showTracks) {
+ UNIT_SPACE + yUnits()); GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f',
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f', 1) 1) + UNIT_SPACE + yUnits());
+ UNIT_SPACE + yUnits()); GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
1) + UNIT_SPACE + yUnits());
redraw(); } else
clearInfo();
} }
void SpeedGraph::loadGPX(const GPX &gpx) void SpeedGraph::loadGPX(const GPX &gpx, const QList<PathItem *> &paths)
{ {
for (int i = 0; i < gpx.trackCount(); i++) { for (int i = 0; i < gpx.tracks().count(); i++) {
QVector<QPointF> data; const Graph &graph = gpx.tracks().at(i)->speed();
if (graph.size() < 2) {
gpx.track(i).speedGraph(data);
if (data.count() < 2) {
skipColor(); skipColor();
continue; continue;
} }
_avg.append(QPointF(gpx.track(i).distance(), gpx.track(i).distance() _avg.append(QPointF(gpx.tracks().at(i)->distance(),
/ gpx.track(i).time())); gpx.tracks().at(i)->distance() / gpx.tracks().at(i)->time()));
loadData(data); GraphView::loadGraph(graph, paths.at(i));
} }
setXUnits(); for (int i = 0; i < gpx.routes().count(); i++)
addInfo(); skipColor();
setInfo();
redraw();
} }
qreal SpeedGraph::avg() const qreal SpeedGraph::avg() const
@ -65,27 +68,6 @@ void SpeedGraph::clear()
GraphView::clear(); GraphView::clear();
} }
void SpeedGraph::setXUnits()
{
if (_units == Metric) {
if (bounds().width() < KMINM) {
GraphView::setXUnits(tr("m"));
setXScale(1);
} else {
GraphView::setXUnits(tr("km"));
setXScale(M2KM);
}
} else {
if (bounds().width() < MIINM) {
GraphView::setXUnits(tr("ft"));
setXScale(M2FT);
} else {
GraphView::setXUnits(tr("mi"));
setXScale(M2MI);
}
}
}
void SpeedGraph::setYUnits() void SpeedGraph::setYUnits()
{ {
if (_units == Metric) { if (_units == Metric) {
@ -100,9 +82,20 @@ void SpeedGraph::setYUnits()
void SpeedGraph::setUnits(enum Units units) void SpeedGraph::setUnits(enum Units units)
{ {
_units = units; _units = units;
setXUnits();
setYUnits();
clearInfo(); setYUnits();
addInfo(); setInfo();
GraphView::setUnits(units);
redraw();
}
void SpeedGraph::showTracks(bool show)
{
_showTracks = show;
showGraph(show);
setInfo();
redraw();
} }

View File

@ -2,32 +2,34 @@
#define SPEEDGRAPH_H #define SPEEDGRAPH_H
#include <QList> #include <QList>
#include "graphview.h" #include "graphtab.h"
#include "units.h"
class GPX; class GPX;
class SpeedGraph : public GraphView class SpeedGraph : public GraphTab
{ {
Q_OBJECT Q_OBJECT
public: public:
SpeedGraph(QWidget *parent = 0); SpeedGraph(QWidget *parent = 0);
void loadGPX(const GPX &gpx); QString label() const {return tr("Speed");}
void loadGPX(const GPX &gpx, const QList<PathItem *> &paths);
void clear(); void clear();
void setUnits(enum Units units); void setUnits(enum Units units);
void showTracks(bool show);
qreal avg() const; void showRoutes(bool show) {Q_UNUSED(show);}
qreal max() const {return bounds().bottom();}
private: private:
void setXUnits(); qreal avg() const;
qreal max() const {return bounds().bottom();}
void setYUnits(); void setYUnits();
void addInfo(); void setInfo();
QList<QPointF> _avg; QList<QPointF> _avg;
enum Units _units; enum Units _units;
bool _showTracks;
}; };
#endif // SPEEDGRAPH_H #endif // SPEEDGRAPH_H

View File

@ -2,52 +2,57 @@
#include "temperaturegraph.h" #include "temperaturegraph.h"
TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphView(parent) TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
{ {
_units = Metric; _units = Metric;
_showTracks = true;
setYUnits(); setYUnits();
setXLabel(tr("Distance"));
setYLabel(tr("Temperature")); setYLabel(tr("Temperature"));
setSliderPrecision(1); setSliderPrecision(1);
} }
void TemperatureGraph::addInfo() void TemperatureGraph::setInfo()
{ {
if (_showTracks) {
GraphView::addInfo(tr("Average"), QString::number(avg() * yScale() GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
+ yOffset(), 'f', 1) + UNIT_SPACE + yUnits()); + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale() GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale()
+ yOffset(), 'f', 1) + UNIT_SPACE + yUnits()); + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale() GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
+ yOffset(), 'f', 1) + UNIT_SPACE + yUnits()); + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
} else
redraw(); clearInfo();
} }
void TemperatureGraph::loadGPX(const GPX &gpx) void TemperatureGraph::loadGPX(const GPX &gpx, const QList<PathItem *> &paths)
{ {
for (int i = 0; i < gpx.trackCount(); i++) { for (int i = 0; i < gpx.tracks().count(); i++) {
QVector<QPointF> data; const Graph &graph = gpx.tracks().at(i)->temperature();
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
gpx.track(i).temperatureGraph(data); if (graph.size() < 2) {
if (data.count() < 2) {
skipColor(); skipColor();
continue; continue;
} }
for (int j = 1; j < data.size(); j++) { for (int j = 1; j < graph.size(); j++) {
sum += data.at(j).y() * (data.at(j).x() - data.at(j-1).x()); qreal ds = graph.at(j).s() - graph.at(j-1).s();
w += data.at(j).x() - data.at(j-1).x(); sum += graph.at(j).y() * ds;
w += ds;
} }
_avg.append(QPointF(gpx.track(i).distance(), sum/w)); _avg.append(QPointF(gpx.tracks().at(i)->distance(), sum/w));
loadData(data); GraphView::loadGraph(graph, paths.at(i));
} }
setXUnits(); for (int i = 0; i < gpx.routes().count(); i++)
addInfo(); skipColor();
setInfo();
redraw();
} }
qreal TemperatureGraph::avg() const qreal TemperatureGraph::avg() const
@ -70,35 +75,14 @@ void TemperatureGraph::clear()
GraphView::clear(); GraphView::clear();
} }
void TemperatureGraph::setXUnits()
{
if (_units == Metric) {
if (bounds().width() < KMINM) {
GraphView::setXUnits(tr("m"));
setXScale(1);
} else {
GraphView::setXUnits(tr("km"));
setXScale(M2KM);
}
} else {
if (bounds().width() < MIINM) {
GraphView::setXUnits(tr("ft"));
setXScale(M2FT);
} else {
GraphView::setXUnits(tr("mi"));
setXScale(M2MI);
}
}
}
void TemperatureGraph::setYUnits() void TemperatureGraph::setYUnits()
{ {
if (_units == Metric) { if (_units == Metric) {
GraphView::setYUnits(QString::fromUtf8("\xC2\xB0") + tr("C")); GraphView::setYUnits(QChar(0x00B0) + tr("C"));
setYScale(1); setYScale(1);
setYOffset(0); setYOffset(0);
} else { } else {
GraphView::setYUnits(QString::fromUtf8("\xC2\xB0") + tr("F")); GraphView::setYUnits(QChar(0x00B0) + tr("F"));
setYScale(C2FS); setYScale(C2FS);
setYOffset(C2FO); setYOffset(C2FO);
} }
@ -107,9 +91,20 @@ void TemperatureGraph::setYUnits()
void TemperatureGraph::setUnits(enum Units units) void TemperatureGraph::setUnits(enum Units units)
{ {
_units = units; _units = units;
setXUnits();
setYUnits();
clearInfo(); setYUnits();
addInfo(); setInfo();
GraphView::setUnits(units);
redraw();
}
void TemperatureGraph::showTracks(bool show)
{
_showTracks = show;
showGraph(show);
setInfo();
redraw();
} }

View File

@ -1,33 +1,35 @@
#ifndef TEMPERATUREGRAPH_H #ifndef TEMPERATUREGRAPH_H
#define TEMPERATUREGRAPH_H #define TEMPERATUREGRAPH_H
#include "units.h" #include "graphtab.h"
#include "graphview.h"
class GPX; class GPX;
class TemperatureGraph : public GraphView class TemperatureGraph : public GraphTab
{ {
Q_OBJECT Q_OBJECT
public: public:
TemperatureGraph(QWidget *parent = 0); TemperatureGraph(QWidget *parent = 0);
void loadGPX(const GPX &gpx); QString label() const {return tr("Temperature");}
void loadGPX(const GPX &gpx, const QList<PathItem *> &paths);
void clear(); void clear();
void setUnits(enum Units units); void setUnits(enum Units units);
void showTracks(bool show);
void showRoutes(bool show) {Q_UNUSED(show);}
private:
qreal avg() const; qreal avg() const;
qreal min() const {return bounds().top();} qreal min() const {return bounds().top();}
qreal max() const {return bounds().bottom();} qreal max() const {return bounds().bottom();}
private:
void setXUnits();
void setYUnits(); void setYUnits();
void addInfo(); void setInfo();
QList<QPointF> _avg; QList<QPointF> _avg;
enum Units _units; enum Units _units;
bool _showTracks;
}; };
#endif // TEMPERATUREGRAPH_H #endif // TEMPERATUREGRAPH_H

20
src/tooltip.cpp Normal file
View File

@ -0,0 +1,20 @@
#include "tooltip.h"
void ToolTip::insert(const QString &key, const QString &value)
{
QPair<QString, QString> entry(key, value);
_list.append(entry);
}
QString ToolTip::toString()
{
QString ret = "<table>";
for (int i = 0; i < _list.count(); i++)
ret += "<tr><td align=\"right\"><b>" + _list.at(i).first
+ ":&nbsp;</b></td><td>" + _list.at(i).second + "</td></tr>";
ret += "</table>";
return ret;
}

18
src/tooltip.h Normal file
View File

@ -0,0 +1,18 @@
#ifndef TOOLTIP_H
#define TOOLTIP_H
#include <QString>
#include <QList>
#include <QPair>
class ToolTip
{
public:
void insert(const QString &key, const QString &value);
QString toString();
private:
QList<QPair<QString, QString> > _list;
};
#endif // TOOLTIP_H

View File

@ -8,18 +8,19 @@
#define WINDOW_HE 11 #define WINDOW_HE 11
#define WINDOW_HF 3 #define WINDOW_HF 3
static bool lt(const QPointF &p1, const QPointF &p2)
static bool lt(const GraphPoint &v1, const GraphPoint &v2)
{ {
return p1.y() < p2.y(); return v1.y() < v2.y();
} }
static qreal median(QVector<QPointF> v) static qreal median(QVector<GraphPoint> v)
{ {
qSort(v.begin(), v.end(), lt); qSort(v.begin(), v.end(), lt);
return v.at(v.size() / 2).y(); return v.at(v.size() / 2).y();
} }
static qreal MAD(QVector<QPointF> v, qreal m) static qreal MAD(QVector<GraphPoint> v, qreal m)
{ {
for (int i = 0; i < v.size(); i++) for (int i = 0; i < v.size(); i++)
v[i].setY(qAbs(v.at(i).y() - m)); v[i].setY(qAbs(v.at(i).y() - m));
@ -27,15 +28,15 @@ static qreal MAD(QVector<QPointF> v, qreal m)
return v.at(v.size() / 2).y(); return v.at(v.size() / 2).y();
} }
static QVector<QPointF> eliminate(const QVector<QPointF> &v, int window) static QVector<GraphPoint> eliminate(const QVector<GraphPoint> &v, int window)
{ {
QList<int> rm; QList<int> rm;
QVector<QPointF> ret; QVector<GraphPoint> ret;
qreal m, M; qreal m, M;
if (v.size() < window) if (v.size() < window)
return QVector<QPointF>(v); return QVector<GraphPoint>(v);
for (int i = window/2; i < v.size() - window/2; i++) { for (int i = window/2; i < v.size() - window/2; i++) {
m = median(v.mid(i - window/2, window)); m = median(v.mid(i - window/2, window));
@ -55,146 +56,129 @@ static QVector<QPointF> eliminate(const QVector<QPointF> &v, int window)
return ret; return ret;
} }
static QVector<QPointF> filter(const QVector<QPointF> &v, int window) static QVector<GraphPoint> filter(const QVector<GraphPoint> &v, int window)
{ {
qreal acc = 0; qreal acc = 0;
QVector<QPointF> ret; QVector<GraphPoint> ret;
if (v.size() < window) if (v.size() < window)
return QVector<QPointF>(v); return QVector<GraphPoint>(v);
for (int i = 0; i < window; i++) for (int i = 0; i < window; i++)
acc += v.at(i).y(); acc += v.at(i).y();
for (int i = 0; i <= window/2; i++) for (int i = 0; i <= window/2; i++)
ret.append(QPointF(v.at(i).x(), acc/window)); ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
for (int i = window/2 + 1; i < v.size() - window/2; i++) { 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(); acc += v.at(i + window/2).y() - v.at(i - (window/2 + 1)).y();
ret.append(QPointF(v.at(i).x(), acc/window)); ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
} }
for (int i = v.size() - window/2; i < v.size(); i++) for (int i = v.size() - window/2; i < v.size(); i++)
ret.append(QPointF(v.at(i).x(), acc/window)); ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
return ret; return ret;
} }
Track::Track(const QVector<Trackpoint> &data) : _data(data) Track::Track(const QVector<Trackpoint> &data) : _data(data)
{
_distance = 0;
for (int i = 1; i < _data.count(); i++)
_dd.append(llDistance(_data.at(i).coordinates,
_data.at(i-1).coordinates));
for (int i = 0; i < _dd.size(); i++)
_distance += _dd.at(i);
}
void Track::elevationGraph(QVector<QPointF> &graph) const
{ {
qreal dist = 0; qreal dist = 0;
QVector<QPointF> raw;
if (!_data.size()) _distance.append(0);
return; _time.append(0);
for (int i = 1; i < data.count(); i++) {
dist += llDistance(data.at(i).coordinates(), data.at(i-1).coordinates());
_distance.append(dist);
if (_data.at(0).hasElevation()) if (data.first().hasTimestamp() && data.at(i).hasTimestamp())
raw.append(QPointF(0, _data.at(0).elevation - _data.at(0).geoidheight)); _time.append(_data.first().timestamp().msecsTo(
for (int i = 1; i < _data.size(); i++) { _data.at(i).timestamp()) / 1000.0);
dist += _dd.at(i-1); else
if (_data.at(i).hasElevation()) _time.append(NAN);
raw.append(QPointF(dist, _data.at(i).elevation
- _data.at(i).geoidheight));
} }
graph = filter(raw, WINDOW_EF);
} }
void Track::speedGraph(QVector<QPointF> &graph) const Graph Track::elevation() const
{ {
qreal dist = 0, v, ds, dt; QVector<GraphPoint> raw;
QVector<QPointF> raw;
if (!_data.size()) if (!_data.size())
return; return raw;
raw.append(QPointF(0, 0)); for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasElevation())
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).elevation() - _data.at(i).geoidHeight()));
return filter(raw, WINDOW_EF);
}
Graph Track::speed() const
{
QVector<GraphPoint> raw;
qreal v, ds, dt;
if (!_data.size())
return raw;
raw.append(GraphPoint(_distance.at(0), _time.at(0), 0));
for (int i = 1; i < _data.size(); i++) { for (int i = 1; i < _data.size(); i++) {
ds = _dd.at(i-1);
dist += ds;
if (_data.at(i).hasSpeed()) if (_data.at(i).hasSpeed())
v = _data.at(i).speed; v = _data.at(i).speed();
else if (_data.at(i).hasTimestamp()) { else if (_data.at(i).hasTimestamp() && _data.at(i-1).hasTimestamp()) {
dt = _data.at(i-1).timestamp.msecsTo(_data.at(i).timestamp) dt = _time.at(i) - _time.at(i-1);
/ 1000.0; if (!dt)
if (dt == 0)
continue; continue;
ds = _distance.at(i) - _distance.at(i-1);
v = ds / dt; v = ds / dt;
} else } else
continue; continue;
raw.append(QPointF(dist, v)); raw.append(GraphPoint(_distance.at(i), _time.at(i), v));
} }
graph = filter(eliminate(raw, WINDOW_SE), WINDOW_SF); return filter(eliminate(raw, WINDOW_SE), WINDOW_SF);
} }
void Track::heartRateGraph(QVector<QPointF> &graph) const Graph Track::heartRate() const
{ {
qreal dist = 0; QVector<GraphPoint> raw;
QVector<QPointF> raw;
if (!_data.size()) if (!_data.size())
return; return raw;
if (_data.at(0).hasHeartRate()) for (int i = 0; i < _data.count(); i++)
raw.append(QPointF(0, _data.at(0).heartRate));
for (int i = 1; i < _data.count(); i++) {
dist += _dd.at(i-1);
if (_data.at(i).hasHeartRate()) if (_data.at(i).hasHeartRate())
raw.append(QPointF(dist, _data.at(i).heartRate)); raw.append(GraphPoint(_distance.at(i), _time.at(i),
} _data.at(i).heartRate()));
graph = filter(eliminate(raw, WINDOW_HE), WINDOW_HF); return filter(eliminate(raw, WINDOW_HE), WINDOW_HF);
} }
void Track::temperatureGraph(QVector<QPointF> &graph) const Graph Track::temperature() const
{ {
qreal dist = 0; QVector<GraphPoint> raw;
if (!_data.size())
return;
if (_data.at(0).hasTemperature())
graph.append(QPointF(0, _data.at(0).temperature));
for (int i = 1; i < _data.size(); i++) {
dist += _dd.at(i-1);
if (_data.at(i).hasTemperature())
graph.append(QPointF(dist, _data.at(i).temperature));
}
}
void Track::track(QVector<QPointF> &track) const
{
for (int i = 0; i < _data.size(); i++) for (int i = 0; i < _data.size(); i++)
track.append(_data.at(i).coordinates); if (_data.at(i).hasTemperature())
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).temperature()));
return Graph(raw);
}
qreal Track::distance() const
{
return (_distance.isEmpty()) ? 0 : _distance.last();
} }
qreal Track::time() const qreal Track::time() const
{ {
if (_data.size() < 2) return (_data.size() < 2) ? 0 :
return 0; (_data.first().timestamp().msecsTo(_data.last().timestamp()) / 1000.0);
return (_data.at(0).timestamp.msecsTo(_data.at(_data.size() - 1).timestamp)
/ 1000.0);
} }
QDateTime Track::date() const QDateTime Track::date() const
{ {
if (_data.size()) return (_data.size()) ? _data.first().timestamp() : QDateTime();
return _data.at(0).timestamp;
else
return QDateTime();
} }

View File

@ -4,25 +4,29 @@
#include <QVector> #include <QVector>
#include <QDateTime> #include <QDateTime>
#include "trackpoint.h" #include "trackpoint.h"
#include "graph.h"
class Track class Track
{ {
public: public:
Track(const QVector<Trackpoint> &data); Track(const QVector<Trackpoint> &data);
void elevationGraph(QVector<QPointF> &graph) const; const QVector<Trackpoint> &track() const {return _data;}
void speedGraph(QVector<QPointF> &graph) const; Graph elevation() const;
void heartRateGraph(QVector<QPointF> &graph) const; Graph speed() const;
void temperatureGraph(QVector<QPointF> &graph) const; Graph heartRate() const;
void track(QVector<QPointF> &track) const; Graph temperature() const;
qreal distance() const {return _distance;}
qreal distance() const;
qreal time() const; qreal time() const;
QDateTime date() const; QDateTime date() const;
bool isNull() const {return (_data.size() < 2);}
private: private:
const QVector<Trackpoint> &_data; const QVector<Trackpoint> &_data;
QVector<qreal> _dd; QVector<qreal> _distance;
qreal _distance; QVector<qreal> _time;
}; };
#endif // TRACK_H #endif // TRACK_H

53
src/trackitem.cpp Normal file
View File

@ -0,0 +1,53 @@
#include <QApplication>
#include <QCursor>
#include <QPainter>
#include "ll.h"
#include "misc.h"
#include "tooltip.h"
#include "trackitem.h"
QString TrackItem::toolTip()
{
ToolTip tt;
tt.insert(qApp->translate("TrackItem", "Distance"),
::distance(_distance, _units));
if (_time > 0)
tt.insert(qApp->translate("TrackItem", "Time"), ::timeSpan(_time));
if (!_date.isNull())
tt.insert(qApp->translate("TrackItem", "Date"),
_date.toString(Qt::SystemLocaleShortDate));
return tt.toString();
}
TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
: PathItem(parent)
{
const QVector<Trackpoint> &t = track.track();
Q_ASSERT(t.count() >= 2);
const QPointF &p = t.at(0).coordinates();
_path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
for (int i = 1; i < t.size(); i++) {
const QPointF &p = t.at(i).coordinates();
_path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
}
updateShape();
_date = track.date();
_distance = track.distance();
_time = track.time();
_marker->setPos(_path.pointAtPercent(0));
setToolTip(toolTip());
}
void TrackItem::setUnits(enum Units units)
{
PathItem::setUnits(units);
setToolTip(toolTip());
}

26
src/trackitem.h Normal file
View File

@ -0,0 +1,26 @@
#ifndef TRACKITEM_H
#define TRACKITEM_H
#include <QDateTime>
#include <QPen>
#include "track.h"
#include "pathitem.h"
class TrackItem : public PathItem
{
Q_OBJECT
public:
TrackItem(const Track &track, QGraphicsItem *parent = 0);
void setUnits(enum Units units);
private:
QString toolTip();
QDateTime _date;
qreal _time;
};
#endif // TRACKITEM_H

View File

@ -2,10 +2,10 @@
QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint) QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint)
{ {
dbg.nospace() << "Trackpoint(" << trackpoint.coordinates << ", " dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", "
<< trackpoint.timestamp << ", " << trackpoint.elevation << ", " << trackpoint.timestamp() << ", " << trackpoint.elevation() << ", "
<< trackpoint.geoidheight << ", " << trackpoint.speed << ", " << trackpoint.geoidHeight() << ", " << trackpoint.speed() << ", "
<< trackpoint.heartRate << ", " << trackpoint.temperature << ")"; << trackpoint.heartRate() << ", " << trackpoint.temperature() << ")";
return dbg.maybeSpace(); return dbg.maybeSpace();
} }

View File

@ -10,26 +10,42 @@ class Trackpoint
{ {
public: public:
Trackpoint() { Trackpoint() {
elevation = NAN; _elevation = NAN; _geoidHeight = 0; _speed = NAN; _heartRate = NAN;
geoidheight = 0; _temperature = NAN;
speed = NAN;
heartRate = NAN;
temperature = NAN;
} }
Trackpoint(const QPointF &coordinates) {_coordinates = coordinates;}
bool hasTimestamp() const {return !timestamp.isNull();} const QPointF &coordinates() const {return _coordinates;}
bool hasElevation() const {return !std::isnan(elevation);} const QDateTime &timestamp() const {return _timestamp;}
bool hasSpeed() const {return !std::isnan(speed);} qreal elevation() const {return _elevation;}
bool hasHeartRate() const {return !std::isnan(heartRate);} qreal geoidHeight() const {return _geoidHeight;}
bool hasTemperature() const {return !std::isnan(temperature);} qreal speed() const {return _speed;}
qreal heartRate() const {return _heartRate;}
qreal temperature() const {return _temperature;}
QPointF coordinates; void setCoordinates(const QPointF &coordinates)
QDateTime timestamp; {_coordinates = coordinates;}
qreal elevation; void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
qreal geoidheight; void setElevation(qreal elevation) {_elevation = elevation;}
qreal speed; void setGeoidHeight(qreal geoidHeight) {_geoidHeight = geoidHeight;}
qreal heartRate; void setSpeed(qreal speed) {_speed = speed;}
qreal temperature; void setHeartRate(qreal heartRate) {_heartRate = heartRate;}
void setTemperature(qreal temperature) {_temperature = temperature;}
bool hasTimestamp() const {return !_timestamp.isNull();}
bool hasElevation() const {return !std::isnan(_elevation);}
bool hasSpeed() const {return !std::isnan(_speed);}
bool hasHeartRate() const {return !std::isnan(_heartRate);}
bool hasTemperature() const {return !std::isnan(_temperature);}
private:
QPointF _coordinates;
QDateTime _timestamp;
qreal _elevation;
qreal _geoidHeight;
qreal _speed;
qreal _heartRate;
qreal _temperature;
}; };
QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint); QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint);

View File

@ -1,499 +0,0 @@
#include <QGraphicsView>
#include <QGraphicsScene>
#include <QPainterPath>
#include <QWheelEvent>
#include "poi.h"
#include "gpx.h"
#include "map.h"
#include "waypointitem.h"
#include "markeritem.h"
#include "scaleitem.h"
#include "ll.h"
#include "trackview.h"
#define MARGIN 10.0
#define TRACK_WIDTH 3
#define SCALE_OFFSET 7
TrackView::TrackView(QWidget *parent)
: QGraphicsView(parent)
{
_scene = new QGraphicsScene(this);
setScene(_scene);
setCacheMode(QGraphicsView::CacheBackground);
setDragMode(QGraphicsView::ScrollHandDrag);
setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setRenderHints(QPainter::Antialiasing);
_mapScale = new ScaleItem();
_mapScale->setZValue(2.0);
_zoom = ZOOM_MAX;
_scale = mapScale(_zoom);
_map = 0;
_maxPath = 0;
_maxDistance = 0;
_plot = false;
}
TrackView::~TrackView()
{
if (_mapScale->scene() != _scene)
delete _mapScale;
}
void TrackView::addTrack(const QVector<QPointF> &track)
{
QPainterPath path;
QGraphicsPathItem *pi;
MarkerItem *mi;
if (track.size() < 2) {
_palette.color();
return;
}
_tracks.append(track);
const QPointF &p = track.at(0);
path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
for (int i = 1; i < track.size(); i++) {
const QPointF &p = track.at(i);
path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
}
_maxPath = qMax(path.length(), _maxPath);
pi = new QGraphicsPathItem(path);
_paths.append(pi);
_zoom = qMin(_zoom, scale2zoom(trackScale()));
_scale = mapScale(_zoom);
QBrush brush(_palette.color(), Qt::SolidPattern);
QPen pen(brush, TRACK_WIDTH * _scale);
pi->setPen(pen);
pi->setScale(1.0/_scale);
_scene->addItem(pi);
mi = new MarkerItem(pi);
_markers.append(mi);
mi->setPos(pi->path().pointAtPercent(0));
mi->setScale(_scale);
}
void TrackView::addWaypoints(const QList<Waypoint> &waypoints)
{
for (int i = 0; i < waypoints.count(); i++) {
const Waypoint &w = waypoints.at(i);
WaypointItem *wi = new WaypointItem(
Waypoint(ll2mercator(QPointF(w.coordinates().x(),
-w.coordinates().y())), w.description()));
wi->setPos(wi->entry().coordinates() * 1.0/_scale);
wi->setZValue(1);
_scene->addItem(wi);
_locations.append(wi);
_waypoints.append(w.coordinates());
}
_zoom = qMin(_zoom, scale2zoom(waypointScale()));
_scale = mapScale(_zoom);
}
void TrackView::loadGPX(const GPX &gpx)
{
int zoom = _zoom;
for (int i = 0; i < gpx.trackCount(); i++) {
QVector<QPointF> track;
gpx.track(i).track(track);
addTrack(track);
_maxDistance = qMax(gpx.track(i).distance(), _maxDistance);
}
addWaypoints(gpx.waypoints());
if (_paths.empty() && _locations.empty())
return;
if ((_paths.size() > 1 && _zoom < zoom)
|| (_locations.size() && _zoom < zoom))
rescale(_scale);
QRectF br = trackBoundingRect() | waypointBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
_scene->setSceneRect(ba);
centerOn(ba.center());
_mapScale->setLatitude(-(br.center().ry() * _scale));
_mapScale->setZoom(_zoom);
if (_mapScale->scene() != _scene)
_scene->addItem(_mapScale);
}
QRectF TrackView::trackBoundingRect() const
{
if (_paths.empty())
return QRectF();
QRectF br = _paths.at(0)->sceneBoundingRect();
for (int i = 1; i < _paths.size(); i++)
br |= _paths.at(i)->sceneBoundingRect();
return br;
}
QRectF TrackView::waypointBoundingRect() const
{
qreal bottom, top, left, right;
if (_locations.empty())
return QRectF();
const QPointF &p = _locations.at(0)->pos();
bottom = p.y();
top = p.y();
left = p.x();
right = p.x();
for (int i = 1; i < _locations.size(); i++) {
const QPointF &p = _locations.at(i)->pos();
bottom = qMax(bottom, p.y());
top = qMin(top, p.y());
right = qMax(right, p.x());
left = qMin(left, p.x());
}
return QRectF(QPointF(left, top), QPointF(right, bottom));
}
qreal TrackView::trackScale() const
{
if (_paths.empty())
return mapScale(ZOOM_MAX);
QRectF br = _paths.at(0)->path().boundingRect();
for (int i = 1; i < _paths.size(); i++)
br |= _paths.at(i)->path().boundingRect();
QPointF sc(br.width() / (viewport()->width() - MARGIN/2),
br.height() / (viewport()->height() - MARGIN/2));
return qMax(sc.x(), sc.y());
}
qreal TrackView::waypointScale() const
{
qreal bottom, top, left, right;
if (_locations.size() < 2)
return mapScale(ZOOM_MAX);
const QPointF &p = _locations.at(0)->entry().coordinates();
bottom = p.y();
top = p.y();
left = p.x();
right = p.x();
for (int i = 1; i < _locations.size(); i++) {
const QPointF &p = _locations.at(i)->entry().coordinates();
bottom = qMax(bottom, p.y());
top = qMin(top, p.y());
right = qMax(right, p.x());
left = qMin(left, p.x());
}
QRectF br(QPointF(left, top), QPointF(right, bottom));
QPointF sc(br.width() / (viewport()->width() - MARGIN/2),
br.height() / (viewport()->height() - MARGIN/2));
return qMax(sc.x(), sc.y());
}
qreal TrackView::mapScale(int zoom) const
{
return ((360.0/(qreal)(1<<zoom))/(qreal)TILE_SIZE);
}
void TrackView::rescale(qreal scale)
{
for (int i = 0; i < _paths.size(); i++) {
_markers.at(i)->setScale(scale);
_paths.at(i)->setScale(1.0/scale);
QPen pen(_paths.at(i)->pen());
pen.setWidthF(TRACK_WIDTH * scale);
_paths.at(i)->setPen(pen);
}
for (int i = 0; i < _locations.size(); i++)
_locations.at(i)->setPos(_locations.at(i)->entry().coordinates()
* 1.0/scale);
QHash<Waypoint, WaypointItem*>::const_iterator it, jt;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
it.value()->setPos(it.value()->entry().coordinates() * 1.0/scale);
it.value()->show();
}
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
if (it != jt && it.value()->isVisible() && jt.value()->isVisible()
&& it.value()->collidesWithItem(jt.value()))
jt.value()->hide();
}
}
_scale = scale;
}
void TrackView::addPOI(const QVector<Waypoint> &waypoints)
{
for (int i = 0; i < waypoints.size(); i++) {
const Waypoint &w = waypoints.at(i);
if (_pois.contains(w))
continue;
WaypointItem *pi = new WaypointItem(
Waypoint(ll2mercator(QPointF(w.coordinates().x(),
-w.coordinates().y())), w.description()));
pi->setPos(pi->entry().coordinates() * 1.0/_scale);
pi->setZValue(1);
_scene->addItem(pi);
_pois.insert(w, pi);
}
}
void TrackView::loadPOI(const POI &poi)
{
QHash<Waypoint, WaypointItem*>::const_iterator it,jt;
if (!_tracks.size() && !_waypoints.size())
return;
for (int i = 0; i < _tracks.size(); i++)
addPOI(poi.points(_tracks.at(i)));
addPOI(poi.points(_waypoints));
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
if (it != jt && it.value()->isVisible() && jt.value()->isVisible()
&& it.value()->collidesWithItem(jt.value()))
jt.value()->hide();
}
}
}
void TrackView::setMap(Map *map)
{
_map = map;
if (_map)
connect(_map, SIGNAL(loaded()), this, SLOT(redraw()),
Qt::UniqueConnection);
resetCachedContent();
}
void TrackView::setUnits(enum Units units)
{
_mapScale->setUnits(units);
}
void TrackView::redraw()
{
resetCachedContent();
}
void TrackView::rescale()
{
_zoom = qMin(scale2zoom(trackScale()), scale2zoom(waypointScale()));
rescale(mapScale(_zoom));
_mapScale->setZoom(_zoom);
}
void TrackView::wheelEvent(QWheelEvent *event)
{
if (_paths.isEmpty() && _locations.isEmpty())
return;
QPointF pos = mapToScene(event->pos());
qreal scale = _scale;
_zoom = (event->delta() > 0) ?
qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
rescale(mapScale(_zoom));
QRectF br = trackBoundingRect() | waypointBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
_scene->setSceneRect(ba);
if (br.width() < viewport()->size().width()
&& br.height() < viewport()->size().height())
centerOn(br.center());
else
centerOn(pos * scale/_scale);
_mapScale->setZoom(_zoom);
resetCachedContent();
}
void TrackView::plot(QPainter *painter, const QRectF &target)
{
QRect orig, adj;
qreal ratio, diff;
orig = viewport()->rect();
if (orig.height() * (target.width() / target.height()) - orig.width() < 0) {
ratio = target.height()/target.width();
diff = (orig.width() * ratio) - orig.height();
adj = orig.adjusted(0, -diff/2, 0, diff/2);
} else {
ratio = target.width() / target.height();
diff = (orig.height() * ratio) - orig.width();
adj = orig.adjusted(-diff/2, 0, diff/2, 0);
}
setUpdatesEnabled(false);
_plot = true;
QPointF pos = _mapScale->pos();
_mapScale->setPos(mapToScene(QPoint(adj.bottomRight() + QPoint(
-(SCALE_OFFSET + _mapScale->boundingRect().width()),
-(SCALE_OFFSET + _mapScale->boundingRect().height())))));
render(painter, target, adj);
_mapScale->setPos(pos);
_plot = false;
setUpdatesEnabled(true);
}
void TrackView::clearPOI()
{
QHash<Waypoint, WaypointItem*>::const_iterator it;
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
_scene->removeItem(it.value());
delete it.value();
}
_pois.clear();
}
void TrackView::clear()
{
if (_mapScale->scene() == _scene)
_scene->removeItem(_mapScale);
_pois.clear();
_paths.clear();
_locations.clear();
_markers.clear();
_scene->clear();
_palette.reset();
_tracks.clear();
_waypoints.clear();
_maxPath = 0;
_maxDistance = 0;
_zoom = ZOOM_MAX;
_scale = mapScale(_zoom);
_scene->setSceneRect(QRectF());
}
void TrackView::movePositionMarker(qreal val)
{
qreal mp = val / _maxDistance;
for (int i = 0; i < _paths.size(); i++) {
qreal f = _maxPath / _paths.at(i)->path().length();
if (mp * f < 0 || mp * f > 1.0)
_markers.at(i)->setVisible(false);
else {
QPointF pos = _paths.at(i)->path().pointAtPercent(mp * f);
_markers.at(i)->setPos(pos);
_markers.at(i)->setVisible(true);
}
}
}
void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
{
if ((_paths.isEmpty() && _locations.isEmpty()) || !_map) {
painter->fillRect(rect, Qt::white);
return;
}
QRectF rr(rect.topLeft() * _scale, rect.size());
QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
_zoom);
QPointF tm = tile2mercator(tile, _zoom);
QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / _scale,
-tm.y() / _scale))).toPoint();
QList<Tile> tiles;
for (int i = 0; i <= rr.size().width() / TILE_SIZE + 1; i++) {
for (int j = 0; j <= rr.size().height() / TILE_SIZE + 1; j++) {
tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
}
}
_map->loadTiles(tiles, _plot);
for (int i = 0; i < tiles.count(); i++) {
Tile &t = tiles[i];
QPoint tp(tl.x() + (t.xy().x() - tile.x()) * TILE_SIZE,
tl.y() + (t.xy().y() - tile.y()) * TILE_SIZE);
painter->drawPixmap(tp, t.pixmap());
}
}
void TrackView::resizeEvent(QResizeEvent *e)
{
if (_paths.isEmpty() && _locations.isEmpty())
return;
rescale();
QRectF br = trackBoundingRect() | waypointBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
if (ba.width() < e->size().width()) {
qreal diff = e->size().width() - ba.width();
ba.adjust(-diff/2, 0, diff/2, 0);
}
if (ba.height() < e->size().height()) {
qreal diff = e->size().height() - ba.height();
ba.adjust(0, -diff/2, 0, diff/2);
}
_scene->setSceneRect(ba);
centerOn(br.center());
resetCachedContent();
}
void TrackView::paintEvent(QPaintEvent *e)
{
QPointF scenePos = mapToScene(rect().bottomRight() + QPoint(
-(SCALE_OFFSET + _mapScale->boundingRect().width()),
-(SCALE_OFFSET + _mapScale->boundingRect().height())));
if (_mapScale->pos() != scenePos && !_plot)
_mapScale->setPos(scenePos);
QGraphicsView::paintEvent(e);
}

View File

@ -13,10 +13,14 @@ enum Units {
#define MS2MIH 2.236936290000 // m/s -> mi/h #define MS2MIH 2.236936290000 // m/s -> mi/h
#define FT2MI 0.000189393939 // ft -> mi #define FT2MI 0.000189393939 // ft -> mi
#define MM2IN 0.039370100000 // mm -> in #define MM2IN 0.039370100000 // mm -> in
#define H2S 0.000277777778 // h -> s
#define MIN2S 0.016666666667 // min -> s
#define KMINM 1000 // 1 km in m #define KMINM 1000 // 1 km in m
#define MIINFT 5280 // 1 mi in ft #define MIINFT 5280 // 1 mi in ft
#define MIINM 1609.344 // 1mi in m #define MIINM 1609.344 // 1 mi in m
#define MININS 60 // 1 min in s
#define HINS 3600 // 1 hins
#define C2FS 1.8 // Celsius to Farenheit - scale #define C2FS 1.8 // Celsius to Farenheit - scale
#define C2FO 32 // Celsius to Farenheit - offset #define C2FO 32 // Celsius to Farenheit - offset

9
src/waypoint.cpp Normal file
View File

@ -0,0 +1,9 @@
#include "waypoint.h"
QDebug operator<<(QDebug dbg, const Waypoint &waypoint)
{
dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", "
<< waypoint.name() << ", " << waypoint.description() << ")";
return dbg.maybeSpace();
}

View File

@ -3,34 +3,54 @@
#include <QPointF> #include <QPointF>
#include <QString> #include <QString>
#include <QDateTime>
#include <QHash> #include <QHash>
#include <QDebug>
#include <cmath>
class Waypoint class Waypoint
{ {
public: public:
Waypoint() {} Waypoint() {_elevation = NAN; _geoidHeight = 0;}
Waypoint(const QPointF &coordinates, const QString &description) Waypoint(const QPointF &coordinates)
: _coordinates(coordinates), _description(description) {} : _coordinates(coordinates) {_elevation = NAN; _geoidHeight = 0;}
const QPointF &coordinates() const {return _coordinates;} const QPointF &coordinates() const {return _coordinates;}
const QString &name() const {return _name;}
const QString &description() const {return _description;} const QString &description() const {return _description;}
const QDateTime &timestamp() const {return _timestamp;}
qreal elevation() const {return _elevation;}
qreal geoidHeight() const {return _geoidHeight;}
void setCoordinates(const QPointF &coordinates) void setCoordinates(const QPointF &coordinates)
{_coordinates = coordinates;} {_coordinates = coordinates;}
void setName(const QString &name) {_name = name;}
void setDescription(const QString &description) void setDescription(const QString &description)
{_description = description;} {_description = description;}
void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
void setElevation(qreal elevation) {_elevation = elevation;}
void setGeoidHeight(qreal geoidHeight) {_geoidHeight = geoidHeight;}
bool hasElevation() const {return !std::isnan(_elevation);}
bool operator==(const Waypoint &other) const bool operator==(const Waypoint &other) const
{return this->_description == other._description {return this->_name == other._name
&& this->_coordinates == other._coordinates;} && this->_coordinates == other._coordinates;}
private: private:
QPointF _coordinates; QPointF _coordinates;
QString _name;
QString _description; QString _description;
QDateTime _timestamp;
qreal _elevation;
qreal _geoidHeight;
}; };
inline uint qHash(const Waypoint &key) inline uint qHash(const Waypoint &key)
{ {
return ::qHash(key.description()); return ::qHash(key.name());
} }
QDebug operator<<(QDebug dbg, const Waypoint &Waypoint);
#endif // WAYPOINT_H #endif // WAYPOINT_H

View File

@ -1,49 +1,145 @@
#include <QApplication>
#include <QPainter> #include <QPainter>
#include "config.h" #include "config.h"
#include "ll.h"
#include "misc.h"
#include "tooltip.h"
#include "waypointitem.h" #include "waypointitem.h"
#define POINT_SIZE 8 #define POINT_SIZE 8
#define HOVER_SIZE 10
WaypointItem::WaypointItem(const Waypoint &entry, QGraphicsItem *parent) QString WaypointItem::toolTip()
: QGraphicsItem(parent)
{ {
_entry = entry; ToolTip tt;
updateBoundingRect();
if (!_waypoint.name().isEmpty() && !_showLabel)
tt.insert(qApp->translate("WaypointItem", "Name"), _waypoint.name());
tt.insert(qApp->translate("WaypointItem", "Coordinates"),
::coordinates(_waypoint.coordinates()));
if (!std::isnan(_waypoint.elevation()))
tt.insert(qApp->translate("WaypointItem", "Elevation"),
::elevation(_waypoint.elevation() - _waypoint.geoidHeight(), _units));
if (!_waypoint.timestamp().isNull())
tt.insert(qApp->translate("WaypointItem", "Date"),
_waypoint.timestamp().toString(Qt::SystemLocaleShortDate));
if (!_waypoint.description().isNull())
tt.insert(qApp->translate("WaypointItem", "Description"),
_waypoint.description());
return tt.toString();
} }
void WaypointItem::updateBoundingRect() WaypointItem::WaypointItem(const Waypoint &waypoint, QGraphicsItem *parent)
: QGraphicsItem(parent)
{ {
_units = Metric;
_showLabel = true;
_hover = false;
_waypoint = waypoint;
_coordinates = ll2mercator(QPointF(waypoint.coordinates().x(),
-waypoint.coordinates().y()));
updateShape();
setPos(_coordinates);
setToolTip(toolTip());
setCursor(Qt::ArrowCursor);
setAcceptHoverEvents(true);
}
void WaypointItem::updateShape()
{
QPainterPath p;
qreal pointSize = _hover ? HOVER_SIZE : POINT_SIZE;
if (_showLabel) {
QFont font; QFont font;
font.setPixelSize(FONT_SIZE); font.setPixelSize(FONT_SIZE);
font.setFamily(FONT_FAMILY); font.setFamily(FONT_FAMILY);
if (_hover)
font.setBold(true);
QFontMetrics fm(font); QFontMetrics fm(font);
QRect ts = fm.tightBoundingRect(_entry.description()); QRect ts = fm.tightBoundingRect(_waypoint.name());
_boundingRect = QRectF(-POINT_SIZE/2, -POINT_SIZE/2, ts.width() p.addRect(-pointSize/2, -pointSize/2, pointSize, pointSize);
+ POINT_SIZE, ts.height() + fm.descent() + POINT_SIZE); p.addRect(pointSize/2, pointSize/2,
ts.width(), ts.height() + fm.descent());
} else
p.addRect(-pointSize/2, -pointSize/2, pointSize, pointSize);
_shape = p;
} }
void WaypointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void WaypointItem::paint(QPainter *painter,
QWidget *widget) const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
Q_UNUSED(option); Q_UNUSED(option);
Q_UNUSED(widget); Q_UNUSED(widget);
qreal pointSize = _hover ? HOVER_SIZE : POINT_SIZE;
if (_showLabel) {
QFont font; QFont font;
font.setPixelSize(FONT_SIZE); font.setPixelSize(FONT_SIZE);
font.setFamily(FONT_FAMILY); font.setFamily(FONT_FAMILY);
if (_hover)
font.setBold(true);
QFontMetrics fm(font); QFontMetrics fm(font);
QRect ts = fm.tightBoundingRect(_entry.description()); QRect ts = fm.tightBoundingRect(_waypoint.name());
painter->setFont(font); painter->setFont(font);
painter->drawText(POINT_SIZE/2 - qMax(ts.x(), 0), POINT_SIZE/2 + ts.height(), painter->drawText(pointSize/2 - qMax(ts.x(), 0), pointSize/2
_entry.description()); + ts.height(), _waypoint.name());
}
painter->setBrush(Qt::SolidPattern); painter->setBrush(Qt::SolidPattern);
painter->drawEllipse(-POINT_SIZE/2, -POINT_SIZE/2, POINT_SIZE, POINT_SIZE); painter->drawEllipse(-pointSize/2, -pointSize/2, pointSize, pointSize);
/* /*
painter->setPen(Qt::red); painter->setPen(Qt::red);
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->drawRect(boundingRect()); painter->drawPath(_shape);
*/ */
} }
void WaypointItem::setScale(qreal scale)
{
setPos(_coordinates * scale);
}
void WaypointItem::setUnits(enum Units units)
{
_units = units;
setToolTip(toolTip());
}
void WaypointItem::showLabel(bool show)
{
prepareGeometryChange();
_showLabel = show;
updateShape();
setToolTip(toolTip());
}
void WaypointItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
Q_UNUSED(event);
prepareGeometryChange();
_hover = true;
updateShape();
setZValue(zValue() + 1.0);
}
void WaypointItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
Q_UNUSED(event);
prepareGeometryChange();
_hover = false;
updateShape();
setZValue(zValue() - 1.0);
}

View File

@ -3,22 +3,39 @@
#include <QGraphicsItem> #include <QGraphicsItem>
#include "waypoint.h" #include "waypoint.h"
#include "units.h"
class WaypointItem : public QGraphicsItem class WaypointItem : public QGraphicsItem
{ {
public: public:
WaypointItem(const Waypoint &entry, QGraphicsItem *parent = 0); WaypointItem(const Waypoint &waypoint, QGraphicsItem *parent = 0);
const Waypoint &entry() const {return _entry;}
QRectF boundingRect() const {return _boundingRect;} const Waypoint &waypoint() const {return _waypoint;}
const QPointF &coordinates() const {return _coordinates;}
void setUnits(enum Units units);
void setScale(qreal scale);
void showLabel(bool show);
QPainterPath shape() const {return _shape;}
QRectF boundingRect() const {return _shape.boundingRect();}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget); QWidget *widget);
private: private:
void updateBoundingRect(); void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
Waypoint _entry; void updateShape();
QRectF _boundingRect; QString toolTip();
QPainterPath _shape;
QPointF _coordinates;
Waypoint _waypoint;
Units _units;
bool _hover;
bool _showLabel;
}; };
#endif // WAYPOINTITEM_H #endif // WAYPOINTITEM_H