Various route-releated fixes & improvements

Refactoring/optimization/cleanup

gpxsee.pro

@@ -1,5 +1,5 @@
 TARGET = GPXSee
-VERSION = 2.17
+VERSION = 2.18
 QT += core \
     gui \
     network
@@ -47,7 +47,10 @@ HEADERS += src/config.h \
     src/graphtab.h \
     src/misc.h \
     src/trackitem.h \
-    src/tooltip.h
+    src/tooltip.h \
+    src/route.h \
+    src/routeitem.h \
+    src/graphitem.h
 SOURCES += src/main.cpp \
     src/gui.cpp \
     src/gpx.cpp \
@@ -82,7 +85,10 @@ SOURCES += src/main.cpp \
     src/misc.cpp \
     src/waypoint.cpp \
     src/trackitem.cpp \
-    src/tooltip.cpp
+    src/tooltip.cpp \
+    src/route.cpp \
+    src/routeitem.cpp \
+    src/graphitem.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts
 macx {

lang/gpxsee_cs.ts

@@ -4,55 +4,55 @@
 <context>
     <name>ElevationGraph</name>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="14"/>
+        <location filename="../src/elevationgraph.cpp" line="48"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="15"/>
+        <location filename="../src/elevationgraph.cpp" line="49"/>
         <location filename="../src/elevationgraph.h" line="15"/>
         <source>Elevation</source>
         <translation>Výška</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="81"/>
+        <location filename="../src/elevationgraph.cpp" line="145"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="78"/>
+        <location filename="../src/elevationgraph.cpp" line="142"/>
-        <location filename="../src/elevationgraph.cpp" line="98"/>
+        <location filename="../src/elevationgraph.cpp" line="162"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="22"/>
+        <location filename="../src/elevationgraph.cpp" line="59"/>
         <source>Ascent</source>
         <translation>Stoupání</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="24"/>
+        <location filename="../src/elevationgraph.cpp" line="61"/>
         <source>Descent</source>
         <translation>Klesání</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="28"/>
+        <location filename="../src/elevationgraph.cpp" line="65"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="89"/>
+        <location filename="../src/elevationgraph.cpp" line="153"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="86"/>
+        <location filename="../src/elevationgraph.cpp" line="150"/>
-        <location filename="../src/elevationgraph.cpp" line="101"/>
+        <location filename="../src/elevationgraph.cpp" line="165"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../src/elevationgraph.cpp" line="26"/>
+        <location filename="../src/elevationgraph.cpp" line="63"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
@@ -163,331 +163,370 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/gui.cpp" line="446"/>
+        <location filename="../src/gui.cpp" line="484"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
         <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="510"/>
+        <location filename="../src/gui.cpp" line="548"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="586"/>
+        <location filename="../src/gui.cpp" line="628"/>
         <source>Open POI file</source>
         <translation>Otevřít POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="194"/>
+        <location filename="../src/gui.cpp" line="198"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="178"/>
+        <location filename="../src/gui.cpp" line="182"/>
         <source>Quit</source>
         <translation>Ukončit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="186"/>
+        <location filename="../src/gui.cpp" line="190"/>
-        <location filename="../src/gui.cpp" line="462"/>
+        <location filename="../src/gui.cpp" line="500"/>
-        <location filename="../src/gui.cpp" line="463"/>
+        <location filename="../src/gui.cpp" line="501"/>
         <source>Keyboard controls</source>
         <translation>Ovládací klávesy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="210"/>
+        <location filename="../src/gui.cpp" line="214"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="216"/>
+        <location filename="../src/gui.cpp" line="220"/>
         <source>Reload</source>
         <translation>Znovu načíst</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="378"/>
+        <location filename="../src/gui.cpp" line="418"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="317"/>
+        <location filename="../src/gui.cpp" line="347"/>
-        <location filename="../src/gui.cpp" line="372"/>
+        <location filename="../src/gui.cpp" line="412"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="184"/>
+        <location filename="../src/gui.cpp" line="188"/>
-        <location filename="../src/gui.cpp" line="485"/>
+        <location filename="../src/gui.cpp" line="523"/>
-        <location filename="../src/gui.cpp" line="486"/>
+        <location filename="../src/gui.cpp" line="524"/>
         <source>Data sources</source>
         <translation>Zdroje dat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="224"/>
+        <location filename="../src/gui.cpp" line="228"/>
         <source>Load POI file</source>
         <translation>Nahrát POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="227"/>
+        <location filename="../src/gui.cpp" line="231"/>
         <source>Close POI files</source>
         <translation>Zavřit POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="229"/>
+        <location filename="../src/gui.cpp" line="233"/>
         <source>Overlap POIs</source>
         <translation>Překrývat POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="234"/>
+        <location filename="../src/gui.cpp" line="237"/>
+        <source>Show POI labels</source>
+        <translation>Zobrazovat názvy POI</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="242"/>
         <source>Show POIs</source>
         <translation>Zobrazit POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="242"/>
+        <location filename="../src/gui.cpp" line="250"/>
         <source>Show map</source>
         <translation>Zobrazit mapu</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="248"/>
+        <location filename="../src/gui.cpp" line="256"/>
         <source>Clear tile cache</source>
         <translation>Vymazat mezipaměť dlaždic</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="257"/>
+        <location filename="../src/gui.cpp" line="265"/>
-        <location filename="../src/gui.cpp" line="261"/>
+        <location filename="../src/gui.cpp" line="269"/>
-        <location filename="../src/gui.cpp" line="472"/>
+        <location filename="../src/gui.cpp" line="510"/>
         <source>Next map</source>
         <translation>Následující mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="268"/>
+        <location filename="../src/gui.cpp" line="276"/>
+        <source>Show tracks</source>
+        <translation>Zobrazit cesty</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="280"/>
+        <source>Show routes</source>
+        <translation>Zobrazit trasy</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="284"/>
+        <source>Show waypoints</source>
+        <translation>Zobrazit navigační body</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="288"/>
+        <source>Waypoint labels</source>
+        <translation>Názvy navigačních bodů</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="298"/>
         <source>Show graphs</source>
         <translation>Zobrazovat grafy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="274"/>
+        <location filename="../src/gui.cpp" line="304"/>
         <source>Show toolbars</source>
         <translation>Zobrazovat nástrojové lišty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="280"/>
+        <location filename="../src/gui.cpp" line="310"/>
         <source>Metric</source>
         <translation>Metrické</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="285"/>
+        <location filename="../src/gui.cpp" line="315"/>
         <source>Imperial</source>
         <translation>Imperiální</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="291"/>
+        <location filename="../src/gui.cpp" line="321"/>
         <source>Fullscreen mode</source>
         <translation>Celoobrazovkový režim</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="299"/>
+        <location filename="../src/gui.cpp" line="329"/>
         <source>Next</source>
         <translation>Následující</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="302"/>
+        <location filename="../src/gui.cpp" line="332"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="306"/>
+        <location filename="../src/gui.cpp" line="336"/>
         <source>Last</source>
         <translation>Poslední</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="309"/>
+        <location filename="../src/gui.cpp" line="339"/>
         <source>First</source>
         <translation>První</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="331"/>
+        <location filename="../src/gui.cpp" line="361"/>
         <source>Map</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="338"/>
+        <location filename="../src/gui.cpp" line="368"/>
         <source>POI</source>
         <translation>POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="339"/>
+        <location filename="../src/gui.cpp" line="369"/>
         <source>POI files</source>
         <translation>POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="349"/>
+        <location filename="../src/gui.cpp" line="380"/>
+        <source>Data</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="381"/>
+        <source>Display</source>
+        <translation>Zobrazit</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="389"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="350"/>
+        <location filename="../src/gui.cpp" line="390"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="359"/>
+        <location filename="../src/gui.cpp" line="399"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="474"/>
+        <location filename="../src/gui.cpp" line="512"/>
         <source>Previous map</source>
         <translation>Předchozí mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="672"/>
+        <location filename="../src/gui.cpp" line="716"/>
-        <location filename="../src/gui.cpp" line="675"/>
+        <location filename="../src/gui.cpp" line="719"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="853"/>
+        <location filename="../src/gui.cpp" line="728"/>
+        <source>Routes</source>
+        <translation>Trasy</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="918"/>
         <source>No GPX files loaded</source>
         <translation>Nejsou načteny žádné GPX soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="465"/>
+        <location filename="../src/gui.cpp" line="922"/>
+        <source>%1 files</source>
+        <translation>%1 souborů</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="503"/>
         <source>Next file</source>
         <translation>Následující soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="442"/>
+        <location filename="../src/gui.cpp" line="480"/>
         <source>Version </source>
         <translation>Verze </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="199"/>
+        <location filename="../src/gui.cpp" line="203"/>
         <source>Print...</source>
         <translation>Tisknout...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="204"/>
+        <location filename="../src/gui.cpp" line="208"/>
         <source>Export to PDF...</source>
         <translation>Exportovat do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="466"/>
+        <location filename="../src/gui.cpp" line="730"/>
+        <source>Waypoints</source>
+        <translation>Navigační body</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="504"/>
         <source>Previous file</source>
         <translation>Předchozí soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="468"/>
+        <location filename="../src/gui.cpp" line="292"/>
+        <source>Route waypoints</source>
+        <translation>Body tras</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="506"/>
         <source>First file</source>
         <translation>První soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="469"/>
+        <location filename="../src/gui.cpp" line="507"/>
         <source>Last file</source>
         <translation>Poslední soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="470"/>
+        <location filename="../src/gui.cpp" line="508"/>
         <source>Append modifier</source>
         <translation>Modifikátor nahradit/přidat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="489"/>
+        <location filename="../src/gui.cpp" line="527"/>
         <source>Map (tiles) source URLs are read on program startup from the following file:</source>
         <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="492"/>
+        <location filename="../src/gui.cpp" line="530"/>
         <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
         <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="500"/>
+        <location filename="../src/gui.cpp" line="538"/>
         <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
         <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="511"/>
+        <location filename="../src/gui.cpp" line="549"/>
         <source>GPX files (*.gpx);;All files (*)</source>
         <translation>Soubory GPX (*.gpx);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="577"/>
+        <location filename="../src/gui.cpp" line="619"/>
-        <location filename="../src/gui.cpp" line="603"/>
+        <location filename="../src/gui.cpp" line="645"/>
         <source>Line: %1</source>
         <translation>Řádka: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="587"/>
+        <location filename="../src/gui.cpp" line="629"/>
         <source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source>
         <translation>Soubory GPX (*.gpx);;Soubory CSV (*.csv);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="678"/>
+        <location filename="../src/gui.cpp" line="726"/>
         <source>Tracks</source>
-        <translation>Počet tras</translation>
+        <translation>Cesty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="684"/>
+        <location filename="../src/gui.cpp" line="193"/>
-        <source>mi</source>
+        <location filename="../src/gui.cpp" line="478"/>
-        <translation>mi</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="189"/>
-        <location filename="../src/gui.cpp" line="440"/>
         <source>About GPXSee</source>
         <translation>O aplikaci GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="382"/>
+        <location filename="../src/gui.cpp" line="422"/>
         <source>Navigation</source>
         <translation>Navigace</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="488"/>
+        <location filename="../src/gui.cpp" line="526"/>
         <source>Map sources</source>
         <translation>Mapové zdroje</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="499"/>
+        <location filename="../src/gui.cpp" line="537"/>
         <source>POIs</source>
         <translation>POI body</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="683"/>
+        <location filename="../src/gui.cpp" line="733"/>
-        <location filename="../src/gui.cpp" line="686"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="691"/>
+        <location filename="../src/gui.cpp" line="735"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="860"/>
+        <location filename="../src/gui.cpp" line="621"/>
-        <source>%1 tracks</source>
+        <location filename="../src/gui.cpp" line="646"/>
-        <translation>Počet tras: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="687"/>
-        <source>km</source>
-        <translation>km</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="579"/>
-        <location filename="../src/gui.cpp" line="604"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="574"/>
+        <location filename="../src/gui.cpp" line="616"/>
         <source>Error loading GPX file:
 %1</source>
         <translation>Soubor GPX nelze otevřít:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="600"/>
+        <location filename="../src/gui.cpp" line="642"/>
         <source>Error loading POI file:
 %1</source>
         <translation>Soubor POI nelze otevřít:
@@ -497,48 +536,48 @@
 <context>
     <name>HeartRateGraph</name>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="10"/>
+        <location filename="../src/heartrategraph.cpp" line="11"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="11"/>
+        <location filename="../src/heartrategraph.cpp" line="12"/>
         <location filename="../src/heartrategraph.h" line="15"/>
         <source>Heart rate</source>
         <translation>Tep</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="78"/>
+        <location filename="../src/heartrategraph.cpp" line="84"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="9"/>
+        <location filename="../src/heartrategraph.cpp" line="10"/>
         <source>1/min</source>
         <translation>1/min</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="18"/>
+        <location filename="../src/heartrategraph.cpp" line="20"/>
         <source>Average</source>
         <translation>Průměr</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="20"/>
+        <location filename="../src/heartrategraph.cpp" line="22"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="75"/>
+        <location filename="../src/heartrategraph.cpp" line="81"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="83"/>
+        <location filename="../src/heartrategraph.cpp" line="89"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../src/heartrategraph.cpp" line="86"/>
+        <location filename="../src/heartrategraph.cpp" line="92"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
@@ -569,24 +608,32 @@
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>RouteItem</name>
+    <message>
+        <location filename="../src/routeitem.cpp" line="17"/>
+        <source>Distance</source>
+        <translation>Vzdálenost</translation>
+    </message>
+</context>
+<context>
+    <name>ScaleItem</name>
     <message>
         <location filename="../src/scaleitem.cpp" line="81"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="../src/scaleitem.cpp" line="81"/>
+        <location filename="../src/scaleitem.cpp" line="82"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../src/scaleitem.cpp" line="83"/>
+        <location filename="../src/scaleitem.cpp" line="84"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="../src/scaleitem.cpp" line="83"/>
+        <location filename="../src/scaleitem.cpp" line="85"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -594,53 +641,53 @@
 <context>
     <name>SpeedGraph</name>
     <message>
-        <location filename="../src/speedgraph.cpp" line="11"/>
+        <location filename="../src/speedgraph.cpp" line="12"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="12"/>
+        <location filename="../src/speedgraph.cpp" line="13"/>
         <location filename="../src/speedgraph.h" line="16"/>
         <source>Speed</source>
         <translation>Rychlost</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="72"/>
+        <location filename="../src/speedgraph.cpp" line="77"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="75"/>
+        <location filename="../src/speedgraph.cpp" line="80"/>
         <source>km</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="80"/>
+        <location filename="../src/speedgraph.cpp" line="85"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="92"/>
+        <location filename="../src/speedgraph.cpp" line="97"/>
         <source>km/h</source>
         <translation>km/h</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="19"/>
+        <location filename="../src/speedgraph.cpp" line="21"/>
         <source>Average</source>
         <translation>Průměr</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="21"/>
+        <location filename="../src/speedgraph.cpp" line="23"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="83"/>
+        <location filename="../src/speedgraph.cpp" line="88"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="../src/speedgraph.cpp" line="95"/>
+        <location filename="../src/speedgraph.cpp" line="100"/>
         <source>mi/h</source>
         <translation>mi/h</translation>
     </message>
@@ -648,58 +695,58 @@
 <context>
     <name>TemperatureGraph</name>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="10"/>
+        <location filename="../src/temperaturegraph.cpp" line="11"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="11"/>
+        <location filename="../src/temperaturegraph.cpp" line="12"/>
         <location filename="../src/temperaturegraph.h" line="15"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="18"/>
+        <location filename="../src/temperaturegraph.cpp" line="20"/>
         <source>Average</source>
         <translation>Průměr</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="20"/>
+        <location filename="../src/temperaturegraph.cpp" line="22"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="22"/>
+        <location filename="../src/temperaturegraph.cpp" line="24"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="77"/>
+        <location filename="../src/temperaturegraph.cpp" line="83"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="80"/>
+        <location filename="../src/temperaturegraph.cpp" line="86"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="85"/>
+        <location filename="../src/temperaturegraph.cpp" line="91"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="88"/>
+        <location filename="../src/temperaturegraph.cpp" line="94"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="97"/>
+        <location filename="../src/temperaturegraph.cpp" line="103"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="101"/>
+        <location filename="../src/temperaturegraph.cpp" line="107"/>
         <source>F</source>
         <translation>F</translation>
     </message>
@@ -725,22 +772,27 @@
 <context>
     <name>WaypointItem</name>
     <message>
-        <location filename="../src/waypointitem.cpp" line="16"/>
+        <location filename="../src/waypointitem.cpp" line="17"/>
+        <source>Name</source>
+        <translation>Název</translation>
+    </message>
+    <message>
+        <location filename="../src/waypointitem.cpp" line="18"/>
         <source>Coordinates</source>
         <translation>Souřadnice</translation>
     </message>
     <message>
-        <location filename="../src/waypointitem.cpp" line="19"/>
+        <location filename="../src/waypointitem.cpp" line="21"/>
         <source>Elevation</source>
         <translation>Výška</translation>
     </message>
     <message>
-        <location filename="../src/waypointitem.cpp" line="22"/>
+        <location filename="../src/waypointitem.cpp" line="24"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/waypointitem.cpp" line="25"/>
+        <location filename="../src/waypointitem.cpp" line="27"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>

pkg/gpxsee.nsi

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

pkg/gpxsee64.nsi

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

src/elevationgraph.cpp

@@ -1,12 +1,46 @@
+#include <cmath>
 #include "config.h"
 #include "gpx.h"
 #include "elevationgraph.h"
 
 
+static qreal nMin(qreal a, qreal b)
+{
+	if (!std::isnan(a) && !std::isnan(b))
+		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)
 {
-	_ascent = 0;
+	_trackAscent = 0;
-	_descent = 0;
+	_routeAscent = 0;
+	_trackDescent = 0;
+	_routeDescent = 0;
+	_trackMin = NAN;
+	_trackMax = NAN;
+	_routeMin = NAN;
+	_routeMax = NAN;
+
+	_showRoutes = true;
+	_showTracks = true;
 
 	_units = Metric;
 
@@ -17,32 +51,33 @@ ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
 	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());
-	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::loadPath(const QVector<QPointF> &data, Type type)
 {
-	for (int i = 0; i < gpx.trackCount(); i++) {
-		QVector<QPointF> data;
 	qreal ascent = 0, descent = 0;
+	qreal min, max;
 
-		gpx.track(i).elevationGraph(data);
 	if (data.count() < 2) {
 		skipColor();
-			continue;
+		return;
 	}
 
+	max = min = data.at(0).y();
 	for (int j = 1; j < data.size(); j++) {
 		qreal cur = data.at(j).y();
 		qreal prev = data.at(j-1).y();
@@ -51,22 +86,51 @@ void ElevationGraph::loadGPX(const GPX &gpx)
 			ascent += cur - prev;
 		if (cur < prev)
 			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);
 	}
 
+	loadData(data, type);
+}
+
+void ElevationGraph::loadGPX(const GPX &gpx)
+{
+	for (int i = 0; i < gpx.tracks().count(); i++)
+		loadPath(gpx.tracks().at(i)->elevation(), Track);
+	for (int i = 0; i < gpx.routes().count(); i++)
+		loadPath(gpx.routes().at(i)->elevation(), Route);
+
 	setXUnits();
-	addInfo();
+	setInfo();
+
+	redraw();
 }
 
 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();
 }
@@ -106,9 +170,88 @@ void ElevationGraph::setYUnits()
 void ElevationGraph::setUnits(enum Units units)
 {
 	_units = units;
+
 	setXUnits();
 	setYUnits();
+	setInfo();
 
-	clearInfo();
+	redraw();
-	addInfo();
+}
+
+void ElevationGraph::showTracks(bool show)
+{
+	_showTracks = show;
+
+	setInfo();
+	showGraph(show, Track);
+	setXUnits();
+
+	redraw();
+}
+
+void ElevationGraph::showRoutes(bool show)
+{
+	_showRoutes = show;
+
+	showGraph(show, Route);
+	setXUnits();
+	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;
 }

src/elevationgraph.h

@@ -16,19 +16,30 @@ public:
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
+	void showTracks(bool show);
+	void showRoutes(bool show);
 
 private:
-	qreal ascent() const {return _ascent;}
+	enum Type {Track, Route};
-	qreal descent() const {return _descent;}
+
-	qreal max() const {return bounds().bottom();}
+	qreal max() const;
-	qreal min() const {return bounds().top();}
+	qreal min() const;
+	qreal ascent() const;
+	qreal descent() const;
 
 	void setXUnits();
 	void setYUnits();
-	void addInfo();
+	void setInfo();
+
+	void loadPath(const QVector<QPointF> &data, Type type);
+
+	qreal _trackAscent, _trackDescent;
+	qreal _routeAscent, _routeDescent;
+	qreal _trackMax, _routeMax;
+	qreal _trackMin, _routeMin;
 
-	qreal _ascent, _descent;
 	enum Units _units;
+	bool _showTracks, _showRoutes;
 };
 
 #endif // ELEVATIONGRAPH_H

src/gpx.cpp

@@ -4,12 +4,24 @@
 #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)
 {
-	QFile file(fileName);
 	bool ret;
+	QFile file(fileName);
+
 
-	_tracks.clear();
 	_error.clear();
 	_errorLine = 0;
 
@@ -18,11 +30,18 @@ bool GPX::loadFile(const QString &fileName)
 		return false;
 	}
 
-	if (!(ret = _parser.loadFile(&file))) {
+	ret = _parser.loadFile(&file);
+	file.close();
+	if (ret == false) {
 		_error = _parser.errorString();
 		_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;
 }

src/gpx.h

@@ -7,27 +7,34 @@
 #include <QString>
 #include "waypoint.h"
 #include "track.h"
+#include "route.h"
 #include "parser.h"
 
 class GPX
 {
 public:
-	GPX() : _parser(_tracks, _waypoints), _errorLine(0) {}
+	GPX();
+	~GPX();
+
 	bool loadFile(const QString &fileName);
 	const QString &errorString() const {return _error;}
 	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:
 	Parser _parser;
 	QString _error;
 	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

src/graphitem.cpp

@@ -0,0 +1,10 @@
+#include <QBrush>
+#include <QPen>
+#include "graphitem.h"
+
+void GraphItem::setColor(const QColor &color)
+{
+	QBrush brush(color, Qt::SolidPattern);
+	QPen pen(brush, 0);
+	setPen(pen);
+}

src/graphitem.h

@@ -0,0 +1,20 @@
+#ifndef GRAPHITEM_H
+#define GRAPHITEM_H
+
+#include <QGraphicsPathItem>
+
+class GraphItem : public QGraphicsPathItem
+{
+public:
+	GraphItem(const QPainterPath &path, QGraphicsItem * parent = 0)
+	  : QGraphicsPathItem(path, parent) {_id = 0;}
+
+	int id() const {return _id;}
+	void setId(int id) {_id = id;}
+	void setColor(const QColor &color);
+
+private:
+	int _id;
+};
+
+#endif // GRAPHITEM_H

src/graphtab.h

@@ -18,6 +18,8 @@ public:
 	virtual void loadGPX(const GPX &gpx) = 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

src/graphview.cpp

@@ -1,4 +1,3 @@
-#include <QGraphicsView>
 #include <QGraphicsSceneMouseEvent>
 #include <QEvent>
 #include <QPaintEngine>
@@ -8,11 +7,13 @@
 #include "slideritem.h"
 #include "sliderinfoitem.h"
 #include "infoitem.h"
+#include "graphitem.h"
 #include "graphview.h"
 
 
 #define MARGIN 10.0
 
+
 void Scene::mousePressEvent(QGraphicsSceneMouseEvent *e)
 {
 	if (e->button() == Qt::LeftButton)
@@ -33,20 +34,17 @@ GraphView::GraphView(QWidget *parent)
 
 	_xAxis = new AxisItem(AxisItem::X);
 	_yAxis = new AxisItem(AxisItem::Y);
-
 	_slider = new SliderItem();
 	_slider->setZValue(2.0);
+	_sliderInfo = new SliderInfoItem(_slider);
+	_sliderInfo->setZValue(2.0);
+	_info = new InfoItem();
 
 	connect(_slider, SIGNAL(positionChanged(const QPointF&)), this,
 	  SLOT(emitSliderPositionChanged(const QPointF&)));
 	connect(_scene, SIGNAL(mouseClicked(const QPointF&)), this,
 	  SLOT(newSliderPosition(const QPointF&)));
 
-	_info = new InfoItem();
-
-	_sliderInfo = new SliderInfoItem(_slider);
-	_sliderInfo->setZValue(2.0);
-
 	_xScale = 1;
 	_yScale = 1;
 	_yOffset = 0;
@@ -63,24 +61,14 @@ GraphView::~GraphView()
 		delete _xAxis;
 	if (_yAxis->scene() != _scene)
 		delete _yAxis;
-
 	if (_slider->scene() != _scene)
 		delete _slider;
-
 	if (_info->scene() != _scene)
 		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()
@@ -117,40 +105,89 @@ void GraphView::setYUnits(const QString &units)
 	createYLabel();
 }
 
-void GraphView::loadData(const QVector<QPointF> &data)
+void GraphView::loadData(const QVector<QPointF> &data, int id)
 {
 	QPainterPath path;
-	QGraphicsPathItem *pi;
+	GraphItem *pi;
 
 
 	if (data.size() < 2)
 		return;
 
-	if (!_graphs.size())
-		_bounds.moveTo(data.at(0));
-
-	updateBounds(data.at(0));
 	path.moveTo(data.at(0).x(), -data.at(0).y());
 	for (int i = 1; i < data.size(); i++) {
 		const QPointF &p = data.at(i);
 		path.lineTo(p.x(), -p.y());
-		updateBounds(p);
 	}
 
-	pi = new QGraphicsPathItem(path);
+	pi = new GraphItem(path);
-	QBrush brush(_palette.color(), Qt::SolidPattern);
+	pi->setId(id);
-	QPen pen(brush, 0);
+	pi->setColor(_palette.color());
-	pi->setPen(pen);
+
-	_scene->addItem(pi);
 	_graphs.append(pi);
+
+	if (!_hide.contains(id)) {
+		_visible.append(pi);
+		_scene->addItem(pi);
+		updateBounds(path);
+	}
+}
+
+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);
+			updateBounds(gi->path());
+		}
+	}
 }
 
 void GraphView::redraw()
 {
-	if (!_graphs.isEmpty())
 	redraw(viewport()->size() - QSizeF(MARGIN, MARGIN));
 }
 
+void GraphView::updateBounds(const QPainterPath &path)
+{
+	QRectF br = path.boundingRect();
+	br.moveTopLeft(QPointF(br.left(), -br.top() - br.height()));
+	_bounds |= br;
+}
+
+QRectF GraphView::graphsBoundingRect() const
+{
+	QRectF rect;
+
+	for (int i = 0; i < _visible.count(); i++)
+		rect |= _visible.at(i)->boundingRect();
+
+	return rect;
+}
+
 void GraphView::redraw(const QSizeF &size)
 {
 	QRectF r;
@@ -160,17 +197,19 @@ void GraphView::redraw(const QSizeF &size)
 	qreal xs, ys;
 
 
-	if (_xAxis->scene() == _scene)
+	if (_visible.isEmpty()) {
-		_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);
 	ry = RangeF(_bounds.top() * _yScale + _yOffset, _bounds.bottom() * _yScale
@@ -183,7 +222,7 @@ void GraphView::redraw(const QSizeF &size)
 	mx = _xAxis->margin();
 	my = _yAxis->margin();
 
-	r = _scene->itemsBoundingRect();
+	r = graphsBoundingRect();
 	if (r.height() < _minYRange)
 		r.adjust(0, -(_minYRange/2 - r.height()/2), 0,
 		  _minYRange/2 - r.height()/2);
@@ -193,10 +232,12 @@ void GraphView::redraw(const QSizeF &size)
 	  - _info->boundingRect().height()) / r.height();
 	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)
 		r.adjust(0, -(_minYRange/2 * ys - r.height()/2), 0,
 		  (_minYRange/2) * ys - r.height()/2);
@@ -205,29 +246,20 @@ void GraphView::redraw(const QSizeF &size)
 	_yAxis->setSize(r.height());
 	_xAxis->setPos(r.bottomLeft());
 	_yAxis->setPos(r.bottomLeft());
-	_scene->addItem(_xAxis);
-	_scene->addItem(_yAxis);
 
 	_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->boundingRect().width()/2, -_info->boundingRect().height()));
-	_scene->addItem(_info);
 
 	_scene->setSceneRect(_scene->itemsBoundingRect());
 }
 
 void GraphView::resizeEvent(QResizeEvent *)
 {
-	if (!_graphs.empty())
 	redraw();
 }
 
@@ -249,19 +281,14 @@ void GraphView::plot(QPainter *painter, const QRectF &target)
 
 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();
 	_info->clear();
-	_scene->clear();
+
+	for (int i = 0; i < _graphs.count(); i++)
+		delete _graphs[i];
+
 	_graphs.clear();
+	_visible.clear();
 	_palette.reset();
 
 	_bounds = QRectF();
@@ -301,14 +328,30 @@ static qreal yAtX(const QPainterPath &path, qreal x)
 	return l.pointAt((x - l.p1().x()) / (l.p2().x() - l.p1().x())).y();
 }
 
+void GraphView::updateSliderPosition()
+{
+	if (_bounds.width() <= 0)
+		return;
+
+	if (_sliderPos <= _bounds.right() && _sliderPos >= _bounds.left()) {
+		_slider->setPos((_sliderPos / _bounds.width()) * _slider->area().width(),
+		  _slider->area().bottom());
+		_slider->setVisible(!_visible.isEmpty());
+	} else {
+		_slider->setPos(_slider->area().left(), _slider->area().bottom());
+		_slider->setVisible(false);
+	}
+
+	updateSliderInfo();
+}
+
 void GraphView::updateSliderInfo()
 {
-	_sliderInfo->setVisible(_graphs.size() == 1);
+	_sliderInfo->setVisible(_visible.count() == 1);
-
 	if (!_sliderInfo->isVisible())
 		return;
 
-	const QPainterPath &path = _graphs.at(0)->path();
+	const QPainterPath &path = _visible.first()->path();
 	QRectF br = path.boundingRect();
 	if (br.height() < _minYRange)
 		br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
@@ -329,37 +372,28 @@ void GraphView::updateSliderInfo()
 
 void GraphView::emitSliderPositionChanged(const QPointF &pos)
 {
-	if (_graphs.isEmpty())
+	if (_slider->area().width() <= 0)
 		return;
 
 	_sliderPos = (pos.x() / _slider->area().width()) * _bounds.width();
-	emit sliderPositionChanged(_sliderPos);
+	updateSliderPosition();
 
-	updateSliderInfo();
+	emit sliderPositionChanged(_sliderPos);
 }
 
 void GraphView::setSliderPosition(qreal pos)
 {
-	_sliderPos = pos;
+	if (_visible.isEmpty())
-
-	if (_graphs.isEmpty())
 		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)
 {
-	if (_slider->area().contains(pos)) {
+	if (_slider->area().contains(pos))
 		_slider->setPos(pos);
-		_slider->setVisible(true);
-		emitSliderPositionChanged(pos);
-	}
 }
 
 void GraphView::addInfo(const QString &key, const QString &value)

src/graphview.h

@@ -5,14 +5,15 @@
 #include <QGraphicsScene>
 #include <QVector>
 #include <QList>
+#include <QSet>
 #include <QPointF>
 #include "palette.h"
 
-
 class AxisItem;
 class SliderItem;
 class SliderInfoItem;
 class InfoItem;
+class GraphItem;
 
 class Scene : public QGraphicsScene
 {
@@ -34,12 +35,12 @@ public:
 	GraphView(QWidget *parent = 0);
 	~GraphView();
 
-	void loadData(const QVector<QPointF> &data);
+	void loadData(const QVector<QPointF> &data, int id = 0);
-
+	int count() const {return _graphs.count();}
 	void redraw();
 	void clear();
 
-	int count() const {return _graphs.count();}
+	void showGraph(bool show, int id = 0);
 
 	const QString &xLabel() const {return _xLabel;}
 	const QString &yLabel() const {return _yLabel;}
@@ -70,11 +71,11 @@ signals:
 
 protected:
 	const QRectF &bounds() const {return _bounds;}
-	void resizeEvent(QResizeEvent *);
 	void redraw(const QSizeF &size);
 	void addInfo(const QString &key, const QString &value);
 	void clearInfo();
 	void skipColor() {_palette.color();}
+	void resizeEvent(QResizeEvent *);
 
 private slots:
 	void emitSliderPositionChanged(const QPointF &pos);
@@ -83,8 +84,12 @@ private slots:
 private:
 	void createXLabel();
 	void createYLabel();
-	void updateBounds(const QPointF &point);
+	void updateSliderPosition();
 	void updateSliderInfo();
+	void updateBounds(const QPainterPath &path);
+	QRectF graphsBoundingRect() const;
+	void removeItem(QGraphicsItem *item);
+	void addItem(QGraphicsItem *item);
 
 	qreal _xScale, _yScale;
 	qreal _yOffset;
@@ -101,7 +106,9 @@ private:
 	SliderInfoItem *_sliderInfo;
 	InfoItem *_info;
 
-	QList<QGraphicsPathItem*> _graphs;
+	QList<GraphItem*> _graphs;
+	QList<GraphItem*> _visible;
+	QSet<int> _hide;
 	QRectF _bounds;
 	Palette _palette;
 };

src/gui.cpp

@@ -44,12 +44,12 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	loadMaps();
 	loadPOIs();
 
-	createActions();
-	createMenus();
-	createToolBars();
 	createTrackView();
 	createTrackGraphs();
 	createStatusBar();
+	createActions();
+	createMenus();
+	createToolBars();
 
 	_browser = new FileBrowser(this);
 	_browser->setFilter(QStringList("*.gpx"));
@@ -70,14 +70,18 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	setWindowTitle(APP_NAME);
 	setUnifiedTitleAndToolBarOnMac(true);
 
-	_distance = 0;
-	_time = 0;
 	_trackCount = 0;
+	_routeCount = 0;
+	_waypointCount = 0;
+	_trackDistance = 0;
+	_routeDistance = 0;
+	_time = 0;
 
 	_sliderPos = 0;
 
 	updateGraphTabs();
 	updateTrackView();
+	updateStatusBarInfo();
 
 	readSettings();
 
@@ -189,7 +193,7 @@ void GUI::createActions()
 	  tr("About GPXSee"), this);
 	connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 
-	// File related actions
+	// File actions
 	_openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
 	  tr("Open"), this);
 	_openFileAction->setShortcut(OPEN_SHORTCUT);
@@ -228,8 +232,12 @@ void GUI::createActions()
 	connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
 	_overlapPOIAction = new QAction(tr("Overlap POIs"), this);
 	_overlapPOIAction->setCheckable(true);
-	connect(_overlapPOIAction, SIGNAL(triggered(bool)), this,
+	connect(_overlapPOIAction, SIGNAL(triggered(bool)), _track,
-	  SLOT(overlapPOIs(bool)));
+	  SLOT(setPOIOverlap(bool)));
+	_showPOILabelsAction = new QAction(tr("Show POI labels"), this);
+	_showPOILabelsAction->setCheckable(true);
+	connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _track,
+	  SLOT(showPOILabels(bool)));
 	_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
 	  tr("Show POIs"), this);
 	_showPOIAction->setCheckable(true);
@@ -264,6 +272,28 @@ void GUI::createActions()
 		addAction(_prevMapAction);
 	}
 
+	// Data actions
+	_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)), _track,
+	  SLOT(showWaypoints(bool)));
+	_showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this);
+	_showWaypointLabelsAction->setCheckable(true);
+	connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _track,
+	  SLOT(showWaypointLabels(bool)));
+	_showRouteWaypointsAction = new QAction(tr("Route waypoints"), this);
+	_showRouteWaypointsAction->setCheckable(true);
+	connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _track,
+	  SLOT(showRouteWaypoints(bool)));
+
 	// Settings actions
 	_showGraphsAction = new QAction(tr("Show graphs"), this);
 	_showGraphsAction->setCheckable(true);
@@ -314,53 +344,63 @@ void GUI::createActions()
 
 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
-	_fileMenu->addSeparator();
+	fileMenu->addSeparator();
-	_fileMenu->addAction(_exitAction);
+	fileMenu->addAction(_exitAction);
 #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 *poiMenu = menuBar()->addMenu(tr("POI"));
-	_poiFilesMenu = _poiMenu->addMenu(tr("POI files"));
+	_poiFilesMenu = poiMenu->addMenu(tr("POI files"));
 	_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(_overlapPOIAction);
+	poiMenu->addAction(_showPOILabelsAction);
-	_poiMenu->addSeparator();
+	poiMenu->addAction(_overlapPOIAction);
-	_poiMenu->addAction(_showPOIAction);
+	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->addAction(_showGraphsAction);
+	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()
@@ -429,8 +469,6 @@ void GUI::createStatusBar()
 	statusBar()->addPermanentWidget(_distanceLabel, 1);
 	statusBar()->addPermanentWidget(_timeLabel, 1);
 	statusBar()->setSizeGripEnabled(false);
-
-	updateStatusBarInfo();
 }
 
 void GUI::about()
@@ -554,19 +592,23 @@ bool GUI::loadFile(const QString &fileName)
 		_track->loadGPX(gpx);
 		if (_showPOIAction->isChecked())
 			_track->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)
 				_dateRange.first = date;
 			if (_dateRange.second.isNull() || _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;
 	} else {
@@ -664,7 +706,9 @@ void GUI::plot(QPrinter *printer)
 	QPainter p(printer);
 	TrackInfo info;
 	qreal ih, gh, mh, ratio;
-
+	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
+	qreal d = distance();
+	qreal t = time();
 
 	if (_dateRange.first.isValid()) {
 		if (_dateRange.first == _dateRange.second) {
@@ -675,20 +719,20 @@ void GUI::plot(QPrinter *printer)
 			info.insert(tr("Date"), QString("%1 - %2")
 			  .arg(_dateRange.first.toString(format),
 			  _dateRange.second.toString(format)));
+		}
+	}
+
+	if (_trackCount > 1)
 		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;
@@ -706,8 +750,8 @@ void GUI::plot(QPrinter *printer)
 		  ? 0.15 * r * (printer->height() - ih - 2*mh)
 		  : 0.15 * (printer->height() - ih - 2*mh);
 		gh = qMax(gh, ratio * 150);
-		GraphView *gv = static_cast<GraphView*>(_trackGraphs->currentWidget());
+		GraphTab *gt = static_cast<GraphTab*>(_trackGraphs->currentWidget());
-		gv->plot(&p,  QRectF(0, printer->height() - gh, printer->width(), gh));
+		gt->plot(&p,  QRectF(0, printer->height() - gh, printer->width(), gh));
 	} else
 		gh = 0;
 	_track->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
@@ -716,10 +760,13 @@ void GUI::plot(QPrinter *printer)
 
 void GUI::reloadFile()
 {
-	_distance = 0;
+	_trackCount = 0;
+	_routeCount = 0;
+	_waypointCount = 0;
+	_trackDistance = 0;
+	_routeDistance = 0;
 	_time = 0;
 	_dateRange = DateRange(QDate(), QDate());
-	_trackCount = 0;
 
 	for (int i = 0; i < _tabs.count(); i++)
 		_tabs.at(i)->clear();
@@ -746,10 +793,13 @@ void GUI::reloadFile()
 
 void GUI::closeFiles()
 {
-	_distance = 0;
+	_trackCount = 0;
+	_routeCount = 0;
+	_waypointCount = 0;
+	_trackDistance = 0;
+	_routeDistance = 0;
 	_time = 0;
 	_dateRange = DateRange(QDate(), QDate());
-	_trackCount = 0;
 
 	_sliderPos = 0;
 
@@ -771,11 +821,6 @@ void GUI::closeAll()
 	updateTrackView();
 }
 
-void GUI::overlapPOIs(bool checked)
-{
-	_track->setPOIOverlap(checked);
-}
-
 void GUI::showPOI(bool checked)
 {
 	if (checked)
@@ -841,6 +886,26 @@ void GUI::showFullscreen(bool checked)
 	}
 }
 
+void GUI::showTracks(bool show)
+{
+	_track->showTracks(show);
+
+	for (int i = 0; i < _tabs.size(); i++)
+		_tabs.at(i)->showTracks(show);
+
+	updateStatusBarInfo();
+}
+
+void GUI::showRoutes(bool show)
+{
+	_track->showRoutes(show);
+
+	for (int i = 0; i < _tabs.size(); i++)
+		_tabs.at(i)->showRoutes(show);
+
+	updateStatusBarInfo();
+}
+
 void GUI::clearMapCache()
 {
 	_currentMap->clearCache();
@@ -849,19 +914,25 @@ void GUI::clearMapCache()
 
 void GUI::updateStatusBarInfo()
 {
-	if (_files.count() == 0) {
+	if (_files.count() == 0)
 		_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));
 	else
-		_fileNameLabel->setText(tr("%1 tracks").arg(_trackCount));
+		_fileNameLabel->setText(tr("%1 files").arg(_files.count()));
 
+	qreal d = distance();
 	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
-	_distanceLabel->setText(distance(_distance, units));
+	if (d > 0)
-	_timeLabel->setText(timeSpan(_time));
+		_distanceLabel->setText(::distance(distance(), units));
+	else
+		_distanceLabel->clear();
+
+	qreal t = time();
+	if (t > 0)
+		_timeLabel->setText(::timeSpan(time()));
+	else
+		_timeLabel->clear();
 }
 
 void GUI::updateWindowTitle()
@@ -920,8 +991,8 @@ void GUI::graphChanged(int index)
 	if (index < 0)
 		return;
 
-	GraphView *gv = static_cast<GraphView*>(_trackGraphs->widget(index));
+	GraphTab *gt = static_cast<GraphTab*>(_trackGraphs->widget(index));
-	gv->setSliderPosition(_sliderPos);
+	gt->setSliderPosition(_sliderPos);
 }
 
 void GUI::updateNavigationActions()
@@ -972,7 +1043,8 @@ void GUI::updateGraphTabs()
 
 void GUI::updateTrackView()
 {
-	_track->setHidden(!(_track->trackCount() + _track->waypointCount()));
+	_track->setHidden(!(_track->trackCount() + _track->routeCount()
+	  + _track->waypointCount()));
 }
 
 void GUI::setMetricUnits()
@@ -1106,6 +1178,18 @@ void GUI::writeSettings()
 	}
 	settings.endArray();
 	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()
@@ -1125,15 +1209,13 @@ void GUI::readSettings()
 		_imperialUnitsAction->setChecked(true);
 	} else
 		_metricUnitsAction->setChecked(true);
-	if (settings.value(SHOW_TOOLBARS_SETTING, true).toBool() == false) {
+	if (settings.value(SHOW_TOOLBARS_SETTING, true).toBool() == false)
 		showToolbars(false);
-		_showToolbarsAction->setChecked(false);
+	else
-	} else
 		_showToolbarsAction->setChecked(true);
-	if (settings.value(SHOW_GRAPHS_SETTING, true).toBool() == false) {
+	if (settings.value(SHOW_GRAPHS_SETTING, true).toBool() == false)
 		showGraphs(false);
-		_showGraphsAction->setChecked(false);
+	else
-	} else
 		_showGraphsAction->setChecked(true);
 	settings.endGroup();
 
@@ -1151,11 +1233,14 @@ void GUI::readSettings()
 	settings.endGroup();
 
 	settings.beginGroup(POI_SETTINGS_GROUP);
-	if (settings.value(OVERLAP_POI_SETTING, true).toBool() == false) {
+	if (settings.value(OVERLAP_POI_SETTING, true).toBool() == false)
 		_track->setPOIOverlap(false);
-		_overlapPOIAction->setChecked(false);
+	else
-	} else
 		_overlapPOIAction->setChecked(true);
+	if (settings.value(LABELS_POI_SETTING, true).toBool() == false)
+		_track->showPOILabels(false);
+	else
+		_showPOILabelsAction->setChecked(true);
 	if (settings.value(SHOW_POI_SETTING, false).toBool() == true)
 		_showPOIAction->setChecked(true);
 	for (int i = 0; i < _poiFilesActions.count(); i++)
@@ -1172,6 +1257,33 @@ void GUI::readSettings()
 	}
 	settings.endArray();
 	settings.endGroup();
+
+	settings.beginGroup(DATA_SETTINGS_GROUP);
+	if (settings.value(SHOW_TRACKS_SETTING, true).toBool() == false) {
+		_track->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) {
+		_track->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)
+		_track->showWaypoints(false);
+	else
+		_showWaypointsAction->setChecked(true);
+	if (settings.value(SHOW_WAYPOINT_LABELS_SETTING, true).toBool() == false)
+		_track->showWaypointLabels(false);
+	else
+		_showWaypointLabelsAction->setChecked(true);
+	if (settings.value(SHOW_ROUTE_WAYPOINTS_SETTING, true).toBool() == false)
+		_track->showRouteWaypoints(false);
+	else
+		_showRouteWaypointsAction->setChecked(true);
+	settings.endGroup();
 }
 
 int GUI::mapIndex(const QString &name)
@@ -1182,3 +1294,20 @@ int GUI::mapIndex(const QString &name)
 
 	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;
+}

src/gui.h

@@ -43,12 +43,13 @@ private slots:
 	void reloadFile();
 	void openPOIFile();
 	void closePOIFiles();
-	void overlapPOIs(bool checked);
 	void showPOI(bool checked);
 	void showMap(bool checked);
 	void showGraphs(bool checked);
 	void showToolbars(bool checked);
 	void showFullscreen(bool checked);
+	void showTracks(bool show);
+	void showRoutes(bool show);
 	void clearMapCache();
 	void nextMap();
 	void prevMap();
@@ -57,6 +58,8 @@ private slots:
 	void graphChanged(int);
 	void poiFileChecked(int);
 
+
+
 	void next();
 	void prev();
 	void last();
@@ -97,25 +100,19 @@ private:
 	void keyPressEvent(QKeyEvent *event);
 	void closeEvent(QCloseEvent *event);
 
+	qreal distance();
+	qreal time();
 	int mapIndex(const QString &name);
 	void readSettings();
 	void writeSettings();
 
-	QMenu *_fileMenu;
-	QMenu *_helpMenu;
-	QMenu *_poiMenu;
-	QMenu *_mapMenu;
-	QMenu *_settingsMenu;
-	QMenu *_unitsMenu;
-	QMenu *_poiFilesMenu;
-
 	QToolBar *_fileToolBar;
 	QToolBar *_showToolBar;
 	QToolBar *_navigationToolBar;
-	QTabWidget *_trackGraphs;
+	QMenu *_poiFilesMenu;
+
 	QActionGroup *_fileActionGroup;
 	QActionGroup *_navigationActionGroup;
-
 	QAction *_exitAction;
 	QAction *_keysAction;
 	QAction *_dataSourcesAction;
@@ -130,6 +127,7 @@ private:
 	QAction *_closePOIAction;
 	QAction *_showPOIAction;
 	QAction *_overlapPOIAction;
+	QAction *_showPOILabelsAction;
 	QAction *_showMapAction;
 	QAction *_fullscreenAction;
 	QAction *_clearMapCacheAction;
@@ -143,6 +141,11 @@ private:
 	QAction *_imperialUnitsAction;
 	QAction *_nextMapAction;
 	QAction *_prevMapAction;
+	QAction *_showTracksAction;
+	QAction *_showRoutesAction;
+	QAction *_showWaypointsAction;
+	QAction *_showWaypointLabelsAction;
+	QAction *_showRouteWaypointsAction;
 	QList<QAction*> _mapActions;
 	QList<QAction*> _poiFilesActions;
 
@@ -153,6 +156,7 @@ private:
 	QLabel *_timeLabel;
 
 	TrackView *_track;
+	QTabWidget *_trackGraphs;
 	QList<GraphTab*> _tabs;
 
 	POI _poi;
@@ -163,7 +167,10 @@ private:
 	Map *_currentMap;
 
 	int _trackCount;
-	qreal _distance;
+	int _routeCount;
+	int _waypointCount;
+	qreal _trackDistance;
+	qreal _routeDistance;
 	qreal _time;
 	DateRange _dateRange;
 

src/heartrategraph.cpp

@@ -5,6 +5,7 @@
 HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
+	_showTracks = true;
 
 	GraphView::setYUnits(tr("1/min"));
 	setXLabel(tr("Distance"));
@@ -13,23 +14,23 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 	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)
 {
-	for (int i = 0; i < gpx.trackCount(); i++) {
+	for (int i = 0; i < gpx.tracks().count(); i++) {
-		QVector<QPointF> data;
+		QVector<QPointF> data = gpx.tracks().at(i)->heartRate();
 		qreal sum = 0, w = 0;
 
-		gpx.track(i).heartRateGraph(data);
 		if (data.count() < 2) {
 			skipColor();
 			continue;
@@ -39,13 +40,18 @@ void HeartRateGraph::loadGPX(const GPX &gpx)
 			sum += data.at(j).y() * (data.at(j).x() - data.at(j-1).x());
 			w += data.at(j).x() - data.at(j-1).x();
 		}
-		_avg.append(QPointF(gpx.track(i).distance(), sum/w));
+		_avg.append(QPointF(gpx.tracks().at(i)->distance(), sum/w));
 
 		loadData(data);
 	}
 
+	for (int i = 0; i < gpx.routes().count(); i++)
+		skipColor();
+
 	setXUnits();
-	addInfo();
+	setInfo();
+
+	redraw();
 }
 
 qreal HeartRateGraph::avg() const
@@ -92,8 +98,20 @@ void HeartRateGraph::setXUnits()
 void HeartRateGraph::setUnits(enum Units units)
 {
 	_units = units;
-	setXUnits();
 
-	clearInfo();
+	setXUnits();
-	addInfo();
+	setInfo();
+
+	redraw();
+}
+
+void HeartRateGraph::showTracks(bool show)
+{
+	_showTracks = show;
+
+	showGraph(show);
+	setXUnits();
+	setInfo();
+
+	redraw();
 }

src/heartrategraph.h

@@ -16,15 +16,19 @@ public:
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
+	void showTracks(bool show);
+	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
 	qreal max() const {return bounds().bottom();}
 	void setXUnits();
-	void addInfo();
+	void setInfo();
 
 	QList<QPointF> _avg;
+
 	enum Units _units;
+	bool _showTracks;
 };
 
 #endif // HEARTRATEGRAPH_H

src/parser.cpp

@@ -52,6 +52,30 @@ void Parser::handleWaypointData(DataType type, const QString &value)
 	}
 }
 
+void Parser::handleRoutepointData(DataType type, const QString &value)
+{
+	switch (type) {
+		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::handleTrackpointAttributes(const QXmlStreamAttributes &attr)
 {
 	_track->last().setCoordinates(QPointF(
@@ -59,6 +83,13 @@ void Parser::handleTrackpointAttributes(const QXmlStreamAttributes &attr)
 	  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(
@@ -110,6 +141,24 @@ void Parser::trackpointData()
 	}
 }
 
+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()) {
@@ -122,6 +171,18 @@ void Parser::trackpoints()
 	}
 }
 
+void Parser::routepoints()
+{
+	while (_reader.readNextStartElement()) {
+		if (_reader.name() == "rtept") {
+			_route->append(Waypoint());
+			handleRoutepointAttributes(_reader.attributes());
+			routepointData();
+		} else
+			_reader.skipCurrentElement();
+	}
+}
+
 void Parser::track()
 {
 	while (_reader.readNextStartElement()) {
@@ -157,6 +218,10 @@ void Parser::gpx()
 			_tracks.append(QVector<Trackpoint>());
 			_track = &_tracks.back();
 			track();
+		} else if (_reader.name() == "rte") {
+			_routes.append(QVector<Waypoint>());
+			_route = &_routes.back();
+			routepoints();
 		} else if (_reader.name() == "wpt") {
 			_waypoints.append(Waypoint());
 			handleWaypointAttributes(_reader.attributes());

src/parser.h

@@ -11,8 +11,11 @@
 class Parser
 {
 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);
 	QString errorString() const {return _reader.errorString();}
 	int errorLine() const {return _reader.lineNumber();}
@@ -27,20 +30,26 @@ private:
 	void gpx();
 	void track();
 	void trackpoints();
+	void routepoints();
 	void tpExtension();
 	void extensions();
 	void trackpointData();
+	void routepointData();
 	void waypointData();
 
 	void handleWaypointAttributes(const QXmlStreamAttributes &attr);
 	void handleWaypointData(DataType type, const QString &value);
 	void handleTrackpointAttributes(const QXmlStreamAttributes &attr);
 	void handleTrackpointData(DataType type, const QString &value);
+	void handleRoutepointAttributes(const QXmlStreamAttributes &attr);
+	void handleRoutepointData(DataType type, const QString &value);
 
 	QXmlStreamReader _reader;
 	QList<QVector<Trackpoint> > &_tracks;
+	QList<QVector<Waypoint> > &_routes;
 	QList<Waypoint> &_waypoints;
 	QVector<Trackpoint> *_track;
+	QVector<Waypoint> *_route;
 };
 
 #endif // PARSER_H

src/route.cpp

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

src/route.h

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

src/routeitem.cpp

@@ -0,0 +1,132 @@
+#include <QApplication>
+#include <QPainter>
+#include "ll.h"
+#include "misc.h"
+#include "waypoint.h"
+#include "waypointitem.h"
+#include "tooltip.h"
+#include "routeitem.h"
+
+
+#define ROUTE_WIDTH     3
+
+QString RouteItem::toolTip()
+{
+	ToolTip tt;
+
+	tt.insert(qApp->translate("RouteItem", "Distance"),
+	  ::distance(_distance, _units));
+
+	return tt.toString();
+}
+
+void RouteItem::updateShape()
+{
+	QPainterPathStroker s;
+	s.setWidth(ROUTE_WIDTH * 1.0/scale());
+	_shape = s.createStroke(_path);
+}
+
+RouteItem::RouteItem(const Route &route, QGraphicsItem *parent)
+  : QGraphicsItem(parent)
+{
+	WaypointItem *wi;
+
+	QVector<Waypoint> r = route.route();
+	Q_ASSERT(r.count() >= 2);
+
+	wi = new WaypointItem(r.at(0));
+	wi->setParentItem(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())));
+		wi = new WaypointItem(r.at(i));
+		wi->setParentItem(this);
+	}
+
+	_units = Metric;
+	_distance = route.distance();
+
+	setToolTip(toolTip());
+	setCursor(Qt::ArrowCursor);
+
+	updateShape();
+
+	QBrush brush(Qt::SolidPattern);
+	_pen = QPen(brush, ROUTE_WIDTH, Qt::DotLine);
+
+	_marker = new MarkerItem(this);
+	_marker->setPos(_path.pointAtPercent(0));
+}
+
+void RouteItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	  QWidget *widget)
+{
+	Q_UNUSED(option);
+	Q_UNUSED(widget);
+
+	painter->setPen(_pen);
+	painter->drawPath(_path);
+
+/*
+	painter->setPen(Qt::red);
+	painter->drawRect(boundingRect());
+*/
+}
+
+void RouteItem::setScale(qreal scale)
+{
+	prepareGeometryChange();
+
+	_pen.setWidthF(ROUTE_WIDTH * 1.0/scale);
+	QGraphicsItem::setScale(scale);
+
+	QList<QGraphicsItem *> childs =	childItems();
+	for (int i = 0; i < childs.count(); i++)
+		childs.at(i)->setScale(1.0/scale);
+
+	updateShape();
+}
+
+void RouteItem::setColor(const QColor &color)
+{
+	_pen.setColor(color);
+	update();
+}
+
+void RouteItem::setUnits(enum Units units)
+{
+	_units = units;
+	setToolTip(toolTip());
+}
+
+void RouteItem::moveMarker(qreal distance)
+{
+	if (distance > _distance)
+		_marker->setVisible(false);
+	else {
+		_marker->setVisible(true);
+		_marker->setPos(_path.pointAtPercent(distance / _distance));
+	}
+}
+
+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);
+		}
+	}
+}

src/routeitem.h

@@ -0,0 +1,46 @@
+#ifndef ROUTEITEM_H
+#define ROUTEITEM_H
+
+#include <QGraphicsItem>
+#include "markeritem.h"
+#include "route.h"
+#include "units.h"
+
+
+class RouteItem : public QGraphicsItem
+{
+public:
+	RouteItem(const Route &route, 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 setScale(qreal scale);
+	void setColor(const QColor &color);
+	void setUnits(enum Units units);
+
+	void showMarker(bool show) {_marker->setVisible(show);}
+	void moveMarker(qreal distance);
+
+	void showWaypoints(bool show);
+	void showWaypointLabels(bool show);
+
+private:
+	void updateShape();
+	QString toolTip();
+
+	QPainterPath _path;
+	QPainterPath _shape;
+	QPen _pen;
+
+	MarkerItem *_marker;
+
+	Units _units;
+	qreal _distance;
+};
+
+#endif // ROUTEITEM_H

src/scaleitem.cpp

@@ -78,9 +78,11 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 QString ScaleItem::units() const
 {
 	if (_units == Imperial)
-		return _scale ? QObject::tr("mi") : QObject::tr("ft");
+		return _scale ? qApp->translate("ScaleItem", "mi")
+		  : qApp->translate("ScaleItem", "ft");
 	else
-		return _scale ? QObject::tr("km") : QObject::tr("m");
+		return _scale ? qApp->translate("ScaleItem", "km")
+		  : qApp->translate("ScaleItem", "m");
 }
 
 void ScaleItem::computeScale()

src/settings.h

@@ -16,8 +16,16 @@
 
 #define POI_SETTINGS_GROUP                "POI"
 #define OVERLAP_POI_SETTING               "overlap"
+#define LABELS_POI_SETTING                "labels"
 #define SHOW_POI_SETTING                  "show"
 #define DISABLED_POI_FILE_SETTINGS_PREFIX "disabled"
 #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

src/speedgraph.cpp

@@ -6,6 +6,7 @@
 SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
+	_showTracks = true;
 
 	setYUnits();
 	setXLabel(tr("Distance"));
@@ -14,35 +15,39 @@ SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 	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)
 {
-	for (int i = 0; i < gpx.trackCount(); i++) {
+	for (int i = 0; i < gpx.tracks().count(); i++) {
-		QVector<QPointF> data;
+		QVector<QPointF> data = gpx.tracks().at(i)->speed();
-
-		gpx.track(i).speedGraph(data);
 		if (data.count() < 2) {
 			skipColor();
 			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);
 	}
 
+	for (int i = 0; i < gpx.routes().count(); i++)
+		skipColor();
+
 	setXUnits();
-	addInfo();
+	setInfo();
+
+	redraw();
 }
 
 qreal SpeedGraph::avg() const
@@ -100,9 +105,21 @@ void SpeedGraph::setYUnits()
 void SpeedGraph::setUnits(enum Units units)
 {
 	_units = units;
+
 	setXUnits();
 	setYUnits();
+	setInfo();
 
-	clearInfo();
+	redraw();
-	addInfo();
+}
+
+void SpeedGraph::showTracks(bool show)
+{
+	_showTracks = show;
+
+	showGraph(show);
+	setXUnits();
+	setInfo();
+
+	redraw();
 }

src/speedgraph.h

@@ -17,16 +17,20 @@ public:
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
+	void showTracks(bool show);
+	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
 	qreal max() const {return bounds().bottom();}
 	void setXUnits();
 	void setYUnits();
-	void addInfo();
+	void setInfo();
 
 	QList<QPointF> _avg;
+
 	enum Units _units;
+	bool _showTracks;
 };
 
 #endif // SPEEDGRAPH_H

src/temperaturegraph.cpp

@@ -5,6 +5,7 @@
 TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
+	_showTracks = true;
 
 	setYUnits();
 	setXLabel(tr("Distance"));
@@ -13,25 +14,25 @@ TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
-void TemperatureGraph::addInfo()
+void TemperatureGraph::setInfo()
 {
+	if (_showTracks) {
 		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
 		  + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
 		GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
 		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
-
+	} else
-	redraw();
+		clearInfo();
 }
 
 void TemperatureGraph::loadGPX(const GPX &gpx)
 {
-	for (int i = 0; i < gpx.trackCount(); i++) {
+	for (int i = 0; i < gpx.tracks().count(); i++) {
-		QVector<QPointF> data;
+		QVector<QPointF> data = gpx.tracks().at(i)->temperature();
 		qreal sum = 0, w = 0;
 
-		gpx.track(i).temperatureGraph(data);
 		if (data.count() < 2) {
 			skipColor();
 			continue;
@@ -41,13 +42,18 @@ void TemperatureGraph::loadGPX(const GPX &gpx)
 			sum += data.at(j).y() * (data.at(j).x() - data.at(j-1).x());
 			w += data.at(j).x() - data.at(j-1).x();
 		}
-		_avg.append(QPointF(gpx.track(i).distance(), sum/w));
+		_avg.append(QPointF(gpx.tracks().at(i)->distance(), sum/w));
 
 		loadData(data);
 	}
 
+	for (int i = 0; i < gpx.routes().count(); i++)
+		skipColor();
+
 	setXUnits();
-	addInfo();
+	setInfo();
+
+	redraw();
 }
 
 qreal TemperatureGraph::avg() const
@@ -107,9 +113,21 @@ void TemperatureGraph::setYUnits()
 void TemperatureGraph::setUnits(enum Units units)
 {
 	_units = units;
+
 	setXUnits();
 	setYUnits();
+	setInfo();
 
-	clearInfo();
+	redraw();
-	addInfo();
+}
+
+void TemperatureGraph::showTracks(bool show)
+{
+	_showTracks = show;
+
+	showGraph(show);
+	setXUnits();
+	setInfo();
+
+	redraw();
 }

src/temperaturegraph.h

@@ -16,6 +16,8 @@ public:
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
+	void showTracks(bool show);
+	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
@@ -23,10 +25,12 @@ private:
 	qreal max() const {return bounds().bottom();}
 	void setXUnits();
 	void setYUnits();
-	void addInfo();
+	void setInfo();
 
 	QList<QPointF> _avg;
+
 	enum Units _units;
+	bool _showTracks;
 };
 
 #endif // TEMPERATUREGRAPH_H

src/track.cpp

@@ -84,36 +84,35 @@ Track::Track(const QVector<Trackpoint> &data) : _data(data)
 	qreal dist = 0;
 
 	_dd.append(dist);
-	for (int i = 1; i < _data.count(); i++) {
+	for (int i = 1; i < data.count(); i++) {
-		dist += llDistance(_data.at(i).coordinates(),
+		dist += llDistance(data.at(i).coordinates(), data.at(i-1).coordinates());
-		  _data.at(i-1).coordinates());
 		_dd.append(dist);
 	}
 }
 
-void Track::elevationGraph(QVector<QPointF> &graph) const
+QVector<QPointF> Track::elevation() const
 {
 	QVector<QPointF> raw;
 
 	if (!_data.size())
-		return;
+		return raw;
 
 	for (int i = 0; i < _data.size(); i++)
 		if (_data.at(i).hasElevation())
 			raw.append(QPointF(_dd.at(i), _data.at(i).elevation()
 			  - _data.at(i).geoidHeight()));
 
-	graph = filter(raw, WINDOW_EF);
+	return filter(raw, WINDOW_EF);
 }
 
-void Track::speedGraph(QVector<QPointF> &graph) const
+QVector<QPointF> Track::speed() const
 {
 	qreal v, ds;
 	qint64 dt;
 	QVector<QPointF> raw;
 
 	if (!_data.size())
-		return;
+		return raw;
 
 	raw.append(QPointF(0, 0));
 	for (int i = 1; i < _data.size(); i++) {
@@ -131,52 +130,46 @@ void Track::speedGraph(QVector<QPointF> &graph) const
 		raw.append(QPointF(_dd.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
+QVector<QPointF> Track::heartRate() const
 {
 	QVector<QPointF> raw;
 
 	if (!_data.size())
-		return;
+		return raw;
 
 	for (int i = 0; i < _data.count(); i++)
 		if (_data.at(i).hasHeartRate())
 			raw.append(QPointF(_dd.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
+QVector<QPointF> Track::temperature() const
 {
-	if (!_data.size())
+	QVector<QPointF> graph;
-		return;
 
 	for (int i = 0; i < _data.size(); i++)
 		if (_data.at(i).hasTemperature())
 			graph.append(QPointF(_dd.at(i), _data.at(i).temperature()));
+
+	return graph;
 }
 
-void Track::track(QVector<QPointF> &track) const
+qreal Track::distance() const
 {
-	for (int i = 0; i < _data.size(); i++)
+	return (_dd.isEmpty()) ? 0 : _dd.last();
-		track.append(_data.at(i).coordinates());
 }
 
 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.first().timestamp().msecsTo(_data.last().timestamp())
-	  / 1000.0);
 }
 
 QDateTime Track::date() const
 {
-	if (_data.size())
+	return (_data.size()) ? _data.first().timestamp() : QDateTime();
-		return _data.first().timestamp();
-	else
-		return QDateTime();
 }

src/track.h

@@ -10,21 +10,21 @@ class Track
 public:
 	Track(const QVector<Trackpoint> &data);
 
-	void elevationGraph(QVector<QPointF> &graph) const;
+	const QVector<Trackpoint> &track() const {return _data;}
-	void speedGraph(QVector<QPointF> &graph) const;
+	QVector<QPointF> elevation() const;
-	void heartRateGraph(QVector<QPointF> &graph) const;
+	QVector<QPointF> speed() const;
-	void temperatureGraph(QVector<QPointF> &graph) const;
+	QVector<QPointF> heartRate() const;
-	void track(QVector<QPointF> &track) const;
+	QVector<QPointF> temperature() const;
-	qreal distance() const {return _dd.last();}
+
+	qreal distance() const;
 	qreal time() const;
 	QDateTime date() const;
 
-	bool isNull() const {return (_data.count() < 2) ? true : false;}
+	bool isNull() const {return (_dd.count() < 2);}
 
 private:
 	const QVector<Trackpoint> &_data;
 	QVector<qreal> _dd;
-	qreal _distance;
 };
 
 #endif // TRACK_H

src/trackitem.cpp

@@ -1,6 +1,6 @@
 #include <QApplication>
 #include <QCursor>
-#include <QPen>
+#include <QPainter>
 #include "ll.h"
 #include "misc.h"
 #include "tooltip.h"
@@ -28,23 +28,20 @@ void TrackItem::updateShape()
 {
 	QPainterPathStroker s;
 	s.setWidth(TRACK_WIDTH * 1.0/scale());
-	_shape = s.createStroke(path().simplified());
+	_shape = s.createStroke(_path);
 }
 
 TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
-  : QGraphicsPathItem(parent)
+  : QGraphicsItem(parent)
 {
-	QVector<QPointF> t;
+	const QVector<Trackpoint> &t = track.track();
-	QPainterPath path;
-
-	track.track(t);
 	Q_ASSERT(t.count() >= 2);
 
-	const QPointF &p = t.at(0);
+	const QPointF &p = t.at(0).coordinates();
-	path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
+	_path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
 	for (int i = 1; i < t.size(); i++) {
-		const QPointF &p = t.at(i);
+		const QPointF &p = t.at(i).coordinates();
-		path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
+		_path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
 	}
 
 	_units = Metric;
@@ -52,32 +49,48 @@ TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
 	_distance = track.distance();
 	_time = track.time();
 
-	setPath(path);
 	setToolTip(toolTip());
 	setCursor(Qt::ArrowCursor);
 
 	updateShape();
 
 	QBrush brush(Qt::SolidPattern);
-	QPen pen(brush, TRACK_WIDTH);
+	_pen = QPen(brush, TRACK_WIDTH);
-	setPen(pen);
+
+	_marker = new MarkerItem(this);
+	_marker->setPos(_path.pointAtPercent(0));
+}
+
+void TrackItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	  QWidget *widget)
+{
+	Q_UNUSED(option);
+	Q_UNUSED(widget);
+
+	painter->setPen(_pen);
+	painter->drawPath(_path);
+
+/*
+	painter->setPen(Qt::red);
+	painter->drawRect(boundingRect());
+*/
 }
 
 void TrackItem::setScale(qreal scale)
 {
-	QGraphicsPathItem::setScale(scale);
+	prepareGeometryChange();
-	updateShape();
 
-	QPen p(pen());
+	_pen.setWidthF(TRACK_WIDTH * 1.0/scale);
-	p.setWidthF(TRACK_WIDTH * 1.0/scale);
+	QGraphicsItem::setScale(scale);
-	setPen(p);
+	_marker->setScale(1.0/scale);
+
+	updateShape();
 }
 
 void TrackItem::setColor(const QColor &color)
 {
-	QPen p(pen());
+	_pen.setColor(color);
-	p.setColor(color);
+	update();
-	setPen(p);
 }
 
 void TrackItem::setUnits(enum Units units)
@@ -85,3 +98,13 @@ void TrackItem::setUnits(enum Units units)
 	_units = units;
 	setToolTip(toolTip());
 }
+
+void TrackItem::moveMarker(qreal distance)
+{
+	if (distance > _distance)
+		_marker->setVisible(false);
+	else {
+		_marker->setVisible(true);
+		_marker->setPos(_path.pointAtPercent(distance / _distance));
+	}
+}

src/trackitem.h

@@ -1,27 +1,41 @@
 #ifndef TRACKITEM_H
 #define TRACKITEM_H
 
-#include <QGraphicsPathItem>
+#include <QGraphicsItem>
 #include <QDateTime>
 #include "units.h"
 #include "track.h"
+#include "markeritem.h"
 
-class TrackItem : public QGraphicsPathItem
+
+class TrackItem : public QGraphicsItem
 {
 public:
 	TrackItem(const Track &track, QGraphicsItem *parent = 0);
 
 	QPainterPath shape() const {return _shape;}
-	void setScale(qreal scale);
+	QRectF boundingRect() const {return _shape.boundingRect();}
+	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	  QWidget *widget);
 
+	const QPainterPath &path() const {return _path;}
+
+	void setScale(qreal scale);
 	void setUnits(enum Units units);
 	void setColor(const QColor &color);
 
+	void showMarker(bool show) {_marker->setVisible(show);}
+	void moveMarker(qreal distance);
+
 private:
 	void updateShape();
 	QString toolTip();
 
+	QPainterPath _path;
 	QPainterPath _shape;
+	QPen _pen;
+
+	MarkerItem *_marker;
 
 	Units _units;
 	QDateTime _date;

src/trackview.cpp

@@ -7,8 +7,8 @@
 #include "gpx.h"
 #include "map.h"
 #include "trackitem.h"
+#include "routeitem.h"
 #include "waypointitem.h"
-#include "markeritem.h"
 #include "scaleitem.h"
 #include "trackview.h"
 
@@ -34,12 +34,19 @@ TrackView::TrackView(QWidget *parent)
 	_zoom = ZOOM_MAX;
 	_scale = mapScale(_zoom);
 	_map = 0;
-	_maxPath = 0;
+
-	_maxDistance = 0;
+	_units = Metric;
+
+	_showTracks = true;
+	_showRoutes = true;
+	_showWaypoints = true;
+	_showWaypointLabels = true;
+	_showPOILabels = true;
+	_overlapPOIs = true;
+	_showRouteWaypoints = true;
 
 	_plot = false;
-	_units = Metric;
+	_markerPos = 0;
-	_overlap = true;
 }
 
 TrackView::~TrackView()
@@ -55,21 +62,35 @@ void TrackView::addTrack(const Track &track)
 		return;
 	}
 
-	TrackItem *pi = new TrackItem(track);
+	TrackItem *ti = new TrackItem(track);
-	_paths.append(pi);
+	_tracks.append(ti);
 	_zoom = qMin(_zoom, scale2zoom(trackScale()));
 	_scale = mapScale(_zoom);
-	pi->setScale(1.0/_scale);
+	ti->setScale(1.0/_scale);
-	pi->setColor(_palette.color());
+	ti->setColor(_palette.color());
-	_scene->addItem(pi);
+	ti->setVisible(_showTracks);
+	ti->moveMarker(_markerPos);
+	_scene->addItem(ti);
+}
 
-	MarkerItem *mi = new MarkerItem(pi);
+void TrackView::addRoute(const Route &route)
-	_markers.append(mi);
+{
-	mi->setPos(pi->path().pointAtPercent(0));
+	if (route.isNull()) {
-	mi->setScale(_scale);
+		_palette.color();
+		return;
+	}
 
-	_maxPath = qMax(pi->path().length(), _maxPath);
+	RouteItem *ri = new RouteItem(route);
-	_maxDistance = qMax(track.distance(), _maxDistance);
+	_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);
+	ri->moveMarker(_markerPos);
+	_scene->addItem(ri);
 }
 
 void TrackView::addWaypoints(const QList<Waypoint> &waypoints)
@@ -80,6 +101,8 @@ void TrackView::addWaypoints(const QList<Waypoint> &waypoints)
 		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);
@@ -93,18 +116,22 @@ void TrackView::loadGPX(const GPX &gpx)
 {
 	int zoom = _zoom;
 
-	for (int i = 0; i < gpx.trackCount(); i++)
+	for (int i = 0; i < gpx.tracks().count(); i++)
-		addTrack(gpx.track(i));
+		addTrack(*(gpx.tracks().at(i)));
+	for (int i = 0; i < gpx.routes().count(); i++)
+		addRoute(*(gpx.routes().at(i)));
 	addWaypoints(gpx.waypoints());
 
-	if (_paths.empty() && _waypoints.empty())
+	if (_tracks.empty() && _routes.empty() && _waypoints.empty())
 		return;
 
-	if ((_paths.size() > 1 && _zoom < zoom)
+	if ((_tracks.size() > 1 && _zoom < zoom)
+	  || (_routes.size() > 1 && _zoom < zoom)
 	  || (_waypoints.size() && _zoom < zoom))
 		rescale(_scale);
 
-	QRectF br = trackBoundingRect() | waypointBoundingRect();
+	QRectF br = trackBoundingRect() | routeBoundingRect()
+	  | waypointBoundingRect();
 	QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
 	_scene->setSceneRect(ba);
 	centerOn(ba.center());
@@ -117,12 +144,24 @@ void TrackView::loadGPX(const GPX &gpx)
 
 QRectF TrackView::trackBoundingRect() const
 {
-	if (_paths.empty())
+	if (_tracks.empty())
 		return QRectF();
 
-	QRectF br = _paths.at(0)->sceneBoundingRect();
+	QRectF br = _tracks.at(0)->sceneBoundingRect();
-	for (int i = 1; i < _paths.size(); i++)
+	for (int i = 1; i < _tracks.size(); i++)
-		br |= _paths.at(i)->sceneBoundingRect();
+		br |= _tracks.at(i)->sceneBoundingRect();
+
+	return br;
+}
+
+QRectF TrackView::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;
 }
@@ -153,13 +192,29 @@ QRectF TrackView::waypointBoundingRect() const
 
 qreal TrackView::trackScale() const
 {
-	if (_paths.empty())
+	if (_tracks.empty())
 		return mapScale(ZOOM_MAX);
 
-	QRectF br = _paths.at(0)->path().boundingRect();
+	QRectF br = _tracks.at(0)->path().boundingRect();
 
-	for (int i = 1; i < _paths.size(); i++)
+	for (int i = 1; i < _tracks.size(); i++)
-		br |= _paths.at(i)->path().boundingRect();
+		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 TrackView::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));
@@ -215,10 +270,11 @@ void TrackView::checkPOIOverlap()
 
 void TrackView::rescale(qreal scale)
 {
-	for (int i = 0; i < _paths.size(); i++) {
+	for (int i = 0; i < _tracks.size(); i++)
-		_markers.at(i)->setScale(scale);
+		_tracks.at(i)->setScale(1.0/scale);
-		_paths.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);
@@ -229,7 +285,7 @@ void TrackView::rescale(qreal scale)
 		it.value()->show();
 	}
 
-	if (!_overlap)
+	if (!_overlapPOIs)
 		checkPOIOverlap();
 
 	_scale = scale;
@@ -246,6 +302,7 @@ void TrackView::addPOI(const QVector<Waypoint> &waypoints)
 		WaypointItem *pi = new WaypointItem(w);
 		pi->setScale(1.0/_scale);
 		pi->setZValue(1);
+		pi->showLabel(_showPOILabels);
 		_scene->addItem(pi);
 
 		_pois.insert(w, pi);
@@ -254,14 +311,16 @@ void TrackView::addPOI(const QVector<Waypoint> &waypoints)
 
 void TrackView::loadPOI(const POI &poi)
 {
-	if (!_paths.size() && !_waypoints.size())
+	if (!_tracks.size() && !_routes.size() && !_waypoints.size())
 		return;
 
-	for (int i = 0; i < _paths.size(); i++)
+	for (int i = 0; i < _tracks.size(); i++)
-		addPOI(poi.points(_paths.at(i)->path()));
+		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 (!_overlap)
+	if (!_overlapPOIs)
 		checkPOIOverlap();
 }
 
@@ -280,9 +339,10 @@ void TrackView::setUnits(enum Units units)
 
 	_mapScale->setUnits(units);
 
-	for (int i = 0; i < _paths.count(); i++)
+	for (int i = 0; i < _tracks.count(); i++)
-		_paths[i]->setUnits(units);
+		_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);
 
@@ -298,21 +358,24 @@ void TrackView::redraw()
 
 void TrackView::rescale()
 {
-	_zoom = qMin(scale2zoom(trackScale()), scale2zoom(waypointScale()));
+	_zoom = qMin(qMin(scale2zoom(trackScale()), scale2zoom(routeScale())),
+	  scale2zoom(waypointScale()));
+
 	rescale(mapScale(_zoom));
 	_mapScale->setZoom(_zoom);
 }
 
 void TrackView::zoom(int z, const QPointF &pos)
 {
-	if (_paths.isEmpty() && _waypoints.isEmpty())
+	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
 		return;
 
 	qreal scale = _scale;
 	_zoom = z;
 
 	rescale(mapScale(_zoom));
-	QRectF br = trackBoundingRect() | waypointBoundingRect();
+	QRectF br = trackBoundingRect() | routeBoundingRect()
+	  | waypointBoundingRect();
 	QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
 	_scene->setSceneRect(ba);
 
@@ -329,7 +392,7 @@ void TrackView::zoom(int z, const QPointF &pos)
 
 void TrackView::wheelEvent(QWheelEvent *event)
 {
-	if (_paths.isEmpty() && _waypoints.isEmpty())
+	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
 		return;
 
 	QPointF pos = mapToScene(event->pos());
@@ -406,41 +469,90 @@ void TrackView::clear()
 		_scene->removeItem(_mapScale);
 
 	_pois.clear();
-	_paths.clear();
+	_tracks.clear();
+	_routes.clear();
 	_waypoints.clear();
-	_markers.clear();
 	_scene->clear();
 	_palette.reset();
 
-	_maxPath = 0;
-	_maxDistance = 0;
 	_zoom = ZOOM_MAX;
 	_scale = mapScale(_zoom);
 
 	_scene->setSceneRect(QRectF());
+
+	_markerPos = 0;
 }
 
 void TrackView::movePositionMarker(qreal val)
 {
-	qreal mp = val / _maxDistance;
+	_markerPos = val;
 
-	for (int i = 0; i < _paths.size(); i++) {
+	for (int i = 0; i < _tracks.size(); i++)
-		qreal f = _maxPath / _paths.at(i)->path().length();
+		_tracks.at(i)->moveMarker(val);
-		if (mp * f < 0 || mp * f > 1.0)
+
-			_markers.at(i)->setVisible(false);
+	for (int i = 0; i < _routes.size(); i++)
-		else {
+		_routes.at(i)->moveMarker(val);
-			QPointF pos = _paths.at(i)->path().pointAtPercent(mp * f);
-			_markers.at(i)->setPos(pos);
-			_markers.at(i)->setVisible(true);
 }
+
+void TrackView::showTracks(bool show)
+{
+	_showTracks = show;
+
+	for (int i = 0; i < _tracks.count(); i++)
+		_tracks.at(i)->setVisible(show);
 }
+
+void TrackView::showRoutes(bool show)
+{
+	_showRoutes = show;
+
+	for (int i = 0; i < _routes.count(); i++)
+		_routes.at(i)->setVisible(show);
+}
+
+void TrackView::showWaypoints(bool show)
+{
+	_showWaypoints = show;
+
+	for (int i = 0; i < _waypoints.count(); i++)
+		_waypoints.at(i)->setVisible(show);
+}
+
+void TrackView::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 TrackView::showRouteWaypoints(bool show)
+{
+	_showRouteWaypoints = show;
+
+	for (int i = 0; i < _routes.size(); i++)
+		_routes.at(i)->showWaypoints(show);
+}
+
+void TrackView::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 TrackView::setPOIOverlap(bool overlap)
 {
-	_overlap = overlap;
+	_overlapPOIs = overlap;
 
-	if (_overlap) {
+	if (_overlapPOIs) {
 		QHash<Waypoint, WaypointItem*>::const_iterator it;
 		for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
 			it.value()->show();
@@ -450,7 +562,8 @@ void TrackView::setPOIOverlap(bool overlap)
 
 void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
 {
-	if ((_paths.isEmpty() && _waypoints.isEmpty()) || !_map) {
+	if ((_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
+	  || !_map) {
 		painter->fillRect(rect, Qt::white);
 		return;
 	}
@@ -481,12 +594,13 @@ void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
 
 void TrackView::resizeEvent(QResizeEvent *e)
 {
-	if (_paths.isEmpty() && _waypoints.isEmpty())
+	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
 		return;
 
 	rescale();
 
-	QRectF br = trackBoundingRect() | waypointBoundingRect();
+	QRectF br = trackBoundingRect() | routeBoundingRect()
+	  | waypointBoundingRect();
 	QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
 
 	if (ba.width() < e->size().width()) {

src/trackview.h

@@ -13,9 +13,10 @@ class GPX;
 class POI;
 class Map;
 class Track;
+class Route;
 class TrackItem;
+class RouteItem;
 class WaypointItem;
-class MarkerItem;
 class ScaleItem;
 
 class TrackView : public QGraphicsView
@@ -34,25 +35,36 @@ public:
 
 	void setMap(Map *map);
 	void setUnits(enum Units units);
-	void setPOIOverlap(bool overlap);
 
 	void plot(QPainter *painter, const QRectF &target);
 
-	int trackCount() const {return _paths.count();}
+	int trackCount() const {return _tracks.count();}
+	int routeCount() const {return _routes.count();}
 	int waypointCount() const {return _waypoints.count();}
 
 public slots:
 	void movePositionMarker(qreal val);
 	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:
 	void addTrack(const Track &track);
+	void addRoute(const Route &route);
 	void addWaypoints(const QList<Waypoint> &waypoints);
 	void addPOI(const QVector<Waypoint> &waypoints);
 
 	QRectF trackBoundingRect() const;
+	QRectF routeBoundingRect() const;
 	QRectF waypointBoundingRect() const;
 	qreal trackScale() const;
+	qreal routeScale() const;
 	qreal waypointScale() const;
 	qreal mapScale(int zoom) const;
 	void rescale(qreal scale);
@@ -67,8 +79,8 @@ private:
 	void paintEvent(QPaintEvent *e);
 
 	QGraphicsScene *_scene;
-	QList<TrackItem*> _paths;
+	QList<TrackItem*> _tracks;
-	QList<MarkerItem*> _markers;
+	QList<RouteItem*> _routes;
 	QList<WaypointItem*> _waypoints;
 	QHash<Waypoint, WaypointItem*> _pois;
 
@@ -76,14 +88,22 @@ private:
 	ScaleItem *_mapScale;
 
 	Palette _palette;
-	qreal _maxPath, _maxDistance;
 
 	qreal _scale;
 	int _zoom;
 
 	Units _units;
-	bool _overlap;
+
+	bool _showTracks;
+	bool _showRoutes;
+	bool _showWaypoints;
+	bool _showWaypointLabels;
+	bool _showPOILabels;
+	bool _overlapPOIs;
+	bool _showRouteWaypoints;
+
 	bool _plot;
+	qreal _markerPos;
 };
 
 #endif // TRACKVIEW_H

src/waypoint.h

@@ -31,6 +31,8 @@ public:
 	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
 	  {return this->_name == other._name
 	  && this->_coordinates == other._coordinates;}

src/waypointitem.cpp

@@ -13,6 +13,8 @@ QString WaypointItem::toolTip()
 {
 	ToolTip tt;
 
+	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()))
@@ -32,6 +34,7 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, QGraphicsItem *parent)
   : QGraphicsItem(parent)
 {
 	_units = Metric;
+	_showLabel = true;
 
 	_waypoint = waypoint;
 	_coordinates = ll2mercator(QPointF(waypoint.coordinates().x(),
@@ -46,6 +49,7 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, QGraphicsItem *parent)
 
 void WaypointItem::updateBoundingRect()
 {
+	if (_showLabel) {
 		QFont font;
 		font.setPixelSize(FONT_SIZE);
 		font.setFamily(FONT_FAMILY);
@@ -54,6 +58,9 @@ void WaypointItem::updateBoundingRect()
 
 		_boundingRect = QRectF(-POINT_SIZE/2, -POINT_SIZE/2, ts.width()
 		  + POINT_SIZE, ts.height() + fm.descent() + POINT_SIZE);
+	} else
+		_boundingRect = QRectF(-POINT_SIZE/2, -POINT_SIZE/2, POINT_SIZE,
+		  POINT_SIZE);
 }
 
 void WaypointItem::paint(QPainter *painter,
@@ -61,6 +68,8 @@ void WaypointItem::paint(QPainter *painter,
 {
 	Q_UNUSED(option);
 	Q_UNUSED(widget);
+
+	if (_showLabel) {
 		QFont font;
 		font.setPixelSize(FONT_SIZE);
 		font.setFamily(FONT_FAMILY);
@@ -68,8 +77,10 @@ void WaypointItem::paint(QPainter *painter,
 		QRect ts = fm.tightBoundingRect(_waypoint.name());
 
 		painter->setFont(font);
-	painter->drawText(POINT_SIZE/2 - qMax(ts.x(), 0), POINT_SIZE/2 + ts.height(),
+		painter->drawText(POINT_SIZE/2 - qMax(ts.x(), 0), POINT_SIZE/2
-	  _waypoint.name());
+		  + ts.height(), _waypoint.name());
+	}
+
 	painter->setBrush(Qt::SolidPattern);
 	painter->drawEllipse(-POINT_SIZE/2, -POINT_SIZE/2, POINT_SIZE, POINT_SIZE);
 
@@ -90,3 +101,11 @@ void WaypointItem::setUnits(enum Units units)
 	_units = units;
 	setToolTip(toolTip());
 }
+
+void WaypointItem::showLabel(bool show)
+{
+	prepareGeometryChange();
+	_showLabel = show;
+	updateBoundingRect();
+	setToolTip(toolTip());
+}

src/waypointitem.h

@@ -15,6 +15,7 @@ public:
 
 	void setUnits(enum Units units);
 	void setScale(qreal scale);
+	void showLabel(bool show);
 
 	QRectF boundingRect() const {return _boundingRect;}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@@ -28,6 +29,7 @@ private:
 	QPointF _coordinates;
 	Waypoint _waypoint;
 	Units _units;
+	bool _showLabel;
 };
 
 #endif // WAYPOINTITEM_H