Merge branch 'origin/master' into Weblate.

Currently translated at 100.0% (374 of 374 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/

.appveyor.yml

@@ -1,22 +1,33 @@
-version: 7.11.{build}
-configuration: Release
-platform: Any CPU
+version: 7.33.{build}
+
+configuration:
+  - Release
+
+image:
+  - Visual Studio 2017
+
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   matrix:
-  - QTDIR: C:\Qt\5.11\msvc2015
-    PLATFORM: x86
+  - QTDIR: C:\Qt\5.13\msvc2017
     NSI: gpxsee.nsi
-    OPENSSLDIR: C:\OpenSSL-Win32\bin
-  - QTDIR: C:\Qt\5.11\msvc2015_64
-    PLATFORM: x86_amd64
+    VCVARS: vcvars32.bat
+    OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
+    LIBCRYPTO: libssl-1_1.dll
+    LIBSSL: libcrypto-1_1.dll
+  - QTDIR: C:\Qt\5.13\msvc2017_64
     NSI: gpxsee64.nsi
-    OPENSSLDIR: C:\OpenSSL-Win64\bin
+    VCVARS: vcvars64.bat
+    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
+    LIBCRYPTO: libssl-1_1-x64.dll
+    LIBSSL: libcrypto-1_1-x64.dll    
+
 install:
 - cmd: >-
     set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
 
-    call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\"%VCVARS%
+
 build_script:
 - cmd: >-
     lrelease gpxsee.pro
@@ -44,9 +55,9 @@ build_script:
 
     copy licence.txt installer
 
-    copy %OPENSSLDIR%\libeay32.dll installer
+    copy %OPENSSLDIR%\%LIBCRYPTO% installer
 
-    copy %OPENSSLDIR%\ssleay32.dll installer
+    copy %OPENSSLDIR%\%LIBSSL% installer
 
 
     makensis.exe installer\%NSI%

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: tumic0

.travis.yml

@@ -6,10 +6,11 @@ os:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev libqt4-opengl-dev; fi
 
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi

README.md

@@ -2,9 +2,9 @@
 GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.
 
 ## Features
-* Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin CSV and geotagged JPEG files.
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
-* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG & JNX maps, TwoNav RMaps, GeoTIFF images).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.11
+VERSION = 7.33
 
 QT += core \
     gui \
@@ -19,6 +19,11 @@ equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
 
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
+    src/GUI/graphicsscene.h \
+    src/GUI/mapaction.h \
+    src/GUI/marginswidget.h \
+    src/GUI/popup.h \
+    src/common/garmin.h \
     src/common/staticassert.h \
     src/common/coordinates.h \
     src/common/range.h \
@@ -49,7 +54,6 @@ HEADERS += src/common/config.h \
     src/GUI/palette.h \
     src/GUI/heartrategraph.h \
     src/GUI/trackinfo.h \
-    src/GUI/exportdialog.h \
     src/GUI/fileselectwidget.h \
     src/GUI/margins.h \
     src/GUI/temperaturegraph.h \
@@ -84,7 +88,16 @@ HEADERS += src/common/config.h \
     src/GUI/mapview.h \
     src/GUI/font.h \
     src/GUI/areaitem.h \
+    src/data/link.h \
     src/map/IMG/bitmapline.h \
+    src/map/IMG/bitstream.h \
+    src/map/IMG/deltastream.h \
+    src/map/IMG/gmap.h \
+    src/map/IMG/huffmanstream.h \
+    src/map/IMG/huffmantable.h \
+    src/map/IMG/nodfile.h \
+    src/map/IMG/mapdata.h \
+    src/map/IMG/rastertile.h \
     src/map/IMG/textpathitem.h \
     src/map/IMG/textpointitem.h \
     src/map/projection.h \
@@ -175,14 +188,22 @@ HEADERS += src/common/config.h \
     src/map/IMG/lblfile.h \
     src/map/IMG/vectortile.h \
     src/map/IMG/subdiv.h \
-    src/map/IMG/units.h \
     src/map/IMG/style.h \
     src/map/IMG/netfile.h \
     src/GUI/limitedcombobox.h \
     src/GUI/pathtickitem.h \
     src/map/IMG/textitem.h \
-    src/map/IMG/label.h
+    src/map/IMG/label.h \
+    src/data/csv.h \
+    src/data/cupparser.h \
+    src/data/gpiparser.h \
+    src/data/address.h \
+    src/data/smlparser.h \
+    src/GUI/pdfexportdialog.h \
+    src/GUI/pngexportdialog.h
 SOURCES += src/main.cpp \
+    src/GUI/marginswidget.cpp \
+    src/GUI/popup.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
@@ -206,7 +227,6 @@ SOURCES += src/main.cpp \
     src/GUI/palette.cpp \
     src/GUI/heartrategraph.cpp \
     src/GUI/trackinfo.cpp \
-    src/GUI/exportdialog.cpp \
     src/GUI/fileselectwidget.cpp \
     src/GUI/temperaturegraph.cpp \
     src/GUI/trackitem.cpp \
@@ -233,7 +253,16 @@ SOURCES += src/main.cpp \
     src/GUI/gearratiographitem.cpp \
     src/GUI/mapview.cpp \
     src/GUI/areaitem.cpp \
+    src/data/waypoint.cpp \
     src/map/IMG/bitmapline.cpp \
+    src/map/IMG/bitstream.cpp \
+    src/map/IMG/deltastream.cpp \
+    src/map/IMG/gmap.cpp \
+    src/map/IMG/huffmanstream.cpp \
+    src/map/IMG/huffmantable.cpp \
+    src/map/IMG/nodfile.cpp \
+    src/map/IMG/mapdata.cpp \
+    src/map/IMG/rastertile.cpp \
     src/map/IMG/textpathitem.cpp \
     src/map/IMG/textpointitem.cpp \
     src/map/maplist.cpp \
@@ -312,12 +341,22 @@ SOURCES += src/main.cpp \
     src/map/IMG/style.cpp \
     src/map/IMG/netfile.cpp \
     src/GUI/pathtickitem.cpp \
-    src/map/IMG/textitem.cpp
+    src/map/IMG/textitem.cpp \
+    src/data/csv.cpp \
+    src/data/cupparser.cpp \
+    src/GUI/graphicsscene.cpp \
+    src/data/gpiparser.cpp \
+    src/data/smlparser.cpp \
+    src/GUI/pdfexportdialog.cpp \
+    src/GUI/pngexportdialog.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     HEADERS += src/data/geojsonparser.h
     SOURCES += src/data/geojsonparser.cpp
 }
+equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4) {
+    HEADERS += src/GUI/timezoneinfo.h
+}
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     QT_NO_DEPRECATED_WARNINGS
@@ -336,10 +375,13 @@ TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_da.ts \
     lang/gpxsee_tr.ts \
     lang/gpxsee_es.ts \
-    lang/gpxsee_pt_BR.ts
+    lang/gpxsee_pt_BR.ts \
+    lang/gpxsee_uk.ts \
+    lang/gpxsee_hu.ts \
+    lang/gpxsee_it.ts
 
 macx {
-    ICON = icons/gpxsee.icns
+    ICON = icons/app/gpxsee.icns
     QMAKE_INFO_PLIST = pkg/Info.plist
     locale.path = Contents/Resources/translations
     locale.files = lang/gpxsee_en.qm \
@@ -354,7 +396,10 @@ macx {
         lang/gpxsee_da.qm \
         lang/gpxsee_tr.qm \
         lang/gpxsee_es.qm \
-        lang/gpxsee_pt_BR.qm
+        lang/gpxsee_pt_BR.qm \
+        lang/gpxsee_uk.qm \
+        lang/gpxsee_hu.qm \
+        lang/gpxsee_it.qm
     csv.path = Contents/Resources
     csv.files = pkg/csv
     maps.path = Contents/Resources
@@ -371,12 +416,15 @@ macx {
         icons/formats/wpt.icns \
         icons/formats/loc.icns \
         icons/formats/slf.icns \
-        icons/formats/json.icns
+        icons/formats/json.icns \
+        icons/formats/cup.icns \
+        icons/formats/gpi.icns \
+        icons/formats/sml.icns
     QMAKE_BUNDLE_DATA += locale maps icons csv
 }
 
 win32 {
-    RC_ICONS = icons/gpxsee.ico \
+    RC_ICONS = icons/app/gpxsee.ico \
         icons/formats/gpx.ico \
         icons/formats/tcx.ico \
         icons/formats/kml.ico \
@@ -388,7 +436,10 @@ win32 {
         icons/formats/wpt.ico \
         icons/formats/loc.ico \
         icons/formats/slf.ico \
-        icons/formats/json.ico
+        icons/formats/json.ico \
+        icons/formats/cup.ico \
+        icons/formats/gpi.ico \
+        icons/formats/sml.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }
@@ -403,8 +454,8 @@ unix:!macx {
     csv.path = $$PREFIX/share/gpxsee/csv
     locale.files = lang/*.qm
     locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = icons/gpxsee.png
-    icon.path = $$PREFIX/share/pixmaps
+    icon.files = icons/app/hicolor/*
+    icon.path = $$PREFIX/share/icons/hicolor
     desktop.files = pkg/gpxsee.desktop
     desktop.path = $$PREFIX/share/applications
     mime.files = pkg/gpxsee.xml

gpxsee.qrc

@@ -1,8 +1,8 @@
 <RCC>
 	<qresource prefix="/">
 		<!-- GUI -->
-		<file alias="gpxsee.png">icons/gpxsee.png</file>
-		<file alias="gpxsee@2x.png">icons/gpxsee@2x.png</file>
+		<file alias="gpxsee.png">icons/app/gpxsee.png</file>
+		<file alias="gpxsee@2x.png">icons/app/gpxsee@2x.png</file>
 		<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
 		<file alias="dialog-close@2x.png">icons/GUI/dialog-close@2x.png</file>
 		<file alias="document-open.png">icons/GUI/document-open.png</file>

icons/app/hicolor/scalable/gpxsee.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">
+<svg width="6cm" height="6cm" viewBox="47 79 119 119" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g>
+    <rect style="fill: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+    <rect style="fill: none; fill-opacity:0; stroke-width: 2.35099e-37; stroke-linejoin: round; stroke: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke-linejoin: round; stroke: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+  </g>
+  <polyline style="fill: none; fill-opacity:0; stroke-width: 4; stroke: #000000" points="61.5289,182.479 73.5,125.854 96,151.875 113,90.875 136.5,172.375 151.658,157.199 "/>
+  <g>
+    <ellipse style="fill: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+  </g>
+</svg>

icons/formats/scripts/extensions

@@ -10,3 +10,6 @@ tcx:#ffcc00
 wpt:#66ff00
 loc:#556677
 slf:#881199
+cup:#20a810
+gpi:#fca314
+sml:#6434eb

lang/gpxsee_en.ts

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>GUI</name>
+    <message numerus="yes">
+        <location filename="../src/GUI/gui.cpp" line="1392"/>
+        <source>%n files</source>
+        <translation>
+            <numerusform>%n file</numerusform>
+            <numerusform>%n files</numerusform>
+        </translation>
+    </message>
+</context>
 </TS>

pkg/Info.plist

@@ -211,6 +211,54 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>cup</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.naviter.seeyou.cup</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/cup.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>SeeYou CUP File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>gpi</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.garmin.gpi</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/gpi.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Garmin POI File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sml</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/sml+xml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/sml.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Suunto Markup Language</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -467,6 +515,69 @@
 				<string>application/geo+json</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.naviter.seeyou.cup</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.naviter.com</string>
+			<key>UTTypeDescription</key>
+			<string>SeeYou CUP File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>cup</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.naviter.seeyou.cup</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.garmin.gpi</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.garmin.com</string>
+			<key>UTTypeDescription</key>
+			<string>Garmin POI File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>gpi</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.garmin.gpi</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.suunto.sml</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.suunto.com</string>
+			<key>UTTypeDescription</key>
+			<string>Suunto Markup Language</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>sml</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/sml+xml</string>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>

pkg/appdata.xml

@@ -12,16 +12,18 @@
 
 		<p>Features:</p>
 		<ul>
-			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT,
-				WPT, RTE), GeoJSON, Garmin CSV and geotagged JPEG files.</li>
+			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SIGMA SLF, Suunto SML, LOC,
+				OziExplorer (PLT, WPT, RTE), GeoJSON, SeeYou CUP,
+				Garmin GPI &amp; CSV and geotagged JPEG files.</li>
 			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
-				WMS, TMS).</li>
+				WMS, TMS, QuadTiles).</li>
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
 				TwoNav RMaps, Garmin IMG &amp; JNX, GeoTIFF images).</li>
-			<li>Elevation, speed, heart rate, cadence, power and temperature
-				graphs.</li>
+			<li>Elevation, speed, heart rate, cadence, power, temperature and
+				gear ratio graphs.</li>
 			<li>Support for multiple tracks in one view.</li>
 			<li>Support for POI files.</li>
+			<li>Support for DEM files (SRTM HGT).</li>
 			<li>Print/export to PDF.</li>
 			<li>Full-screen mode.</li>
 			<li>HiDPI/Retina displays &amp; maps support.</li>
@@ -67,5 +69,8 @@
 		<mimetype>application/loc+xml</mimetype>
 		<mimetype>application/slf+xml</mimetype>
 		<mimetype>application/geo+json</mimetype>
+		<mimetype>application/vnd.naviter.seeyou.cup</mimetype>
+		<mimetype>application/vnd.garmin.gpi</mimetype>
+		<mimetype>application/sml+xml</mimetype>
 	</mimetypes>
 </component>

pkg/gpxsee.desktop

@@ -3,12 +3,16 @@ Name=GPXSee
 Comment=GPS log file viewer and analyzer
 Comment[cz]=Prohlížeč a analyzátor GPS logů
 Comment[fi]=Ohjelma GPS-lokien katseluun ja analysointiin
+Comment[fr]=Visualisation et analyse de fichier GPS
+Comment[nb]=GPS-loggfilleser og analysator
 Comment[pl]=Przeglądarka i analizator plików dziennika GPS
 Comment[ru]=Программа для просмотра и анализа GPS логов
 Comment[sv]=GPS-loggfilsläsare och analysator
+Comment[tr]=GPS günlük dosyası görüntüleyici ve analizcisi
+Comment[uk]=Переглядач та аналізатор GPS логів
 Exec=gpxsee %F
 Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/sml+xml;

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.11"
+!define VERSION "7.33"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -106,18 +106,21 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 8
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 9
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 10
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 11
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 12
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 13
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 14
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 15
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
+  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
+  !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
+  !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -145,30 +148,17 @@ Section "MSVC runtime" SEC_MSVC
 
   SectionIn RO
 
-  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
-  ${If} ${RunningX64}
-    ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
-  ${Else}
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
-  ${EndIf}
-
-  StrCmp $R0 "1" 0 +3
-  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
-  Goto done
-
-  DetailPrint "Installing Visual C++ 2015 Redistributable..."
   SetOutPath $TEMP
-  File "vcredist_x86.exe"
-  ExecWait '"$TEMP\vcredist_x86.exe" /install /quiet /norestart'
-  SetOutPath $INSTDIR
+  File "vc_redist.x86.exe"
+  ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart'
+  SetOutPath $INSTDIR    
 
-  done:
 SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
-  File "libeay32.dll"
-  File "ssleay32.dll"
+  File "libcrypto-1_1.dll"
+  File "libssl-1_1.dll"
 
 SectionEnd
 
@@ -186,6 +176,8 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
+  !insertmacro LOCALIZATION "Italian" "it"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -193,6 +185,7 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Spanish" "es"
   !insertmacro LOCALIZATION "Swedish" "sv"
   !insertmacro LOCALIZATION "Turkish" "tr"
+  !insertmacro LOCALIZATION "Ukrainian" "uk"
 SectionGroupEnd
 
 ;--------------------------------
@@ -227,6 +220,9 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "loc"
   !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
+  !insertmacro FILE_ASSOCIATION_REMOVE "cup"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sml"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -239,7 +235,7 @@ SectionEnd
 LangString DESC_QT ${LANG_ENGLISH} \
   "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
   "OpenSSL library. Required for HTTPS to work."
 LangString DESC_ANGLE ${LANG_ENGLISH} \

pkg/gpxsee.xml

@@ -84,4 +84,25 @@
 		<generic-icon name="text-plain"/>
 		<glob pattern="*.geojson"/>
 	</mime-type>
+
+	<mime-type type="application/vnd.naviter.seeyou.cup">
+		<comment>SeeYou CUP File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.cup"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.garmin.gpi">
+		<comment>Garmin POI File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.gpi"/>
+	</mime-type>
+
+	<mime-type type="application/sml+xml">
+		<comment>Suunto Markup Language</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.sml"/>
+	</mime-type>
 </mime-info>

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.11"
+!define VERSION "7.33"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -113,18 +113,21 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 8
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 9
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 10
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 11
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 12
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 13
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 14
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 15
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
+  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
+  !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
+  !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -152,25 +155,17 @@ Section "MSVC runtime" SEC_MSVC
 
   SectionIn RO
 
-  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
-  ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
-  StrCmp $R0 "1" 0 +3
-  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
-  Goto done
-
-  DetailPrint "Installing Visual C++ 2015 Redistributable..."
   SetOutPath $TEMP
-  File "vcredist_x64.exe"
-  ExecWait '"$TEMP\vcredist_x64.exe" /install /quiet /norestart'
+  File "vc_redist.x64.exe"
+  ExecWait '"$TEMP\vc_redist.x64.exe" /install /quiet /norestart'
   SetOutPath $INSTDIR
 
-  done:
 SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
-  File "libeay32.dll"
-  File "ssleay32.dll"
+  File "libcrypto-1_1-x64.dll"
+  File "libssl-1_1-x64.dll"
 
 SectionEnd
 
@@ -188,6 +183,8 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
+  !insertmacro LOCALIZATION "Italian" "it"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -195,6 +192,7 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Spanish" "es"
   !insertmacro LOCALIZATION "Swedish" "sv"
   !insertmacro LOCALIZATION "Turkish" "tr"
+  !insertmacro LOCALIZATION "Ukrainian" "uk"
 SectionGroupEnd
 
 ;--------------------------------
@@ -230,6 +228,9 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "loc"
   !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
+  !insertmacro FILE_ASSOCIATION_REMOVE "cup"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sml"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -242,7 +243,7 @@ SectionEnd
 LangString DESC_QT ${LANG_ENGLISH} \
   "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
   "OpenSSL library. Required for HTTPS to work."
 LangString DESC_ANGLE ${LANG_ENGLISH} \

pkg/maps/4UMaps.xml

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

pkg/maps/Antarctica.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3" type="WMTS">
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>Antarctica</name>
-	<url type="REST">https://gis.ngdc.noaa.gov/arcgis/rest/services/antarctic/antarctic_basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
+	<url type="REST">https://tiles.arcgis.com/tiles/C8EMgrsFcRFL6LrL/arcgis/rest/services/Antarctic_Basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
 	<copyright>NOAA National Centers for Environmental Information (NCEI); International Bathymetric Chart of the Southern Ocean (IBCSO); General Bathymetric Chart of the Oceans (GEBCO); Natural Earth</copyright>
-	<layer>antarctic_antarctic_basemap</layer>
+	<layer>Antarctic_Basemap</layer>
 	<set>default028mm</set>
 </map>

pkg/maps/OpenStreetMap.xml

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

pkg/maps/OpenTopoMap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Topo Map</name>
 	<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
 	<zoom max="17"/>

pkg/maps/USGS-imagery.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Imagery</name>
 	<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>

pkg/maps/USGS-topo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Topo</name>
 	<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>

src/GUI/areaitem.cpp

@@ -2,12 +2,13 @@
 #include <QApplication>
 #include <QCursor>
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
 #include "map/map.h"
-#include "tooltip.h"
+#include "popup.h"
 #include "areaitem.h"
 
 
-QString AreaItem::toolTip() const
+QString AreaItem::info() const
 {
 	ToolTip tt;
 
@@ -20,8 +21,8 @@ QString AreaItem::toolTip() const
 	return tt.toString();
 }
 
-AreaItem::AreaItem(const Area &area, Map *map, QGraphicsItem *parent)
-  : QGraphicsItem(parent), _area(area)
+AreaItem::AreaItem(const Area &area, Map *map, GraphicsItem *parent)
+  : GraphicsItem(parent), _area(area)
 {
 	_map = map;
 	_digitalZoom = 0;
@@ -35,8 +36,6 @@ AreaItem::AreaItem(const Area &area, Map *map, QGraphicsItem *parent)
 
 	setCursor(Qt::ArrowCursor);
 	setAcceptHoverEvents(true);
-
-	setToolTip(toolTip());
 }
 
 
@@ -153,3 +152,27 @@ void AreaItem::setDigitalZoom(int zoom)
 	_digitalZoom = zoom;
 	_pen.setWidthF(_width * pow(2, -_digitalZoom));
 }
+
+void AreaItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+	Q_UNUSED(event);
+
+	_pen.setWidthF((_width + 1) * pow(2, -_digitalZoom));
+	setZValue(zValue() + 1.0);
+	update();
+}
+
+void AreaItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+	Q_UNUSED(event);
+
+	_pen.setWidthF(_width * pow(2, -_digitalZoom));
+	setZValue(zValue() - 1.0);
+	update();
+}
+
+void AreaItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), info(), event->widget());
+	QGraphicsItem::mousePressEvent(event);
+}

src/GUI/areaitem.h

@@ -1,15 +1,16 @@
 #ifndef AREAITEM_H
 #define AREAITEM_H
 
-#include <QGraphicsItem>
 #include "data/area.h"
+#include "graphicsscene.h"
+#include "tooltip.h"
 
 class Map;
 
-class AreaItem : public QGraphicsItem
+class AreaItem : public GraphicsItem
 {
 public:
-	AreaItem(const Area &area, Map *map, QGraphicsItem *parent = 0);
+	AreaItem(const Area &area, Map *map, GraphicsItem *parent = 0);
 
 	QPainterPath shape() const {return _painterPath;}
 	QRectF boundingRect() const {return _painterPath.boundingRect();}
@@ -26,10 +27,17 @@ public:
 	void setStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
+	virtual QString info() const;
+
+protected:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
 private:
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
-	QString toolTip() const;
+	ToolTip toolTip() const;
 
 	Area _area;
 	Map *_map;

src/GUI/axisitem.cpp

@@ -30,7 +30,7 @@ private:
 Ticks::Ticks(double minValue, double maxValue, int maxCount)
 {
 	double range = niceNum(maxValue - minValue, false);
-	_d = niceNum(range / maxCount, true);
+	_d = niceNum(range / maxCount, false);
 	_min = ceil(minValue / _d) * _d;
 	_max = floor(maxValue / _d) * _d;
 }

src/GUI/cadencegraph.cpp

@@ -14,6 +14,11 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+CadenceGraph::~CadenceGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void CadenceGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,28 @@ QList<GraphItem*> CadenceGraph::loadData(const Data &data)
 		const Graph &graph = track.cadence();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +85,9 @@ qreal CadenceGraph::avg() const
 
 void CadenceGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +97,13 @@ void CadenceGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/cadencegraph.h

@@ -3,18 +3,20 @@
 
 #include "graphtab.h"
 
+class CadenceGraphItem;
+
 class CadenceGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	CadenceGraph(QWidget *parent = 0);
+	~CadenceGraph();
 
 	QString label() const {return tr("Cadence");}
 	QList<GraphItem*> loadData(const Data &data);
 	void clear();
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
@@ -24,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<CadenceGraphItem *> _tracks;
 };
 
 #endif // CADENCEGRAPH_H

src/GUI/cadencegraphitem.cpp

@@ -4,12 +4,12 @@
 
 
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
-	setToolTip(toolTip());
 }
 
-QString CadenceGraphItem::toolTip() const
+QString CadenceGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/cadencegraphitem.h

@@ -8,11 +8,10 @@ class CadenceGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	CadenceGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	CadenceGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
-private:
-	QString toolTip() const;
+	QString info() const;
 };
 
 #endif // CADENCEGRAPHITEM_H

src/GUI/elevationgraph.cpp

@@ -8,26 +8,18 @@
 
 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;
+	if (std::isnan(a))
+		return std::isnan(b) ? NAN : b;
 	else
-		return NAN;
+		return std::isnan(b) ? a : qMin(a, b);
 }
 
 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;
+	if (std::isnan(a))
+		return std::isnan(b) ? NAN : b;
 	else
-		return NAN;
+		return std::isnan(b) ? a : qMax(a, b);
 }
 
 ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
@@ -49,6 +41,12 @@ ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
 	setMinYRange(50.0);
 }
 
+ElevationGraph::~ElevationGraph()
+{
+	qDeleteAll(_tracks);
+	qDeleteAll(_routes);
+}
+
 void ElevationGraph::setInfo()
 {
 	if (std::isnan(max()) || std::isnan(min()))
@@ -67,26 +65,38 @@ void ElevationGraph::setInfo()
 	}
 }
 
-GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
+GraphItem *ElevationGraph::loadGraph(const Graph &graph, PathType type,
+  const QColor &color, bool primary)
 {
-	if (!graph.isValid()) {
-		skipColor();
+	if (!graph.isValid())
 		return 0;
-	}
 
-	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType);
-	GraphView::addGraph(gi, type);
+	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
+	  color, primary ? Qt::SolidLine : Qt::DashLine);
+	gi->setUnits(_units);
 
-	if (type == Track) {
-		_trackAscent += gi->ascent();
-		_trackDescent += gi->descent();
-		_trackMax = nMax(_trackMax, gi->max());
-		_trackMin = nMin(_trackMin, gi->min());
+	if (type == TrackPath) {
+		_tracks.append(gi);
+		if (_showTracks)
+			addGraph(gi);
+
+		if (primary) {
+			_trackAscent += gi->ascent();
+			_trackDescent += gi->descent();
+			_trackMax = nMax(_trackMax, gi->max());
+			_trackMin = nMin(_trackMin, gi->min());
+		}
 	} else {
-		_routeAscent += gi->ascent();
-		_routeDescent += gi->descent();
-		_routeMax = nMax(_routeMax, gi->max());
-		_routeMin = nMin(_routeMin, gi->min());
+		_routes.append(gi);
+		if (_showRoutes)
+			addGraph(gi);
+
+		if (primary) {
+			_routeAscent += gi->ascent();
+			_routeDescent += gi->descent();
+			_routeMax = nMax(_routeMax, gi->max());
+			_routeMin = nMin(_routeMin, gi->min());
+		}
 	}
 
 	return gi;
@@ -95,13 +105,34 @@ GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 {
 	QList<GraphItem*> graphs;
+	GraphItem *primary, *secondary;
 
-	for (int i = 0; i < data.tracks().count(); i++)
-		graphs.append(loadGraph(data.tracks().at(i).elevation(), Track));
-	for (int i = 0; i < data.routes().count(); i++)
-		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
+	for (int i = 0; i < data.tracks().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.tracks().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), TrackPath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), TrackPath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
+	for (int i = 0; i < data.routes().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.routes().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), RoutePath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), RoutePath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -111,6 +142,11 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 
 void ElevationGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+	qDeleteAll(_routes);
+	_routes.clear();
+
 	_trackAscent = 0;
 	_routeAscent = 0;
 	_trackDescent = 0;
@@ -142,12 +178,23 @@ void ElevationGraph::setUnits(Units units)
 	GraphView::setUnits(units);
 }
 
+void ElevationGraph::showItems(const QList<ElevationGraphItem *> &list,
+  bool show)
+{
+	for (int i = 0; i < list.size(); i++) {
+		if (show)
+			addGraph(list.at(i));
+		else
+			removeGraph(list.at(i));
+	}
+}
+
 void ElevationGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
+	showItems(_tracks, show);
 	setInfo();
-	showGraph(show, Track);
 
 	redraw();
 }
@@ -156,7 +203,7 @@ void ElevationGraph::showRoutes(bool show)
 {
 	_showRoutes = show;
 
-	showGraph(show, Route);
+	showItems(_routes, show);
 	setInfo();
 
 	redraw();

src/GUI/elevationgraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class ElevationGraphItem;
+
 class ElevationGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	ElevationGraph(QWidget *parent = 0);
+	~ElevationGraph();
 
 	QString label() const {return tr("Elevation");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -18,7 +21,7 @@ public:
 	void showRoutes(bool show);
 
 private:
-	enum Type {Track, Route};
+	enum PathType {TrackPath, RoutePath};
 
 	qreal max() const;
 	qreal min() const;
@@ -28,7 +31,9 @@ private:
 	void setYUnits(Units units);
 	void setInfo();
 
-	GraphItem *loadGraph(const Graph &graph, Type type);
+	GraphItem *loadGraph(const Graph &graph, PathType type, const QColor &color,
+	  bool primary);
+	void showItems(const QList<ElevationGraphItem *> &list, bool show);
 
 	qreal _trackAscent, _trackDescent;
 	qreal _routeAscent, _routeDescent;
@@ -36,6 +41,7 @@ private:
 	qreal _trackMin, _routeMin;
 
 	bool _showTracks, _showRoutes;
+	QList<ElevationGraphItem *> _tracks, _routes;
 };
 
 #endif // ELEVATIONGRAPH_H

src/GUI/elevationgraphitem.cpp

@@ -4,7 +4,8 @@
 
 
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, style, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();
@@ -23,15 +24,13 @@ ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
 				_descent += prev - cur;
 		}
 	}
-
-	setToolTip(toolTip(Metric));
 }
 
-QString ElevationGraphItem::toolTip(Units units) const
+QString ElevationGraphItem::info() const
 {
 	ToolTip tt;
-	qreal scale = (units == Metric) ? 1.0 : M2FT;
-	QString su = (units == Metric) ? tr("m") : tr("ft");
+	qreal scale = (_units == Metric) ? 1.0 : M2FT;
+	QString su = (_units == Metric) ? tr("m") : tr("ft");
 	QLocale l(QLocale::system());
 
 	tt.insert(tr("Ascent"), l.toString(ascent() * scale, 'f', 0)
@@ -43,10 +42,6 @@ QString ElevationGraphItem::toolTip(Units units) const
 	tt.insert(tr("Minimum"), l.toString(min() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
 
+
 	return tt.toString();
 }
-
-void ElevationGraphItem::setUnits(Units units)
-{
-	setToolTip(toolTip(units));
-}

src/GUI/elevationgraphitem.h

@@ -8,19 +8,19 @@ class ElevationGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	ElevationGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	enum DataType {GPS, DEM};
+
+	ElevationGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}
 
-	void setUnits(Units units);
+	QString info() const;
 
 private:
-	QString toolTip(Units units) const;
-
 	qreal _ascent, _descent, _min, _max;
 };
 

src/GUI/fileselectwidget.cpp

@@ -12,7 +12,8 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
 {
 	QFontMetrics fm(QApplication::font());
 	_edit = new QLineEdit();
-	_edit->setMinimumWidth(fm.boundingRect(QDir::homePath()).width());
+	_edit->setMinimumWidth(fm.averageCharWidth() * (QDir::homePath().length()
+	  + 12));
 #ifdef Q_OS_WIN32
 	_button = new QPushButton("...");
 	_button->setMaximumWidth(_button->sizeHint().width() / 2);
@@ -41,3 +42,33 @@ void FileSelectWidget::browse()
 	if (!fileName.isEmpty())
 		_edit->setText(fileName);
 }
+
+bool FileSelectWidget::checkFile(QString &error) const
+{
+	if (_edit->text().isEmpty()) {
+		error = tr("No output file selected.");
+		return false;
+	}
+
+	QFile file(_edit->text());
+	QFileInfo fi(file);
+	bool exists = fi.exists();
+	bool opened = false;
+
+	if (exists && fi.isDir()) {
+		error = tr("%1 is a directory.").arg(file.fileName());
+		return false;
+	} else if ((exists && !fi.isWritable())
+	  || !(opened = file.open(QFile::Append))) {
+		error = tr("%1 is not writable.").arg(file.fileName());
+		return false;
+	}
+
+	if (opened) {
+		file.close();
+		if (!exists)
+			file.remove();
+	}
+
+	return true;
+}

src/GUI/fileselectwidget.h

@@ -14,9 +14,10 @@ class FileSelectWidget : public QWidget
 public:
 	FileSelectWidget(QWidget *parent = 0);
 
-	QString file() {return _edit->text();}
+	QString file() const {return _edit->text();}
 	void setFile(const QString &file) {_edit->setText(file);}
 	void setFilter(const QString &filter) {_filter = filter;}
+	bool checkFile(QString &error) const;
 
 private slots:
 	void browse();

src/GUI/gearratiograph.cpp

@@ -14,6 +14,11 @@ GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(2);
 }
 
+GearRatioGraph::~GearRatioGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void GearRatioGraph::setInfo()
 {
 	if (_showTracks) {
@@ -37,11 +42,15 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 		const Graph &graph = data.tracks().at(i).ratio();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
 
 			for (QMap<qreal, qreal>::const_iterator it = gi->map().constBegin();
 			  it != gi->map().constEnd(); ++it)
@@ -51,12 +60,12 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -70,10 +79,7 @@ qreal GearRatioGraph::top() const
 
 	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
 	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
-			val = it.value();
-			key = it.key();
-		} else if (it.value() > val) {
+		if (std::isnan(val) || it.value() > val) {
 			val = it.value();
 			key = it.key();
 		}
@@ -84,6 +90,9 @@ qreal GearRatioGraph::top() const
 
 void GearRatioGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_map.clear();
 
 	GraphTab::clear();
@@ -93,7 +102,13 @@ void GearRatioGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/gearratiograph.h

@@ -4,12 +4,15 @@
 #include <QMap>
 #include "graphtab.h"
 
+class GearRatioGraphItem;
+
 class GearRatioGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	GearRatioGraph(QWidget *parent = 0);
+	~GearRatioGraph();
 
 	QString label() const {return tr("Gear ratio");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -25,6 +28,7 @@ private:
 	QMap<qreal, qreal> _map;
 
 	bool _showTracks;
+	QList<GearRatioGraphItem*> _tracks;
 };
 
 #endif // GEARRATIOGRAPH_H

src/GUI/gearratiographitem.cpp

@@ -5,25 +5,29 @@
 
 
 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
-	qreal val = NAN;
-
-	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
-	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
-			val = it.value();
-			_top = it.key();
-		} else if (it.value() > val) {
-			val = it.value();
-			_top = it.key();
+	for (int i = 0; i < graph.size(); i++) {
+		const GraphSegment &segment = graph.at(i);
+		for (int j = 1; j < segment.size(); j++) {
+			qreal dx = segment.at(j).s() - segment.at(j-1).s();
+			_map.insert(segment.at(j).y(), _map.value(segment.at(j).y()) + dx);
 		}
 	}
 
-	setToolTip(toolTip());
+	qreal key = NAN, val = NAN;
+	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
+	  it != _map.constEnd(); ++it) {
+		if (std::isnan(val) || it.value() > val) {
+			val = it.value();
+			key = it.key();
+		}
+	}
+	_top = key;
 }
 
-QString GearRatioGraphItem::toolTip() const
+QString GearRatioGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/gearratiographitem.h

@@ -9,16 +9,15 @@ class GearRatioGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	GearRatioGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	GearRatioGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal top() const {return _top;}
-
 	const QMap<qreal, qreal> &map() const {return _map;}
 
-private:
-	QString toolTip() const;
+	QString info() const;
 
+private:
 	QMap<qreal, qreal> _map;
 	qreal _top;
 };

src/GUI/graphicsscene.cpp

@@ -0,0 +1,54 @@
+#include <QGraphicsSceneHelpEvent>
+#include <QGraphicsView>
+#include "popup.h"
+#include "graphicsscene.h"
+
+
+/* Standard GraphicsScene::items() is not pixel accurate, so we use the
+   following function which has the same logic as used in the original
+   QGraphicsScene::helpEvent() function. */
+QList<QGraphicsItem *> GraphicsScene::itemsAtPosition(const QPoint &screenPos,
+  const QPointF &scenePos, QWidget *widget) const
+{
+	QGraphicsView *view = widget
+	  ? qobject_cast<QGraphicsView *>(widget->parentWidget()) : 0;
+
+	if (!view)
+		return items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder,
+		  QTransform());
+
+	const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)),
+	  QSizeF(1, 1));
+	if (!view->isTransformed())
+		return items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder);
+
+	const QTransform viewTransform = view->viewportTransform();
+	if (viewTransform.type() <= QTransform::TxScale)
+		return items(viewTransform.inverted().mapRect(pointRect),
+		  Qt::IntersectsItemShape, Qt::DescendingOrder, viewTransform);
+
+	return items(viewTransform.inverted().map(pointRect),
+	  Qt::IntersectsItemShape, Qt::DescendingOrder, viewTransform);
+}
+
+void GraphicsScene::helpEvent(QGraphicsSceneHelpEvent *event)
+{
+	QList<QGraphicsItem *> list = itemsAtPosition(event->screenPos(),
+	  event->scenePos(), event->widget());
+
+	for (int i = 0; i < list.size(); i++) {
+		if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
+			GraphicsItem *mi = static_cast<GraphicsItem*>(list.at(i));
+			Popup::show(event->screenPos(), mi->info(), event->widget());
+			return;
+		}
+	}
+
+	/* No need to process QGraphicsScene::helpEvent() */
+}
+
+void GraphicsScene::clear()
+{
+	Popup::clear();
+	QGraphicsScene::clear();
+}

src/GUI/graphicsscene.h

@@ -0,0 +1,32 @@
+#ifndef GRAPHICSSCENE_H
+#define GRAPHICSSCENE_H
+
+#include <QGraphicsScene>
+#include <QGraphicsItem>
+
+class GraphicsItem : public QGraphicsItem
+{
+public:
+	GraphicsItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent) {}
+
+	virtual QString info() const = 0;
+	int type() const {return QGraphicsItem::UserType + 1;}
+};
+
+class GraphicsScene : public QGraphicsScene
+{
+public:
+	GraphicsScene(QObject *parent = 0) : QGraphicsScene(parent) {}
+
+public slots:
+	void clear();
+
+protected:
+	void helpEvent(QGraphicsSceneHelpEvent *event);
+
+private:
+	QList<QGraphicsItem *> itemsAtPosition(const QPoint &screenPos,
+	  const QPointF &scenePos, QWidget *widget) const;
+};
+
+#endif // GRAPHICSSCENE_H

src/GUI/graphitem.cpp

@@ -1,31 +1,29 @@
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
+#include "popup.h"
 #include "graphitem.h"
 
 
-GraphItem::GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent)
-  : QGraphicsObject(parent), _graph(graph), _type(type)
+GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphicsItem(parent), _graph(graph), _type(type), _secondaryGraph(0)
 {
 	Q_ASSERT(_graph.isValid());
 
-	_id = 0;
-	_width = 1;
-	_pen = QPen(Qt::black, _width);
-	_sx = 1.0; _sy = 1.0;
+	_units = Metric;
+	_pen = QPen(color, width, style);
+	_sx = 0; _sy = 0;
 	_time = _graph.hasTime();
-
 	setZValue(2.0);
-
-	updatePath();
-	updateShape();
-	updateBounds();
-
 	setAcceptHoverEvents(true);
+
+	updateBounds();
 }
 
 void GraphItem::updateShape()
 {
 	QPainterPathStroker s;
-	s.setWidth(_width + 1);
+	s.setWidth(_pen.width() + 1);
 	_shape = s.createStroke(_path);
 }
 
@@ -54,7 +52,6 @@ void GraphItem::setGraphType(GraphType type)
 
 	_type = type;
 	updatePath();
-	updateShape();
 	updateBounds();
 }
 
@@ -69,12 +66,11 @@ void GraphItem::setColor(const QColor &color)
 
 void GraphItem::setWidth(int width)
 {
-	if (width == _width)
+	if (width == _pen.width())
 		return;
 
 	prepareGeometryChange();
 
-	_width = width;
 	_pen.setWidth(width);
 
 	updateShape();
@@ -170,10 +166,10 @@ void GraphItem::emitSliderPositionChanged(qreal pos)
 void GraphItem::hover(bool hover)
 {
 	if (hover) {
-		_pen.setWidth(_width + 1);
+		_pen.setWidth(_pen.width() + 1);
 		setZValue(zValue() + 1.0);
 	} else {
-		_pen.setWidth(_width);
+		_pen.setWidth(_pen.width() - 1);
 		setZValue(zValue() - 1.0);
 	}
 
@@ -189,23 +185,30 @@ void GraphItem::setScale(qreal sx, qreal sy)
 
 	_sx = sx; _sy = sy;
 	updatePath();
-	updateShape();
 }
 
 void GraphItem::updatePath()
 {
-	_path = QPainterPath();
-
-	if (_type == Time && !_time)
+	if (_sx == 0 && _sy == 0)
 		return;
 
-	for (int i = 0; i < _graph.size(); i++) {
-		const GraphSegment &segment = _graph.at(i);
+	prepareGeometryChange();
 
-		_path.moveTo(segment.first().x(_type) * _sx, -segment.first().y() * _sy);
-		for (int i = 1; i < segment.size(); i++)
-			_path.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y() * _sy);
+	_path = QPainterPath();
+
+	if (!(_type == Time && !_time)) {
+		for (int i = 0; i < _graph.size(); i++) {
+			const GraphSegment &segment = _graph.at(i);
+
+			_path.moveTo(segment.first().x(_type) * _sx, -segment.first().y()
+			  * _sy);
+			for (int i = 1; i < segment.size(); i++)
+				_path.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y()
+				  * _sy);
+		}
 	}
+
+	updateShape();
 }
 
 void GraphItem::updateBounds()
@@ -231,7 +234,10 @@ void GraphItem::updateBounds()
 		}
 	}
 
-	_bounds = QRectF(QPointF(left, top), QPointF(right, bottom));
+	if (left == right)
+		_bounds = QRectF();
+	else
+		_bounds = QRectF(QPointF(left, top), QPointF(right, bottom));
 }
 
 qreal GraphItem::max() const
@@ -286,7 +292,7 @@ void GraphItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width + 1);
+	_pen.setWidth(_pen.width() + 1);
 	setZValue(zValue() + 1.0);
 	update();
 
@@ -297,9 +303,15 @@ void GraphItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width);
+	_pen.setWidth(_pen.width() - 1);
 	setZValue(zValue() - 1.0);
 	update();
 
 	emit selected(false);
 }
+
+void GraphItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), info(), event->widget());
+	GraphicsItem::mousePressEvent(event);
+}

src/GUI/graphitem.h

@@ -5,15 +5,19 @@
 #include <QPen>
 #include "data/graph.h"
 #include "units.h"
+#include "graphicsscene.h"
 
-class GraphItem : public QGraphicsObject
+class GraphItem : public QObject, public GraphicsItem
 {
 	Q_OBJECT
 
 public:
-	GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
+	virtual QString info() const = 0;
+
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@@ -27,11 +31,12 @@ public:
 
 	void setScale(qreal sx, qreal sy);
 	void setGraphType(GraphType type);
-	int id() const {return _id;}
-	void setId(int id) {_id = id;}
 	void setColor(const QColor &color);
 	void setWidth(int width);
-	virtual void setUnits(Units units) {Q_UNUSED(units);}
+	void setUnits(Units units) {_units = units;}
+
+	GraphItem *secondaryGraph() const {return _secondaryGraph;}
+	void setSecondaryGraph(GraphItem *graph) {_secondaryGraph = graph;}
 
 	qreal yAtX(qreal x);
 	qreal distanceAtTime(qreal time);
@@ -46,28 +51,29 @@ public slots:
 	void emitSliderPositionChanged(qreal);
 	void hover(bool hover);
 
-private:
+protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
+	Units _units;
+
+private:
 	const GraphSegment *segment(qreal x, GraphType type) const;
 	void updatePath();
 	void updateShape();
 	void updateBounds();
 
-	int _id;
-	QPen _pen;
-	int _width;
-
 	Graph _graph;
 	GraphType _type;
-
 	QPainterPath _path;
 	QPainterPath _shape;
 	QRectF _bounds;
 	qreal _sx, _sy;
-
+	QPen _pen;
 	bool _time;
+
+	GraphItem *_secondaryGraph;
 };
 
 #endif // GRAPHITEM_H

src/GUI/graphview.cpp

@@ -1,8 +1,8 @@
+#include <QSet>
 #include <QGraphicsScene>
 #include <QEvent>
 #include <QMouseEvent>
-#include <QPaintEngine>
-#include <QPaintDevice>
+#include <QScrollBar>
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
 #include <QLocale>
@@ -16,6 +16,7 @@
 #include "graphitem.h"
 #include "pathitem.h"
 #include "format.h"
+#include "graphicsscene.h"
 #include "graphview.h"
 
 
@@ -24,7 +25,7 @@
 GraphView::GraphView(QWidget *parent)
 	: QGraphicsView(parent)
 {
-	_scene = new QGraphicsScene(this);
+	_scene = new GraphicsScene(this);
 	setScene(_scene);
 
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
@@ -38,9 +39,9 @@ GraphView::GraphView(QWidget *parent)
 	_yAxis = new AxisItem(AxisItem::Y);
 	_yAxis->setZValue(1.0);
 	_slider = new SliderItem();
-	_slider->setZValue(3.0);
+	_slider->setZValue(4.0);
 	_sliderInfo = new SliderInfoItem(_slider);
-	_sliderInfo->setZValue(3.0);
+	_sliderInfo->setZValue(4.0);
 	_info = new InfoItem();
 	_grid = new GridItem();
 	_message = new QGraphicsSimpleTextItem(tr("Data not available"));
@@ -64,6 +65,8 @@ GraphView::GraphView(QWidget *parent)
 	_units = Metric;
 	_graphType = Distance;
 	_xLabel = tr("Distance");
+
+	_zoom = 1.0;
 }
 
 GraphView::~GraphView()
@@ -74,8 +77,6 @@ GraphView::~GraphView()
 	delete _info;
 	delete _grid;
 	delete _message;
-
-	qDeleteAll(_graphs);
 }
 
 void GraphView::createXLabel()
@@ -166,14 +167,11 @@ void GraphView::setGraphType(GraphType type)
 	for (int i = 0; i < _graphs.count(); i++) {
 		GraphItem *gi = _graphs.at(i);
 		gi->setGraphType(type);
-		if (!_hide.contains(gi->id())) {
-			if (gi->bounds().width() > 0)
-				addItem(gi);
-			else
-				removeItem(gi);
-		}
-		if (gi->scene() == _scene)
-			_bounds |= gi->bounds();
+		if (gi->bounds().isNull())
+			removeItem(gi);
+		else
+			addItem(gi);
+		_bounds |= gi->bounds();
 	}
 
 	if (type == Distance)
@@ -195,29 +193,32 @@ void GraphView::showSliderInfo(bool show)
 	_sliderInfo->setVisible(show);
 }
 
-void GraphView::addGraph(GraphItem *graph, int id)
+void GraphView::addGraph(GraphItem *graph)
 {
-	QColor color(_palette.nextColor());
-	color.setAlpha(255);
-
-	graph->setUnits(_units);
-	graph->setId(id);
-	graph->setColor(color);
-	graph->setWidth(_width);
-
 	connect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
 	  SLOT(emitSliderPositionChanged(qreal)));
 
 	_graphs.append(graph);
+	if (!graph->bounds().isNull())
+		_scene->addItem(graph);
+	_bounds |= graph->bounds();
 
-	if (!_hide.contains(id)) {
-		_visible.append(graph);
-		if (graph->bounds().width() > 0) {
-			_scene->addItem(graph);
-			_bounds |= graph->bounds();
-		}
-		setXUnits();
-	}
+	setXUnits();
+}
+
+void GraphView::removeGraph(GraphItem *graph)
+{
+	disconnect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
+	  SLOT(emitSliderPositionChanged(qreal)));
+
+	_graphs.removeOne(graph);
+	_scene->removeItem(graph);
+
+	_bounds = QRectF();
+	for (int i = 0; i < _graphs.count(); i++)
+		_bounds |= _graphs.at(i)->bounds();
+
+	setXUnits();
 }
 
 void GraphView::removeItem(QGraphicsItem *item)
@@ -232,29 +233,6 @@ void GraphView::addItem(QGraphicsItem *item)
 		_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 {
-			_visible.append(gi);
-			if (gi->bounds().width() > 0) {
-				addItem(gi);
-				_bounds |= gi->bounds();
-			}
-		}
-	}
-}
-
 QRectF GraphView::bounds() const
 {
 	QRectF br(_bounds);
@@ -297,8 +275,8 @@ void GraphView::redraw(const QSizeF &size)
 	rx = RangeF(bounds().left() * _xScale, bounds().right() * _xScale);
 	ry = RangeF(bounds().top() * _yScale + _yOffset, bounds().bottom() * _yScale
 	  + _yOffset);
-	if (ry.size() < _minYRange)
-		ry.resize(_minYRange);
+	if (ry.size() < _minYRange * _yScale)
+		ry.resize(_minYRange * _yScale);
 
 	_xAxis->setRange(rx);
 	_yAxis->setRange(ry);
@@ -313,9 +291,10 @@ void GraphView::redraw(const QSizeF &size)
 	sx = (size.width() - (my.width() + mx.width())) / r.width();
 	sy = (size.height() - (mx.height() + my.height())
 	  - _info->boundingRect().height()) / r.height();
+	sx *= _zoom;
 
-	for (int i = 0; i < _visible.size(); i++)
-		_visible.at(i)->setScale(sx, sy);
+	for (int i = 0; i < _graphs.size(); i++)
+		_graphs.at(i)->setScale(sx, sy);
 
 	QPointF p(r.left() * sx, r.top() * sy);
 	QSizeF s(r.width() * sx, r.height() * sy);
@@ -360,6 +339,40 @@ void GraphView::mousePressEvent(QMouseEvent *e)
 	QGraphicsView::mousePressEvent(e);
 }
 
+void GraphView::wheelEvent(QWheelEvent *e)
+{
+	static int deg = 0;
+
+	deg += e->delta() / 8;
+	if (qAbs(deg) < 15)
+		return;
+	deg = 0;
+
+	QPointF pos = mapToScene(e->pos());
+	QRectF gr(_grid->boundingRect());
+	QPointF r(pos.x() / gr.width(), pos.y() / gr.height());
+
+	_zoom = (e->delta() > 0) ? _zoom * 1.25 : qMax(_zoom / 1.25, 1.0);
+	redraw();
+
+	QRectF ngr(_grid->boundingRect());
+	QPointF npos(mapFromScene(QPointF(r.x() * ngr.width(),
+	  r.y() * ngr.height())));
+	QScrollBar *sb = horizontalScrollBar();
+	sb->setSliderPosition(sb->sliderPosition() + npos.x() - e->pos().x());
+
+	QGraphicsView::wheelEvent(e);
+}
+
+void GraphView::paintEvent(QPaintEvent *e)
+{
+	QRectF viewRect(mapToScene(rect()).boundingRect());
+	_info->setPos(QPointF(viewRect.left() + (viewRect.width()
+	  - _info->boundingRect().width())/2.0, _info->pos().y()));
+
+	QGraphicsView::paintEvent(e);
+}
+
 void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 {
 	QSizeF canvas = QSizeF(target.width() / scale, target.height() / scale);
@@ -376,54 +389,47 @@ void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 
 void GraphView::clear()
 {
+	_graphs.clear();
+
 	_slider->clear();
 	_info->clear();
 
-	qDeleteAll(_graphs);
-	_graphs.clear();
-	_visible.clear();
 	_palette.reset();
 
 	_bounds = QRectF();
 	_sliderPos = 0;
+	_zoom = 1.0;
 
 	_scene->setSceneRect(0, 0, 0, 0);
 }
 
 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());
+		_slider->setVisible(true);
+		updateSliderInfo();
 	} else {
 		_slider->setPos(_slider->area().left(), _slider->area().bottom());
 		_slider->setVisible(false);
 	}
-
-	if (_slider->isVisible())
-		updateSliderInfo();
 }
 
 void GraphView::updateSliderInfo()
 {
 	QLocale l(QLocale::system());
-	qreal r, y;
+	qreal r = 0, y = 0;
+	GraphItem *cardinal = (_graphs.count() == 1 || (_graphs.count() == 2
+	  && _graphs.first()->secondaryGraph())) ? _graphs.first() : 0;
 
-
-	if (_visible.count() > 1) {
-		r = 0;
-		y = 0;
-	} else {
-		QRectF br(_visible.first()->bounds());
+	if (cardinal) {
+		QRectF br(_bounds);
 		if (br.height() < _minYRange)
 			br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
 			  _minYRange/2 - br.height()/2);
 
-		y = _visible.first()->yAtX(_sliderPos);
+		y = cardinal->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}
 
@@ -433,11 +439,17 @@ void GraphView::updateSliderInfo()
 
 	_sliderInfo->setSide(s);
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
-	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
+	QString xText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_visible.count() > 1) ? QString()
-	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
-	  + _yUnits);
+	  + UNIT_SPACE + _xUnits);
+	QString yText((!cardinal) ? QString() : l.toString(-y * _yScale + _yOffset,
+	  'f', _precision) + UNIT_SPACE + _yUnits);
+	if (cardinal && cardinal->secondaryGraph()) {
+		qreal delta = y - cardinal->secondaryGraph()->yAtX(_sliderPos);
+		yText += " " + QChar(0x0394) + l.toString(-delta * _yScale + _yOffset,
+		  'f', _precision) + UNIT_SPACE + _yUnits;
+	}
+	_sliderInfo->setText(xText, yText);
 }
 
 void GraphView::emitSliderPositionChanged(const QPointF &pos)
@@ -455,7 +467,7 @@ void GraphView::emitSliderPositionChanged(const QPointF &pos)
 
 void GraphView::setSliderPosition(qreal pos)
 {
-	if (_visible.isEmpty())
+	if (_graphs.isEmpty())
 		return;
 
 	_sliderPos = pos;
@@ -483,10 +495,22 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();
 
+	QSet<GraphItem*> secondary;
 	for (int i = 0; i < _graphs.count(); i++) {
+		GraphItem *g = _graphs[i];
+		if (g->secondaryGraph())
+			secondary.insert(g->secondaryGraph());
+	}
+
+	for (int i = 0; i < _graphs.count(); i++) {
+		GraphItem *g = _graphs[i];
+		if (secondary.contains(g))
+			continue;
+
 		QColor color(_palette.nextColor());
-		color.setAlpha(255);
-		_graphs.at(i)->setColor(color);
+		g->setColor(color);
+		if (g->secondaryGraph())
+			g->secondaryGraph()->setColor(color);
 	}
 }
 

src/GUI/graphview.h

@@ -3,7 +3,6 @@
 
 #include <QGraphicsView>
 #include <QList>
-#include <QSet>
 #include "data/graph.h"
 #include "palette.h"
 #include "units.h"
@@ -17,6 +16,7 @@ class GraphItem;
 class PathItem;
 class GridItem;
 class QGraphicsSimpleTextItem;
+class GraphicsScene;
 
 class GraphView : public QGraphicsView
 {
@@ -27,7 +27,7 @@ public:
 	~GraphView();
 
 	bool isEmpty() const {return _graphs.isEmpty();}
-	const QList<KV> &info() const {return _info->info();}
+	const QList<KV<QString, QString> > &info() const {return _info->info();}
 	void clear();
 
 	void plot(QPainter *painter, const QRectF &target, qreal scale);
@@ -46,12 +46,17 @@ signals:
 	void sliderPositionChanged(qreal);
 
 protected:
-	void addGraph(GraphItem *graph, int id = 0);
-
-	void showGraph(bool show, int id = 0);
+	void addGraph(GraphItem *graph);
+	void removeGraph(GraphItem *graph);
 	void setGraphType(GraphType type);
 	void setUnits(Units units);
 
+	void resizeEvent(QResizeEvent *e);
+	void mousePressEvent(QMouseEvent *e);
+	void wheelEvent(QWheelEvent *e);
+	void changeEvent(QEvent *e);
+	void paintEvent(QPaintEvent *e);
+
 	const QString &yLabel() const {return _yLabel;}
 	const QString &yUnits() const {return _yUnits;}
 	qreal yScale() const {return _yScale;}
@@ -68,12 +73,11 @@ protected:
 	void redraw();
 	void addInfo(const QString &key, const QString &value);
 	void clearInfo();
-	void skipColor() {_palette.nextColor();}
 
-	void changeEvent(QEvent *e);
-
-	QList<GraphItem*> _graphs;
 	GraphType _graphType;
+	Units _units;
+	Palette _palette;
+	int _width;
 
 private slots:
 	void emitSliderPositionChanged(const QPointF &pos);
@@ -89,19 +93,7 @@ private:
 	void removeItem(QGraphicsItem *item);
 	void addItem(QGraphicsItem *item);
 
-	void resizeEvent(QResizeEvent *e);
-	void mousePressEvent(QMouseEvent *e);
-
-	Units _units;
-	qreal _xScale, _yScale;
-	qreal _yOffset;
-	QString _xUnits, _yUnits;
-	QString _xLabel, _yLabel;
-	int _precision;
-	qreal _minYRange;
-	qreal _sliderPos;
-
-	QGraphicsScene *_scene;
+	GraphicsScene *_scene;
 
 	AxisItem *_xAxis, *_yAxis;
 	SliderItem *_slider;
@@ -109,12 +101,19 @@ private:
 	InfoItem *_info;
 	GridItem *_grid;
 	QGraphicsSimpleTextItem *_message;
+	QList<GraphItem*> _graphs;
 
-	QList<GraphItem*> _visible;
-	QSet<int> _hide;
 	QRectF _bounds;
-	Palette _palette;
-	int _width;
+	qreal _sliderPos;
+
+	qreal _xScale, _yScale;
+	qreal _yOffset;
+	QString _xUnits, _yUnits;
+	QString _xLabel, _yLabel;
+	int _precision;
+	qreal _minYRange;
+
+	qreal _zoom;
 };
 
 #endif // GRAPHVIEW_H

src/GUI/gui.cpp

@@ -51,6 +51,7 @@
 #include "graphtab.h"
 #include "graphitem.h"
 #include "pathitem.h"
+#include "mapaction.h"
 #include "gui.h"
 
 
@@ -58,7 +59,6 @@
 
 GUI::GUI()
 {
-	loadMaps();
 	loadPOIs();
 
 	createMapView();
@@ -106,24 +106,13 @@ GUI::GUI()
 	updateStatusBarInfo();
 }
 
-void GUI::loadMaps()
-{
-	_ml = new MapList(this);
-	QString mapDir(ProgramPaths::mapDir());
-
-	if (!mapDir.isNull() && !_ml->loadDir(mapDir))
-		qWarning("%s", qPrintable(_ml->errorString()));
-
-	_map = new EmptyMap(this);
-}
-
 void GUI::loadPOIs()
 {
 	_poi = new POI(this);
-	QString poiDir(ProgramPaths::poiDir());
 
-	if (!poiDir.isNull() && !_poi->loadDir(poiDir))
-		qWarning("%s", qPrintable(_poi->errorString()));
+	QString poiDir(ProgramPaths::poiDir());
+	if (!poiDir.isNull())
+		_poi->loadDir(poiDir);
 }
 
 void GUI::createBrowser()
@@ -134,40 +123,56 @@ void GUI::createBrowser()
 
 void GUI::createMapActions()
 {
-	_mapsSignalMapper = new QSignalMapper(this);
 	_mapsActionGroup = new QActionGroup(this);
 	_mapsActionGroup->setExclusive(true);
 
-	for (int i = 0; i < _ml->maps().count(); i++)
-		createMapAction(_ml->maps().at(i));
+	QString mapDir(ProgramPaths::mapDir());
+	if (mapDir.isNull())
+		return;
 
-	connect(_mapsSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(mapChanged(int)));
+	QString unused;
+	QList<Map*> maps(MapList::loadMaps(mapDir, unused));
+	for (int i = 0; i < maps.count(); i++) {
+		MapAction *a = createMapAction(maps.at(i));
+		connect(a, SIGNAL(loaded()), this, SLOT(mapInitialized()));
+	}
 }
 
-QAction *GUI::createMapAction(const Map *map)
+MapAction *GUI::createMapAction(Map *map)
 {
-	QAction *a = new QAction(map->name(), this);
+	MapAction *a = new MapAction(map);
 	a->setMenuRole(QAction::NoRole);
 	a->setCheckable(true);
 	a->setActionGroup(_mapsActionGroup);
-
-	_mapActions.append(a);
-	_mapsSignalMapper->setMapping(a, _mapActions.size() - 1);
-	connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
+	connect(a, SIGNAL(triggered()), this, SLOT(mapChanged()));
 
 	return a;
 }
 
+void GUI::mapInitialized()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		if (!_mapsActionGroup->checkedAction())
+			action->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
+	} else {
+		qWarning("%s: %s", qPrintable(map->name()), qPrintable(map->errorString()));
+		action->deleteLater();
+	}
+}
+
 void GUI::createPOIFilesActions()
 {
 	_poiFilesSignalMapper = new QSignalMapper(this);
+	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
+	  SLOT(poiFileChecked(int)));
 
 	for (int i = 0; i < _poi->files().count(); i++)
 		createPOIFileAction(_poi->files().at(i));
-
-	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(poiFileChecked(int)));
 }
 
 QAction *GUI::createPOIFileAction(const QString &fileName)
@@ -225,13 +230,20 @@ void GUI::createActions()
 	_printFileAction->setActionGroup(_fileActionGroup);
 	connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
 	addAction(_printFileAction);
-	_exportFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
+	_exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
 	  tr("Export to PDF..."), this);
-	_exportFileAction->setMenuRole(QAction::NoRole);
-	_exportFileAction->setShortcut(EXPORT_SHORTCUT);
-	_exportFileAction->setActionGroup(_fileActionGroup);
-	connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
-	addAction(_exportFileAction);
+	_exportPDFFileAction->setMenuRole(QAction::NoRole);
+	_exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT);
+	_exportPDFFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportPDFFileAction, SIGNAL(triggered()), this, SLOT(exportPDFFile()));
+	addAction(_exportPDFFileAction);
+	_exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
+	  tr("Export to PNG..."), this);
+	_exportPNGFileAction->setMenuRole(QAction::NoRole);
+	_exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT);
+	_exportPNGFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportPNGFileAction, SIGNAL(triggered()), this, SLOT(exportPNGFile()));
+	addAction(_exportPNGFileAction);
 	_closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this);
 	_closeFileAction->setMenuRole(QAction::NoRole);
 	_closeFileAction->setShortcut(CLOSE_SHORTCUT);
@@ -243,7 +255,7 @@ void GUI::createActions()
 	_reloadFileAction->setMenuRole(QAction::NoRole);
 	_reloadFileAction->setShortcut(RELOAD_SHORTCUT);
 	_reloadFileAction->setActionGroup(_fileActionGroup);
-	connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile()));
+	connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFiles()));
 	addAction(_reloadFileAction);
 	_statisticsAction = new QAction(tr("Statistics..."), this);
 	_statisticsAction->setMenuRole(QAction::NoRole);
@@ -281,8 +293,10 @@ void GUI::createActions()
 	createPOIFilesActions();
 
 	// Map actions
+	createMapActions();
 	_showMapAction = new QAction(QIcon(SHOW_MAP_ICON), tr("Show map"),
 	  this);
+	_showMapAction->setEnabled(false);
 	_showMapAction->setMenuRole(QAction::NoRole);
 	_showMapAction->setCheckable(true);
 	_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
@@ -294,10 +308,10 @@ void GUI::createActions()
 	_loadMapAction->setMenuRole(QAction::NoRole);
 	connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
 	_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
+	_clearMapCacheAction->setEnabled(false);
 	_clearMapCacheAction->setMenuRole(QAction::NoRole);
 	connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
 	  SLOT(clearMapCache()));
-	createMapActions();
 	_nextMapAction = new QAction(tr("Next map"), this);
 	_nextMapAction->setMenuRole(QAction::NoRole);
 	_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
@@ -308,10 +322,6 @@ void GUI::createActions()
 	_prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
 	connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
 	addAction(_prevMapAction);
-	if (_ml->maps().isEmpty()) {
-		_showMapAction->setEnabled(false);
-		_clearMapCacheAction->setEnabled(false);
-	}
 	_showCoordinatesAction = new QAction(tr("Show cursor coordinates"), this);
 	_showCoordinatesAction->setMenuRole(QAction::NoRole);
 	_showCoordinatesAction->setCheckable(true);
@@ -451,11 +461,11 @@ void GUI::createActions()
 	_degreesMinutesAction->setActionGroup(ag);
 	connect(_degreesMinutesAction, SIGNAL(triggered()), this,
 	  SLOT(setDegreesMinutes()));
-	_DMSAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
-	_DMSAction->setMenuRole(QAction::NoRole);
-	_DMSAction->setCheckable(true);
-	_DMSAction->setActionGroup(ag);
-	connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS()));
+	_dmsAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
+	_dmsAction->setMenuRole(QAction::NoRole);
+	_dmsAction->setCheckable(true);
+	_dmsAction->setActionGroup(ag);
+	connect(_dmsAction, SIGNAL(triggered()), this, SLOT(setDMS()));
 	_fullscreenAction = new QAction(QIcon(FULLSCREEN_ICON),
 	  tr("Fullscreen mode"), this);
 	_fullscreenAction->setMenuRole(QAction::NoRole);
@@ -494,7 +504,8 @@ void GUI::createMenus()
 	fileMenu->addAction(_openFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_printFileAction);
-	fileMenu->addAction(_exportFileAction);
+	fileMenu->addAction(_exportPDFFileAction);
+	fileMenu->addAction(_exportPNGFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_statisticsAction);
 	fileMenu->addSeparator();
@@ -506,7 +517,7 @@ void GUI::createMenus()
 #endif // Q_OS_MAC
 
 	_mapMenu = menuBar()->addMenu(tr("&Map"));
-	_mapMenu->addActions(_mapActions);
+	_mapMenu->addActions(_mapsActionGroup->actions());
 	_mapsEnd = _mapMenu->addSeparator();
 	_mapMenu->addAction(_loadMapAction);
 	_mapMenu->addAction(_clearMapCacheAction);
@@ -559,7 +570,7 @@ void GUI::createMenus()
 	QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format"));
 	coordinatesMenu->addAction(_decimalDegreesAction);
 	coordinatesMenu->addAction(_degreesMinutesAction);
-	coordinatesMenu->addAction(_DMSAction);
+	coordinatesMenu->addAction(_dmsAction);
 	settingsMenu->addSeparator();
 	settingsMenu->addAction(_showToolbarsAction);
 	settingsMenu->addAction(_fullscreenAction);
@@ -608,6 +619,7 @@ void GUI::createToolBars()
 
 void GUI::createMapView()
 {
+	_map = new EmptyMap(this);
 	_mapView = new MapView(_map, _poi, this);
 	_mapView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 	  QSizePolicy::Expanding));
@@ -787,7 +799,12 @@ bool GUI::loadFile(const QString &fileName)
 			_trackDistance += track.distance();
 			_time += track.time();
 			_movingTime += track.movingTime();
-			const QDate &date = track.date().date();
+#ifdef ENABLE_TIMEZONES
+			const QDateTime date = track.date().toTimeZone(
+			  _options.timeZone.zone());
+#else // ENABLE_TIMEZONES
+			const QDateTime &date = track.date();
+#endif // ENABLE_TIMEZONES
 			if (_dateRange.first.isNull() || _dateRange.first > date)
 				_dateRange.first = date;
 			if (_dateRange.second.isNull() || _dateRange.second < date)
@@ -905,16 +922,21 @@ void GUI::openOptions()
 		Track::action(options.option); \
 		reload = true; \
 	}
-#define SET_DATA_OPTION(option, action) \
+#define SET_ROUTE_OPTION(option, action) \
 	if (options.option != _options.option) { \
-		Data::action(options.option); \
+		Route::action(options.option); \
+		reload = true; \
+	}
+#define SET_WAYPOINT_OPTION(option, action) \
+	if (options.option != _options.option) { \
+		Waypoint::action(options.option); \
 		reload = true; \
 	}
 
 	Options options(_options);
 	bool reload = false;
 
-	OptionsDialog dialog(&options, this);
+	OptionsDialog dialog(options, _units, this);
 	if (dialog.exec() != QDialog::Accepted)
 		return;
 
@@ -949,16 +971,23 @@ void GUI::openOptions()
 	SET_TRACK_OPTION(cadenceFilter, setCadenceFilter);
 	SET_TRACK_OPTION(powerFilter, setPowerFilter);
 	SET_TRACK_OPTION(outlierEliminate, setOutlierElimination);
+	SET_TRACK_OPTION(automaticPause, setAutomaticPause);
 	SET_TRACK_OPTION(pauseSpeed, setPauseSpeed);
 	SET_TRACK_OPTION(pauseInterval, setPauseInterval);
 	SET_TRACK_OPTION(useReportedSpeed, useReportedSpeed);
+	SET_TRACK_OPTION(dataUseDEM, useDEM);
+	SET_TRACK_OPTION(showSecondaryElevation, showSecondaryElevation);
+	SET_TRACK_OPTION(showSecondarySpeed, showSecondarySpeed);
+	SET_TRACK_OPTION(useSegments, useSegments);
 
-	SET_DATA_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(showSecondaryElevation, showSecondaryElevation);
+
+	SET_WAYPOINT_OPTION(dataUseDEM, useDEM);
+	SET_WAYPOINT_OPTION(showSecondaryElevation, showSecondaryElevation);
 
 	if (options.poiRadius != _options.poiRadius)
 		_poi->setRadius(options.poiRadius);
-	if (options.poiUseDEM != _options.poiUseDEM)
-		_poi->useDEM(options.poiUseDEM);
 
 	if (options.pixmapCache != _options.pixmapCache)
 		QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
@@ -975,9 +1004,16 @@ void GUI::openOptions()
 		_mapView->setDevicePixelRatio(devicePixelRatioF(),
 		  options.hidpiMap ? devicePixelRatioF() : 1.0);
 #endif // ENABLE_HIDPI
+#ifdef ENABLE_TIMEZONES
+	if (options.timeZone != _options.timeZone) {
+		_mapView->setTimeZone(options.timeZone.zone());
+		_dateRange.first = _dateRange.first.toTimeZone(options.timeZone.zone());
+		_dateRange.second = _dateRange.second.toTimeZone(options.timeZone.zone());
+	}
+#endif // ENABLE_TIMEZONES
 
 	if (reload)
-		reloadFile();
+		reloadFiles();
 
 	_options = options;
 }
@@ -991,9 +1027,9 @@ void GUI::printFile()
 		plot(&printer);
 }
 
-void GUI::exportFile()
+void GUI::exportPDFFile()
 {
-	ExportDialog dialog(&_export, this);
+	PDFExportDialog dialog(_pdfExport, _units, this);
 	if (dialog.exec() != QDialog::Accepted)
 		return;
 
@@ -1001,16 +1037,53 @@ void GUI::exportFile()
 	printer.setOutputFormat(QPrinter::PdfFormat);
 	printer.setCreator(QString(APP_NAME) + QString(" ")
 	  + QString(APP_VERSION));
-	printer.setResolution(_export.resolution);
-	printer.setOrientation(_export.orientation);
-	printer.setOutputFileName(_export.fileName);
-	printer.setPaperSize(_export.paperSize);
-	printer.setPageMargins(_export.margins.left(), _export.margins.top(),
-	  _export.margins.right(), _export.margins.bottom(), QPrinter::Millimeter);
+	printer.setResolution(_pdfExport.resolution);
+	printer.setOrientation(_pdfExport.orientation);
+	printer.setOutputFileName(_pdfExport.fileName);
+	printer.setPaperSize(_pdfExport.paperSize);
+	printer.setPageMargins(_pdfExport.margins.left(), _pdfExport.margins.top(),
+	  _pdfExport.margins.right(), _pdfExport.margins.bottom(),
+	  QPrinter::Millimeter);
 
 	plot(&printer);
 }
 
+void GUI::exportPNGFile()
+{
+	PNGExportDialog dialog(_pngExport, this);
+	if (dialog.exec() != QDialog::Accepted)
+		return;
+
+	QImage img(_pngExport.size, QImage::Format_ARGB32_Premultiplied);
+	QPainter p(&img);
+	QRectF rect(0, 0, img.width(), img.height());
+	QRectF contentRect(rect.adjusted(_pngExport.margins.left(),
+	  _pngExport.margins.top(), -_pngExport.margins.right(),
+	  -_pngExport.margins.bottom()));
+
+	if (_pngExport.antialiasing)
+		p.setRenderHint(QPainter::Antialiasing);
+	p.fillRect(rect, Qt::white);
+	plotMainPage(&p, contentRect, 1.0, true);
+	img.save(_pngExport.fileName);
+
+	if (!_tabs.isEmpty() && _options.separateGraphPage) {
+		QImage img2(_pngExport.size.width(), (int)graphPlotHeight(rect, 1)
+		  + _pngExport.margins.bottom(), QImage::Format_ARGB32_Premultiplied);
+		QPainter p2(&img2);
+		QRectF rect2(0, 0, img2.width(), img2.height());
+
+		if (_pngExport.antialiasing)
+			p2.setRenderHint(QPainter::Antialiasing);
+		p2.fillRect(rect2, Qt::white);
+		plotGraphsPage(&p2, contentRect, 1);
+
+		QFileInfo fi(_pngExport.fileName);
+		img2.save(fi.absolutePath() + "/" + fi.baseName() + "-graphs."
+		  + fi.suffix());
+	}
+}
+
 void GUI::statistics()
 {
 	QLocale l(QLocale::system());
@@ -1066,7 +1139,7 @@ void GUI::statistics()
 
 		text.append("<tr><th colspan=\"2\">" + tab->label() + "</th></tr>");
 		for (int j = 0; j < tab->info().size(); j++) {
-			const KV &kv = tab->info().at(j);
+			const KV<QString, QString> &kv = tab->info().at(j);
 			text.append("<tr><td>" + kv.key() + ":</td><td>" + kv.value()
 			  + "</td></tr>");
 		}
@@ -1082,12 +1155,13 @@ void GUI::statistics()
 	msgBox.exec();
 }
 
-void GUI::plot(QPrinter *printer)
+void GUI::plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+  bool expand)
 {
 	QLocale l(QLocale::system());
-	QPainter p(printer);
 	TrackInfo info;
-	qreal ih, gh, mh, ratio;
+	qreal ih, gh, mh;
+	int sc;
 
 
 	if (!_pathName.isNull() && _options.printName)
@@ -1123,54 +1197,92 @@ void GUI::plot(QPrinter *printer)
 	if (movingTime() > 0 && _options.printMovingTime)
 		info.insert(tr("Moving time"), Format::timeSpan(movingTime()));
 
-	qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
-	  / (qreal)printer->resolution());
-	ratio = p.paintEngine()->paintDevice()->logicalDpiX() / fsr;
 	if (info.isEmpty()) {
 		ih = 0;
 		mh = 0;
 	} else {
 		ih = info.contentSize().height() * ratio;
 		mh = ih / 2;
-		info.plot(&p, QRectF(0, 0, printer->width(), ih), ratio);
+		info.plot(painter, QRectF(rect.x(), rect.y(), rect.width(), ih), ratio);
 	}
 	if (_graphTabWidget->isVisible() && !_options.separateGraphPage) {
-		qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height()));
-		gh = (printer->width() > printer->height())
-		  ? 0.15 * r * (printer->height() - ih - 2*mh)
-		  : 0.15 * (printer->height() - ih - 2*mh);
+		qreal r = rect.width() / rect.height();
+		gh = (rect.width() > rect.height())
+		  ? 0.15 * r * (rect.height() - ih - 2*mh)
+		  : 0.15 * (rect.height() - ih - 2*mh);
+		if (gh < 150)
+			gh = 150;
+		sc = 2;
 		GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget());
-		gt->plot(&p,  QRectF(0, printer->height() - gh, printer->width(), gh),
-		  ratio);
-	} else
+		gt->plot(painter,  QRectF(rect.x(), rect.y() + rect.height() - gh,
+		  rect.width(), gh), ratio);
+	} else {
 		gh = 0;
-	_mapView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
-	  - (ih + 2*mh + gh)), ratio, _options.hiresPrint);
+		sc = 1;
+	}
 
-	if (_graphTabWidget->isVisible() && _options.separateGraphPage) {
-		printer->newPage();
+	MapView::PlotFlags flags = MapView::NoFlags;
+	if (_options.hiresPrint)
+		flags |= MapView::HiRes;
+	if (expand)
+		flags |= MapView::Expand;
 
-		int cnt = 0;
-		for (int i = 0; i < _tabs.size(); i++)
-			if (!_tabs.at(i)->isEmpty())
-				cnt++;
+	_mapView->plot(painter, QRectF(rect.x(), rect.y() + ih + mh, rect.width(),
+	  rect.height() - (ih + sc*mh + gh)), ratio, flags);
+}
 
-		qreal sp = ratio * 20;
-		gh = qMin((printer->height() - ((cnt - 1) * sp))/(qreal)cnt,
-		  0.20 * printer->height());
+void GUI::plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio)
+{
+	int cnt = 0;
+	for (int i = 0; i < _tabs.size(); i++)
+		if (!_tabs.at(i)->isEmpty())
+			cnt++;
 
-		qreal y = 0;
-		for (int i = 0; i < _tabs.size(); i++) {
-			if (!_tabs.at(i)->isEmpty()) {
-				_tabs.at(i)->plot(&p,  QRectF(0, y, printer->width(), gh),
-				  ratio);
-				y += gh + sp;
-			}
+	qreal sp = ratio * 20;
+	qreal gh = qMin((rect.height() - ((cnt - 1) * sp))/(qreal)cnt,
+	  0.20 * rect.height());
+
+	qreal y = 0;
+	for (int i = 0; i < _tabs.size(); i++) {
+		if (!_tabs.at(i)->isEmpty()) {
+			_tabs.at(i)->plot(painter,  QRectF(rect.x(), rect.y() + y,
+			  rect.width(), gh), ratio);
+			y += gh + sp;
 		}
 	}
 }
 
-void GUI::reloadFile()
+qreal GUI::graphPlotHeight(const QRectF &rect, qreal ratio)
+{
+	int cnt = 0;
+	for (int i = 0; i < _tabs.size(); i++)
+		if (!_tabs.at(i)->isEmpty())
+			cnt++;
+
+	qreal sp = ratio * 20;
+	qreal gh = qMin((rect.height() - ((cnt - 1) * sp))/(qreal)cnt,
+	  0.20 * rect.height());
+
+	return cnt * gh + (cnt - 1) * sp;
+}
+
+void GUI::plot(QPrinter *printer)
+{
+	QPainter p(printer);
+	qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
+	  / (qreal)printer->resolution());
+	qreal ratio = p.paintEngine()->paintDevice()->logicalDpiX() / fsr;
+	QRectF rect(0, 0, printer->width(), printer->height());
+
+	plotMainPage(&p, rect, ratio);
+
+	if (!_tabs.isEmpty() && _options.separateGraphPage) {
+		printer->newPage();
+		plotGraphsPage(&p, rect, ratio);
+	}
+}
+
+void GUI::reloadFiles()
 {
 	_trackCount = 0;
 	_routeCount = 0;
@@ -1180,7 +1292,7 @@ void GUI::reloadFile()
 	_routeDistance = 0;
 	_time = 0;
 	_movingTime = 0;
-	_dateRange = DateRange(QDate(), QDate());
+	_dateRange = DateTimeRange(QDateTime(), QDateTime());
 	_pathName = QString();
 
 	for (int i = 0; i < _tabs.count(); i++)
@@ -1214,7 +1326,7 @@ void GUI::closeFiles()
 	_routeDistance = 0;
 	_time = 0;
 	_movingTime = 0;
-	_dateRange = DateRange(QDate(), QDate());
+	_dateRange = DateTimeRange(QDateTime(), QDateTime());
 	_pathName = QString();
 
 	_sliderPos = 0;
@@ -1321,22 +1433,49 @@ void GUI::loadMap()
 
 bool GUI::loadMap(const QString &fileName)
 {
+	// On OS X fileName may be a directory!
+
 	if (fileName.isEmpty())
 		return false;
 
-	if (_ml->loadFile(fileName)) {
-		QAction *a = createMapAction(_ml->maps().last());
+	QString error;
+	QList<Map*> maps = MapList::loadMaps(fileName, error);
+	if (maps.isEmpty()) {
+		error = tr("Error loading map:") + "\n\n"
+		  + fileName + "\n\n" + error;
+		QMessageBox::critical(this, APP_NAME, error);
+		return false;
+	}
+
+	for (int i = 0; i < maps.size(); i++) {
+		Map *map = maps.at(i);
+		MapAction *a = createMapAction(map);
 		_mapMenu->insertAction(_mapsEnd, a);
+		if (map->isReady()) {
+			a->trigger();
+			_showMapAction->setEnabled(true);
+			_clearMapCacheAction->setEnabled(true);
+		} else
+			connect(a, SIGNAL(loaded()), this, SLOT(mapLoaded()));
+	}
+
+	return true;
+}
+
+void GUI::mapLoaded()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		action->trigger();
 		_showMapAction->setEnabled(true);
 		_clearMapCacheAction->setEnabled(true);
-		a->trigger();
-		return true;
 	} else {
 		QString error = tr("Error loading map:") + "\n\n"
-		  + fileName + "\n\n" + _ml->errorString();
+		  + map->name() + "\n\n" + map->errorString();
 		QMessageBox::critical(this, APP_NAME, error);
-
-		return false;
+		action->deleteLater();
 	}
 }
 
@@ -1378,31 +1517,42 @@ void GUI::updateWindowTitle()
 		setWindowTitle(APP_NAME);
 }
 
-void GUI::mapChanged(int index)
+void GUI::mapChanged()
 {
-	_map = _ml->maps().at(index);
+	_map = _mapsActionGroup->checkedAction()->data().value<Map*>();
 	_mapView->setMap(_map);
 }
 
 void GUI::nextMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;
 
-	int next = (_ml->maps().indexOf(_map) + 1) % _ml->maps().count();
-	_mapActions.at(next)->setChecked(true);
-	mapChanged(next);
+	QList<QAction*> maps = _mapsActionGroup->actions();
+	for (int i = 1;	i < maps.size(); i++) {
+		int next = (maps.indexOf(checked) + i) % maps.count();
+		if (maps.at(next)->isEnabled()) {
+			maps.at(next)->trigger();
+			break;
+		}
+	}
 }
 
 void GUI::prevMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;
 
-	int prev = (_ml->maps().indexOf(_map) + _ml->maps().count() - 1)
-	  % _ml->maps().count();
-	_mapActions.at(prev)->setChecked(true);
-	mapChanged(prev);
+	QList<QAction*> maps = _mapsActionGroup->actions();
+	for (int i = 1; i < maps.size(); i++) {
+		int prev = (maps.indexOf(checked) + maps.count() - i) % maps.count();
+		if (maps.at(prev)->isEnabled()) {
+			maps.at(prev)->trigger();
+			break;
+		}
+	}
 }
 
 void GUI::poiFileChecked(int index)
@@ -1486,8 +1636,7 @@ void GUI::setTimeType(TimeType type)
 
 void GUI::setUnits(Units units)
 {
-	_export.units = units;
-	_options.units = units;
+	_units = units;
 
 	_mapView->setUnits(units);
 	for (int i = 0; i <_tabs.count(); i++)
@@ -1580,7 +1729,6 @@ void GUI::keyPressEvent(QKeyEvent *event)
 			else
 				_movingTimeAction->trigger();
 			break;
-
 		case Qt::Key_Escape:
 			if (_fullscreenAction->isChecked()) {
 				_fullscreenAction->setChecked(false);
@@ -1655,7 +1803,7 @@ void GUI::writeSettings()
 	  : _nauticalUnitsAction->isChecked() ? Nautical : Metric;
 	if (units != UNITS_DEFAULT)
 		settings.setValue(UNITS_SETTING, units);
-	CoordinatesFormat format = _DMSAction->isChecked() ? DMS
+	CoordinatesFormat format = _dmsAction->isChecked() ? DMS
 	  : _degreesMinutesAction->isChecked() ? DegreesMinutes : DecimalDegrees;
 	if (format != COORDINATES_DEFAULT)
 		settings.setValue(COORDINATES_SETTING, format);
@@ -1731,23 +1879,42 @@ void GUI::writeSettings()
 		  _showTicksAction->isChecked());
 	settings.endGroup();
 
-	settings.beginGroup(EXPORT_SETTINGS_GROUP);
-	if (_export.orientation != PAPER_ORIENTATION_DEFAULT)
-		settings.setValue(PAPER_ORIENTATION_SETTING, _export.orientation);
-	if (_export.resolution != RESOLUTION_DEFAULT)
-		settings.setValue(RESOLUTION_SETTING, _export.resolution);
-	if (_export.paperSize != PAPER_SIZE_DEFAULT)
-		settings.setValue(PAPER_SIZE_SETTING, _export.paperSize);
-	if (_export.margins.left() != MARGIN_LEFT_DEFAULT)
-		settings.setValue(MARGIN_LEFT_SETTING, _export.margins.left());
-	if (_export.margins.top() != MARGIN_TOP_DEFAULT)
-		settings.setValue(MARGIN_TOP_SETTING, _export.margins.top());
-	if (_export.margins.right() != MARGIN_RIGHT_DEFAULT)
-		settings.setValue(MARGIN_RIGHT_SETTING, _export.margins.right());
-	if (_export.margins.bottom() != MARGIN_BOTTOM_DEFAULT)
-		settings.setValue(MARGIN_BOTTOM_SETTING, _export.margins.bottom());
-	if (_export.fileName != EXPORT_FILENAME_DEFAULT)
-		settings.setValue(EXPORT_FILENAME_SETTING, _export.fileName);
+	settings.beginGroup(PDF_EXPORT_SETTINGS_GROUP);
+	if (_pdfExport.orientation != PAPER_ORIENTATION_DEFAULT)
+		settings.setValue(PAPER_ORIENTATION_SETTING, _pdfExport.orientation);
+	if (_pdfExport.resolution != RESOLUTION_DEFAULT)
+		settings.setValue(RESOLUTION_SETTING, _pdfExport.resolution);
+	if (_pdfExport.paperSize != PAPER_SIZE_DEFAULT)
+		settings.setValue(PAPER_SIZE_SETTING, _pdfExport.paperSize);
+	if (_pdfExport.margins.left() != PDF_MARGIN_LEFT_DEFAULT)
+		settings.setValue(PDF_MARGIN_LEFT_SETTING, _pdfExport.margins.left());
+	if (_pdfExport.margins.top() != PDF_MARGIN_TOP_DEFAULT)
+		settings.setValue(PDF_MARGIN_TOP_SETTING, _pdfExport.margins.top());
+	if (_pdfExport.margins.right() != PDF_MARGIN_RIGHT_DEFAULT)
+		settings.setValue(PDF_MARGIN_RIGHT_SETTING, _pdfExport.margins.right());
+	if (_pdfExport.margins.bottom() != PDF_MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(PDF_MARGIN_BOTTOM_SETTING, _pdfExport.margins.bottom());
+	if (_pdfExport.fileName != PDF_FILENAME_DEFAULT)
+		settings.setValue(PDF_FILENAME_SETTING, _pdfExport.fileName);
+	settings.endGroup();
+
+	settings.beginGroup(PNG_EXPORT_SETTINGS_GROUP);
+	if (_pngExport.size.width() != PNG_WIDTH_DEFAULT)
+		settings.setValue(PNG_WIDTH_SETTING, _pngExport.size.width());
+	if (_pngExport.size.height() != PNG_HEIGHT_DEFAULT)
+		settings.setValue(PNG_HEIGHT_SETTING, _pngExport.size.height());
+	if (_pngExport.margins.left() != PNG_MARGIN_LEFT_DEFAULT)
+		settings.setValue(PNG_MARGIN_LEFT_SETTING, _pngExport.margins.left());
+	if (_pngExport.margins.top() != PNG_MARGIN_TOP_DEFAULT)
+		settings.setValue(PNG_MARGIN_TOP_SETTING, _pngExport.margins.top());
+	if (_pngExport.margins.right() != PNG_MARGIN_RIGHT_DEFAULT)
+		settings.setValue(PNG_MARGIN_RIGHT_SETTING, _pngExport.margins.right());
+	if (_pngExport.margins.bottom() != PNG_MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(PNG_MARGIN_BOTTOM_SETTING, _pngExport.margins.bottom());
+	if (_pngExport.antialiasing != PNG_ANTIALIASING_DEFAULT)
+		settings.setValue(PNG_ANTIALIASING_SETTING, _pngExport.antialiasing);
+	if (_pngExport.fileName != PNG_FILENAME_DEFAULT)
+		settings.setValue(PNG_FILENAME_SETTING, _pngExport.fileName);
 	settings.endGroup();
 
 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
@@ -1799,6 +1966,8 @@ void GUI::writeSettings()
 		settings.setValue(POWER_FILTER_SETTING, _options.powerFilter);
 	if (_options.outlierEliminate != OUTLIER_ELIMINATE_DEFAULT)
 		settings.setValue(OUTLIER_ELIMINATE_SETTING, _options.outlierEliminate);
+	if (_options.automaticPause != AUTOMATIC_PAUSE_DEFAULT)
+		settings.setValue(AUTOMATIC_PAUSE_SETTING, _options.automaticPause);
 	if (_options.pauseSpeed != PAUSE_SPEED_DEFAULT)
 		settings.setValue(PAUSE_SPEED_SETTING, _options.pauseSpeed);
 	if (_options.pauseInterval != PAUSE_INTERVAL_DEFAULT)
@@ -1807,10 +1976,21 @@ void GUI::writeSettings()
 		settings.setValue(USE_REPORTED_SPEED_SETTING, _options.useReportedSpeed);
 	if (_options.dataUseDEM != DATA_USE_DEM_DEFAULT)
 		settings.setValue(DATA_USE_DEM_SETTING, _options.dataUseDEM);
+	if (_options.showSecondaryElevation != SHOW_SECONDARY_ELEVATION_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_ELEVATION_SETTING,
+		  _options.showSecondaryElevation);
+	if (_options.showSecondarySpeed != SHOW_SECONDARY_SPEED_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_SPEED_SETTING,
+		  _options.showSecondarySpeed);
+#ifdef ENABLE_TIMEZONES
+	if (_options.timeZone != TimeZoneInfo())
+		settings.setValue(TIME_ZONE_SETTING, QVariant::fromValue(
+		  _options.timeZone));
+#endif // ENABLE_TIMEZONES
+	if (_options.useSegments != USE_SEGMENTS_DEFAULT)
+		settings.setValue(USE_SEGMENTS_SETTING, _options.useSegments);
 	if (_options.poiRadius != POI_RADIUS_DEFAULT)
 		settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
-	if (_options.poiUseDEM != POI_USE_DEM_DEFAULT)
-		settings.setValue(POI_USE_DEM_SETTING, _options.poiUseDEM);
 	if (_options.useOpenGL != USE_OPENGL_DEFAULT)
 		settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
 #ifdef ENABLE_HTTP2
@@ -1877,7 +2057,7 @@ void GUI::readSettings()
 
 	value = settings.value(COORDINATES_SETTING, COORDINATES_DEFAULT).toInt();
 	if (value == DMS)
-		_DMSAction->trigger();
+		_dmsAction->trigger();
 	else if (value == DegreesMinutes)
 		_degreesMinutesAction->trigger();
 	else
@@ -1894,9 +2074,11 @@ void GUI::readSettings()
 		_showMapAction->setChecked(true);
 	else
 		_mapView->showMap(false);
-	if (_ml->maps().count()) {
-		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
-		_mapActions.at(index)->trigger();
+	QAction *ma = mapAction(settings.value(CURRENT_MAP_SETTING).toString());
+	if (ma) {
+		ma->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
 	}
 	if (settings.value(SHOW_COORDINATES_SETTING, SHOW_COORDINATES_DEFAULT)
 	  .toBool()) {
@@ -1998,23 +2180,42 @@ void GUI::readSettings()
 	}
 	settings.endGroup();
 
-	settings.beginGroup(EXPORT_SETTINGS_GROUP);
-	_export.orientation = (QPrinter::Orientation) settings.value(
+	settings.beginGroup(PDF_EXPORT_SETTINGS_GROUP);
+	_pdfExport.orientation = (QPrinter::Orientation) settings.value(
 	  PAPER_ORIENTATION_SETTING, PAPER_ORIENTATION_DEFAULT).toInt();
-	_export.resolution = settings.value(RESOLUTION_SETTING, RESOLUTION_DEFAULT)
+	_pdfExport.resolution = settings.value(RESOLUTION_SETTING,
+	  RESOLUTION_DEFAULT).toInt();
+	_pdfExport.paperSize = (QPrinter::PaperSize) settings.value(
+	  PAPER_SIZE_SETTING, PAPER_SIZE_DEFAULT).toInt();
+	qreal ml = settings.value(PDF_MARGIN_LEFT_SETTING, PDF_MARGIN_LEFT_DEFAULT)
+	  .toReal();
+	qreal mt = settings.value(PDF_MARGIN_TOP_SETTING, PDF_MARGIN_TOP_DEFAULT)
+	  .toReal();
+	qreal mr = settings.value(PDF_MARGIN_RIGHT_SETTING,
+	  PDF_MARGIN_RIGHT_DEFAULT).toReal();
+	qreal mb = settings.value(PDF_MARGIN_BOTTOM_SETTING,
+	  PDF_MARGIN_BOTTOM_DEFAULT).toReal();
+	_pdfExport.margins = MarginsF(ml, mt, mr, mb);
+	_pdfExport.fileName = settings.value(PDF_FILENAME_SETTING,
+	 PDF_FILENAME_DEFAULT).toString();
+	settings.endGroup();
+
+	settings.beginGroup(PNG_EXPORT_SETTINGS_GROUP);
+	_pngExport.size = QSize(settings.value(PNG_WIDTH_SETTING, PNG_WIDTH_DEFAULT)
+	  .toInt(), settings.value(PNG_HEIGHT_SETTING, PNG_HEIGHT_DEFAULT).toInt());
+	int mli = settings.value(PNG_MARGIN_LEFT_SETTING, PNG_MARGIN_LEFT_DEFAULT)
 	  .toInt();
-	_export.paperSize = (QPrinter::PaperSize) settings.value(PAPER_SIZE_SETTING,
-	  PAPER_SIZE_DEFAULT).toInt();
-	qreal ml = settings.value(MARGIN_LEFT_SETTING, MARGIN_LEFT_DEFAULT)
-	  .toReal();
-	qreal mt = settings.value(MARGIN_TOP_SETTING, MARGIN_TOP_DEFAULT).toReal();
-	qreal mr = settings.value(MARGIN_RIGHT_SETTING, MARGIN_RIGHT_DEFAULT)
-	  .toReal();
-	qreal mb = settings.value(MARGIN_BOTTOM_SETTING, MARGIN_BOTTOM_DEFAULT)
-	  .toReal();
-	_export.margins = MarginsF(ml, mt, mr, mb);
-	_export.fileName = settings.value(EXPORT_FILENAME_SETTING,
-	 EXPORT_FILENAME_DEFAULT).toString();
+	int mti = settings.value(PNG_MARGIN_TOP_SETTING, PNG_MARGIN_TOP_DEFAULT)
+	  .toInt();
+	int mri = settings.value(PNG_MARGIN_RIGHT_SETTING, PNG_MARGIN_RIGHT_DEFAULT)
+	  .toInt();
+	int mbi = settings.value(PNG_MARGIN_BOTTOM_SETTING, PNG_MARGIN_BOTTOM_DEFAULT)
+	  .toInt();
+	_pngExport.margins = QMargins(mli, mti, mri, mbi);
+	_pngExport.antialiasing = settings.value(PNG_ANTIALIASING_SETTING,
+	  PNG_ANTIALIASING_DEFAULT).toBool();
+	_pngExport.fileName = settings.value(PNG_FILENAME_SETTING,
+	  PNG_FILENAME_DEFAULT).toString();
 	settings.endGroup();
 
 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
@@ -2073,12 +2274,23 @@ void GUI::readSettings()
 	  USE_REPORTED_SPEED_DEFAULT).toBool();
 	_options.dataUseDEM = settings.value(DATA_USE_DEM_SETTING,
 	  DATA_USE_DEM_DEFAULT).toBool();
+	_options.showSecondaryElevation = settings.value(
+	  SHOW_SECONDARY_ELEVATION_SETTING,
+	  SHOW_SECONDARY_ELEVATION_DEFAULT).toBool();
+	_options.showSecondarySpeed = settings.value(
+	  SHOW_SECONDARY_SPEED_SETTING,
+	  SHOW_SECONDARY_SPEED_DEFAULT).toBool();
+#ifdef ENABLE_TIMEZONES
+	_options.timeZone = settings.value(TIME_ZONE_SETTING).value<TimeZoneInfo>();
+#endif // ENABLE_TIMEZONES
+	_options.useSegments = settings.value(USE_SEGMENTS_SETTING,
+	  USE_SEGMENTS_DEFAULT).toBool();
+	_options.automaticPause = settings.value(AUTOMATIC_PAUSE_SETTING,
+	  AUTOMATIC_PAUSE_DEFAULT).toBool();
 	_options.pauseInterval = settings.value(PAUSE_INTERVAL_SETTING,
 	  PAUSE_INTERVAL_DEFAULT).toInt();
 	_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
 	  .toInt();
-	_options.poiUseDEM = settings.value(POI_USE_DEM_SETTING,
-	  POI_USE_DEM_DEFAULT).toBool();
 	_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
 	  .toBool();
 #ifdef ENABLE_HTTP2
@@ -2137,6 +2349,9 @@ void GUI::readSettings()
 	  _options.hidpiMap ? devicePixelRatioF() : 1.0);
 #endif // ENABLE_HIDPI
 	_mapView->setProjection(_options.projection);
+#ifdef ENABLE_TIMEZONES
+	_mapView->setTimeZone(_options.timeZone.zone());
+#endif // ENABLE_TIMEZONES
 
 	for (int i = 0; i < _tabs.count(); i++) {
 		_tabs.at(i)->setPalette(_options.palette);
@@ -2154,24 +2369,43 @@ void GUI::readSettings()
 	Track::setCadenceFilter(_options.cadenceFilter);
 	Track::setPowerFilter(_options.powerFilter);
 	Track::setOutlierElimination(_options.outlierEliminate);
+	Track::setAutomaticPause(_options.automaticPause);
 	Track::setPauseSpeed(_options.pauseSpeed);
 	Track::setPauseInterval(_options.pauseInterval);
 	Track::useReportedSpeed(_options.useReportedSpeed);
-	Data::useDEM(_options.dataUseDEM);
+	Track::useDEM(_options.dataUseDEM);
+	Track::showSecondaryElevation(_options.showSecondaryElevation);
+	Track::showSecondarySpeed(_options.showSecondarySpeed);
+	Track::useSegments(_options.useSegments);
+	Route::useDEM(_options.dataUseDEM);
+	Route::showSecondaryElevation(_options.showSecondaryElevation);
+	Waypoint::useDEM(_options.dataUseDEM);
+	Waypoint::showSecondaryElevation(_options.showSecondaryElevation);
 
 	_poi->setRadius(_options.poiRadius);
-	_poi->useDEM(_options.poiUseDEM);
 
 	QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
 
 	settings.endGroup();
 }
 
-int GUI::mapIndex(const QString &name)
+QAction *GUI::mapAction(const QString &name)
 {
-	for (int i = 0; i < _ml->maps().count(); i++)
-		if (_ml->maps().at(i)->name() == name)
-			return i;
+	QList<QAction *> maps = _mapsActionGroup->actions();
+
+	// Last map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->name() == name && map->isReady())
+			return maps.at(i);
+	}
+
+	// Any usable map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->isReady())
+			return maps.at(i);
+	}
 
 	return 0;
 }

src/GUI/gui.h

@@ -10,7 +10,8 @@
 #include "units.h"
 #include "timetype.h"
 #include "format.h"
-#include "exportdialog.h"
+#include "pdfexportdialog.h"
+#include "pngexportdialog.h"
 #include "optionsdialog.h"
 
 class QMenu;
@@ -26,9 +27,9 @@ class FileBrowser;
 class GraphTab;
 class MapView;
 class Map;
-class MapList;
 class POI;
 class QScreen;
+class MapAction;
 
 class GUI : public QMainWindow
 {
@@ -45,10 +46,11 @@ private slots:
 	void keys();
 	void paths();
 	void printFile();
-	void exportFile();
+	void exportPDFFile();
+	void exportPNGFile();
 	void openFile();
 	void closeAll();
-	void reloadFile();
+	void reloadFiles();
 	void statistics();
 	void openPOIFile();
 	void closePOIFiles();
@@ -64,7 +66,7 @@ private slots:
 	void prevMap();
 	void openOptions();
 
-	void mapChanged(int);
+	void mapChanged();
 	void graphChanged(int);
 	void poiFileChecked(int);
 
@@ -88,16 +90,22 @@ private slots:
 	void screenChanged(QScreen *screen);
 	void logicalDotsPerInchChanged(qreal dpi);
 
-private:
-	typedef QPair<QDate, QDate> DateRange;
+	void mapLoaded();
+	void mapInitialized();
+
+private:
+	typedef QPair<QDateTime, QDateTime> DateTimeRange;
 
-	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
 	void plot(QPrinter *printer);
+	void plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+	  bool expand = false);
+	void plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio);
+	qreal graphPlotHeight(const QRectF &rect, qreal ratio);
 
 	QAction *createPOIFileAction(const QString &fileName);
-	QAction *createMapAction(const Map *map);
+	MapAction *createMapAction(Map *map);
 	void createPOIFilesActions();
 	void createMapActions();
 	void createActions();
@@ -111,7 +119,6 @@ private:
 	bool openPOIFile(const QString &fileName);
 	bool loadFile(const QString &fileName);
 	bool loadMap(const QString &fileName);
-	void exportFile(const QString &fileName);
 	void updateStatusBarInfo();
 	void updateWindowTitle();
 	void updateNavigationActions();
@@ -127,7 +134,7 @@ private:
 	qreal distance() const;
 	qreal time() const;
 	qreal movingTime() const;
-	int mapIndex(const QString &name);
+	QAction *mapAction(const QString &name);
 	void readSettings();
 	void writeSettings();
 
@@ -151,7 +158,8 @@ private:
 	QAction *_aboutAction;
 	QAction *_aboutQtAction;
 	QAction *_printFileAction;
-	QAction *_exportFileAction;
+	QAction *_exportPDFFileAction;
+	QAction *_exportPNGFileAction;
 	QAction *_openFileAction;
 	QAction *_closeFileAction;
 	QAction *_reloadFileAction;
@@ -180,7 +188,7 @@ private:
 	QAction *_nauticalUnitsAction;
 	QAction *_decimalDegreesAction;
 	QAction *_degreesMinutesAction;
-	QAction *_DMSAction;
+	QAction *_dmsAction;
 	QAction *_totalTimeAction;
 	QAction *_movingTimeAction;
 	QAction *_nextMapAction;
@@ -196,11 +204,9 @@ private:
 	QAction *_showCoordinatesAction;
 	QAction *_openOptionsAction;
 	QAction *_mapsEnd;
-	QList<QAction*> _mapActions;
-	QList<QAction*> _poiFilesActions;
 
+	QList<QAction*> _poiFilesActions;
 	QSignalMapper *_poiFilesSignalMapper;
-	QSignalMapper *_mapsSignalMapper;
 
 	QLabel *_fileNameLabel;
 	QLabel *_distanceLabel;
@@ -212,7 +218,6 @@ private:
 	QList<GraphTab*> _tabs;
 
 	POI *_poi;
-	MapList *_ml;
 	Map *_map;
 
 	FileBrowser *_browser;
@@ -221,7 +226,7 @@ private:
 	int _trackCount, _routeCount, _areaCount, _waypointCount;
 	qreal _trackDistance, _routeDistance;
 	qreal _time, _movingTime;
-	DateRange _dateRange;
+	DateTimeRange _dateRange;
 	QString _pathName;
 
 	qreal _sliderPos;
@@ -229,10 +234,13 @@ private:
 	QList<QByteArray> _windowStates;
 	int _frameStyle;
 
-	Export _export;
+	PDFExport _pdfExport;
+	PNGExport _pngExport;
 	Options _options;
 
 	QString _dataDir, _mapDir, _poiDir;
+
+	Units _units;
 };
 
 #endif // GUI_H

src/GUI/heartrategraph.cpp

@@ -14,6 +14,11 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(0);
 }
 
+HeartRateGraph::~HeartRateGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void HeartRateGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,28 @@ QList<GraphItem*> HeartRateGraph::loadData(const Data &data)
 		const Graph &graph = track.heartRate();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +85,9 @@ qreal HeartRateGraph::avg() const
 
 void HeartRateGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +97,13 @@ void HeartRateGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/heartrategraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class HeartRateGraphItem;
+
 class HeartRateGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	HeartRateGraph(QWidget *parent = 0);
+	~HeartRateGraph();
 
 	QString label() const {return tr("Heart rate");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -23,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<HeartRateGraphItem*> _tracks;
 };
 
 #endif // HEARTRATEGRAPH_H

src/GUI/heartrategraphitem.cpp

@@ -4,12 +4,12 @@
 
 
 HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
-	setToolTip(toolTip());
 }
 
-QString HeartRateGraphItem::toolTip() const
+QString HeartRateGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/heartrategraphitem.h

@@ -8,11 +8,10 @@ class HeartRateGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	HeartRateGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	HeartRateGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
-private:
-	QString toolTip() const;
+	QString info() const;
 };
 
 #endif // HEARTRATEGRAPHITEM_H

src/GUI/infoitem.cpp

@@ -16,7 +16,7 @@ void InfoItem::updateBoundingRect()
 	QFontMetrics fm(_font);
 	qreal width = 0;
 
-	for (QList<KV>::const_iterator i = _list.constBegin();
+	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		width += fm.width(i->key() + ": ");
 		width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
@@ -37,7 +37,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	painter->setFont(_font);
 	painter->setRenderHint(QPainter::Antialiasing, false);
 
-	for (QList<KV>::const_iterator i = _list.constBegin();
+	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		painter->drawText(width, fm.height() - fm.descent(), i->key() + ": ");
 		width += fm.width(i->key() + ": ");
@@ -61,7 +61,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
 void InfoItem::insert(const QString &key, const QString &value)
 {
-	KV kv(key, value);
+	KV<QString, QString> kv(key, value);
 	int i;
 
 	prepareGeometryChange();

src/GUI/infoitem.h

@@ -14,7 +14,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	const QList<KV> &info() const {return _list;}
+	const QList<KV<QString, QString> > &info() const {return _list;}
 
 	void insert(const QString &key, const QString &value);
 	void clear();
@@ -23,7 +23,7 @@ public:
 private:
 	void updateBoundingRect();
 
-	QList<KV> _list;
+	QList<KV<QString, QString> > _list;
 	QRectF _boundingRect;
 	QFont _font;
 };

src/GUI/keys.h

@@ -18,7 +18,8 @@
 #define OPEN_SHORTCUT           QKeySequence(QKeySequence::Open)
 #define CLOSE_SHORTCUT          QKeySequence(QKeySequence::Close)
 #define RELOAD_SHORTCUT         QKeySequence(QKeySequence::Refresh)
-#define EXPORT_SHORTCUT         QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PDF_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PNG_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_X)
 #define SHOW_POI_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_P)
 #define SHOW_MAP_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_M)
 #define NEXT_MAP_SHORTCUT       QKeySequence(QKeySequence::Forward)

src/GUI/mapaction.h

@@ -0,0 +1,32 @@
+#ifndef MAPACTION_H
+#define MAPACTION_H
+
+#include <QAction>
+#include "map/map.h"
+
+class MapAction : public QAction
+{
+	Q_OBJECT
+
+public:
+	MapAction(Map *map, QObject *parent = 0) : QAction(map->name(), parent)
+	{
+		map->setParent(this);
+		setData(QVariant::fromValue(map));
+		setEnabled(map->isReady());
+		connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded()));
+	}
+
+signals:
+	void loaded();
+
+private slots:
+	void mapLoaded()
+	{
+		Map *map = data().value<Map*>();
+		setEnabled(map->isValid());
+		emit loaded();
+	}
+};
+
+#endif // MAPACTION_H

src/GUI/mapview.cpp

@@ -2,7 +2,6 @@
 #include <QGraphicsScene>
 #include <QWheelEvent>
 #include <QApplication>
-#include <QPixmapCache>
 #include <QScrollBar>
 #include "data/poi.h"
 #include "data/data.h"
@@ -16,6 +15,7 @@
 #include "scaleitem.h"
 #include "coordinatesitem.h"
 #include "keys.h"
+#include "graphicsscene.h"
 #include "mapview.h"
 
 
@@ -32,7 +32,7 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	Q_ASSERT(map != 0);
 	Q_ASSERT(poi != 0);
 
-	_scene = new QGraphicsScene(this);
+	_scene = new GraphicsScene(this);
 	setScene(_scene);
 	setDragMode(QGraphicsView::ScrollHandDrag);
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
@@ -54,13 +54,11 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_map = map;
 	_map->load();
 	_map->setProjection(_projection);
-	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));
 
 	_poi = poi;
 	connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
 
-	_units = Metric;
-	_coordinatesFormat = DecimalDegrees;
 	_mapOpacity = 1.0;
 	_backgroundColor = Qt::white;
 	_markerColor = Qt::red;
@@ -122,7 +120,6 @@ PathItem *MapView::addTrack(const Track &track)
 	ti->setColor(_palette.nextColor());
 	ti->setWidth(_trackWidth);
 	ti->setStyle(_trackStyle);
-	ti->setUnits(_units);
 	ti->setVisible(_showTracks);
 	ti->setDigitalZoom(_digitalZoom);
 	ti->setMarkerColor(_markerColor);
@@ -149,8 +146,6 @@ PathItem *MapView::addRoute(const Route &route)
 	ri->setColor(_palette.nextColor());
 	ri->setWidth(_routeWidth);
 	ri->setStyle(_routeStyle);
-	ri->setUnits(_units);
-	ri->setCoordinatesFormat(_coordinatesFormat);
 	ri->setVisible(_showRoutes);
 	ri->showWaypoints(_showRouteWaypoints);
 	ri->showWaypointLabels(_showWaypointLabels);
@@ -200,7 +195,6 @@ void MapView::addWaypoints(const QVector<Waypoint> &waypoints)
 		wi->setSize(_waypointSize);
 		wi->setColor(_waypointColor);
 		wi->showLabel(_showWaypointLabels);
-		wi->setToolTipFormat(_units, _coordinatesFormat);
 		wi->setVisible(_showWaypoints);
 		wi->setDigitalZoom(_digitalZoom);
 		_scene->addItem(wi);
@@ -215,12 +209,12 @@ QList<PathItem *> MapView::loadData(const Data &data)
 	QList<PathItem *> paths;
 	int zoom = _map->zoom();
 
+	for (int i = 0; i < data.areas().count(); i++)
+		addArea(data.areas().at(i));
 	for (int i = 0; i < data.tracks().count(); i++)
 		paths.append(addTrack(data.tracks().at(i)));
 	for (int i = 0; i < data.routes().count(); i++)
 		paths.append(addRoute(data.routes().at(i)));
-	for (int i = 0; i < data.areas().count(); i++)
-		addArea(data.areas().at(i));
 	addWaypoints(data.waypoints());
 
 	if (_tracks.empty() && _routes.empty() && _waypoints.empty()
@@ -255,17 +249,18 @@ QPointF MapView::contentCenter() const
 
 void MapView::updatePOIVisibility()
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it, jt;
-
 	if (!_showPOI)
 		return;
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->show();
 
 	if (!_overlapPOIs) {
-		for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
-			for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
+		for (POIHash::const_iterator it = _pois.constBegin();
+		  it != _pois.constEnd(); it++) {
+			for (POIHash::const_iterator jt = _pois.constBegin();
+			  jt != _pois.constEnd(); jt++) {
 				if (it.value()->isVisible() && jt.value()->isVisible()
 				  && it != jt && it.value()->collidesWithItem(jt.value()))
 					jt.value()->hide();
@@ -288,8 +283,8 @@ void MapView::rescale()
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(_map);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 
 	updatePOIVisibility();
@@ -315,7 +310,7 @@ void MapView::setMap(Map *map)
 	RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
 
 	_map->unload();
-	disconnect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	disconnect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));
 
 	_map = map;
 	_map->load();
@@ -323,7 +318,7 @@ void MapView::setMap(Map *map)
 #ifdef ENABLE_HIDPI
 	_map->setDevicePixelRatio(_deviceRatio, _mapRatio);
 #endif // ENABLE_HIDPI
-	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));
 
 	digitalZoom(0);
 
@@ -339,8 +334,8 @@ void MapView::setMap(Map *map)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(map);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 	updatePOIVisibility();
 
@@ -349,7 +344,6 @@ void MapView::setMap(Map *map)
 	centerOn(nc);
 
 	reloadMap();
-	QPixmapCache::clear();
 }
 
 void MapView::setPOI(POI *poi)
@@ -364,12 +358,10 @@ void MapView::setPOI(POI *poi)
 
 void MapView::updatePOI()
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		_scene->removeItem(it.value());
-		delete it.value();
-	}
+	qDeleteAll(_pois);
 	_pois.clear();
 
 	if (_showTracks)
@@ -403,7 +395,6 @@ void MapView::addPOI(const QList<Waypoint> &waypoints)
 		pi->showLabel(_showPOILabels);
 		pi->setVisible(_showPOI);
 		pi->setDigitalZoom(_digitalZoom);
-		pi->setToolTipFormat(_units, _coordinatesFormat);
 		_scene->addItem(pi);
 
 		_pois.insert(SearchPointer<Waypoint>(&(pi->waypoint())), pi);
@@ -412,57 +403,42 @@ void MapView::addPOI(const QList<Waypoint> &waypoints)
 
 void MapView::setUnits(Units units)
 {
-	if (_units == units)
-		return;
-
-	_units = units;
-
-	_mapScale->setUnits(_units);
+	WaypointItem::setUnits(units);
+	PathItem::setUnits(units);
 
 	for (int i = 0; i < _tracks.count(); i++)
-		_tracks[i]->setUnits(_units);
+		_tracks[i]->updateTicks();
 	for (int i = 0; i < _routes.count(); i++)
-		_routes[i]->setUnits(_units);
-	for (int i = 0; i < _waypoints.size(); i++)
-		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
+		_routes[i]->updateTicks();
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
-		it.value()->setToolTipFormat(_units, _coordinatesFormat);
+	_mapScale->setUnits(units);
 }
 
 void MapView::setCoordinatesFormat(CoordinatesFormat format)
 {
-	if (_coordinatesFormat == format)
-		return;
+	WaypointItem::setCoordinatesFormat(format);
 
-	_coordinatesFormat = format;
+	_coordinates->setFormat(format);
+}
 
-	_coordinates->setFormat(_coordinatesFormat);
-
-	for (int i = 0; i < _waypoints.count(); i++)
-		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
-	for (int i = 0; i < _routes.count(); i++)
-		_routes[i]->setCoordinatesFormat(_coordinatesFormat);
-
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
-		it.value()->setToolTipFormat(_units, _coordinatesFormat);
+void MapView::setTimeZone(const QTimeZone &zone)
+{
+#ifdef ENABLE_TIMEZONES
+	WaypointItem::setTimeZone(zone);
+	PathItem::setTimeZone(zone);
+#else // ENABLE_TIMEZONES
+	Q_UNUSED(zone);
+#endif // ENABLE_TIMEZONES
 }
 
 void MapView::clearMapCache()
 {
 	_map->clearCache();
-
-	fitMapZoom();
-	rescale();
-	centerOn(contentCenter());
+	reloadMap();
 }
 
 void MapView::digitalZoom(int zoom)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	if (zoom) {
 		_digitalZoom += zoom;
 		scale(pow(2, zoom), pow(2, zoom));
@@ -479,7 +455,8 @@ void MapView::digitalZoom(int zoom)
 		_areas.at(i)->setDigitalZoom(_digitalZoom);
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setDigitalZoom(_digitalZoom);
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setDigitalZoom(_digitalZoom);
 
 	_mapScale->setDigitalZoom(_digitalZoom);
@@ -554,7 +531,7 @@ void MapView::keyPressEvent(QKeyEvent *event)
 }
 
 void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
-  bool hires)
+  PlotFlags flags)
 {
 	QRect orig, adj;
 	qreal ratio, diff, q;
@@ -582,10 +559,18 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 		diff = (orig.height() * ratio) - orig.width();
 		adj = orig.adjusted(-diff/2, 0, diff/2, 0);
 	}
-	q = (target.width() / scale) / adj.width();
+
+	// Expand the view if plotting into a bitmap
+	if (flags & Expand) {
+		qreal xdiff = (target.width() - adj.width()) / 2.0;
+		qreal ydiff = (target.height() - adj.height()) / 2.0;
+		adj.adjust(-xdiff, -ydiff, xdiff, ydiff);
+		q = 1.0;
+	} else
+		q = (target.width() / scale) / adj.width();
 
 	// Adjust the view for printing
-	if (hires) {
+	if (flags & HiRes) {
 		zoom = _map->zoom();
 		QRectF vr(mapToScene(orig).boundingRect());
 		origScene = vr.center();
@@ -617,7 +602,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	render(painter, target, adj);
 
 	// Revert view changes to display mode
-	if (hires) {
+	if (flags & HiRes) {
 		_map->setZoom(zoom);
 		rescale();
 		centerOn(origScene);
@@ -747,8 +732,8 @@ void MapView::showPOI(bool show)
 {
 	_showPOI = show;
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setVisible(show);
 
 	updatePOIVisibility();
@@ -758,8 +743,8 @@ void MapView::showPOILabels(bool show)
 {
 	_showPOILabels = show;
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->showLabel(show);
 
 	updatePOIVisibility();
@@ -852,21 +837,19 @@ void MapView::setWaypointColor(const QColor &color)
 
 void MapView::setPOISize(int size)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	_poiSize = size;
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setSize(size);
 }
 
 void MapView::setPOIColor(const QColor &color)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	_poiColor = color;
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setColor(color);
 }
 
@@ -985,7 +968,6 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 
 	_deviceRatio = deviceRatio;
 	_mapRatio = mapRatio;
-	QPixmapCache::clear();
 
 	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
 	  .intersected(_map->bounds()));
@@ -1003,8 +985,8 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(_map);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 	updatePOIVisibility();
 
@@ -1021,13 +1003,17 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 
 void MapView::setProjection(int id)
 {
-	Projection projection(PCS::pcs(id));
-	if (!projection.isValid())
-		return;
-
-	_projection = projection;
-
+	const PCS *pcs;
+	const GCS *gcs;
 	Coordinates center = _map->xy2ll(mapToScene(viewport()->rect().center()));
+
+	if ((pcs = PCS::pcs(id)))
+		_projection = Projection(pcs);
+	else if ((gcs = GCS::gcs(id)))
+		_projection = Projection(gcs);
+	else
+		qWarning("%d: Unknown PCS/GCS id", id);
+
 	_map->setProjection(_projection);
 	rescale();
 	centerOn(_map->ll2xy(center));

src/GUI/mapview.h

@@ -5,6 +5,7 @@
 #include <QVector>
 #include <QHash>
 #include <QList>
+#include <QFlags>
 #include "common/rectc.h"
 #include "common/config.h"
 #include "data/waypoint.h"
@@ -30,12 +31,21 @@ class PathItem;
 class GraphItem;
 class AreaItem;
 class Area;
+class GraphicsScene;
+class QTimeZone;
 
 class MapView : public QGraphicsView
 {
 	Q_OBJECT
 
 public:
+	enum Flag {
+		NoFlags = 0,
+		HiRes = 1,
+		Expand = 2
+	};
+	Q_DECLARE_FLAGS(PlotFlags, Flag)
+
 	MapView(Map *map, POI *poi, QWidget *parent = 0);
 
 	QList<PathItem *> loadData(const Data &data);
@@ -44,7 +54,8 @@ public:
 	void setPOI(POI *poi);
 	void setMap(Map *map);
 
-	void plot(QPainter *painter, const QRectF &target, qreal scale, bool hires);
+	void plot(QPainter *painter, const QRectF &target, qreal scale,
+	  PlotFlags flags);
 
 	void clear();
 
@@ -82,6 +93,7 @@ public slots:
 	void showTicks(bool show);
 	void clearMapCache();
 	void setCoordinatesFormat(CoordinatesFormat format);
+	void setTimeZone(const QTimeZone &zone);
 	void setDevicePixelRatio(qreal deviceRatio, qreal mapRatio);
 	void setProjection(int id);
 
@@ -92,6 +104,8 @@ private slots:
 	void reloadMap();
 
 private:
+	typedef QHash<SearchPointer<Waypoint>, WaypointItem*> POIHash;
+
 	PathItem *addTrack(const Track &track);
 	PathItem *addRoute(const Route &route);
 	void addArea(const Area &area);
@@ -118,14 +132,14 @@ private:
 	void mouseMoveEvent(QMouseEvent *event);
 	void leaveEvent(QEvent *event);
 
-	QGraphicsScene *_scene;
+	GraphicsScene *_scene;
 	ScaleItem *_mapScale;
 	CoordinatesItem *_coordinates;
 	QList<TrackItem*> _tracks;
 	QList<RouteItem*> _routes;
 	QList<WaypointItem*> _waypoints;
 	QList<AreaItem*> _areas;
-	QHash<SearchPointer<Waypoint>, WaypointItem*> _pois;
+	POIHash _pois;
 
 	RectC _tr, _rr, _wr, _ar;
 	qreal _res;
@@ -134,8 +148,6 @@ private:
 	POI *_poi;
 
 	Palette _palette;
-	Units _units;
-	CoordinatesFormat _coordinatesFormat;
 	qreal _mapOpacity;
 	Projection _projection;
 

src/GUI/margins.h

@@ -16,15 +16,22 @@ public:
 	qreal right() const {return _right;}
 	qreal bottom() const {return _bottom;}
 
-	qreal &rleft() {return _left;}
-	qreal &rtop() {return _top;}
-	qreal &rright() {return _right;}
-	qreal &rbottom() {return _bottom;}
-
 private:
 	qreal _left, _top, _right, _bottom;
 };
 
+inline MarginsF operator*(const MarginsF &margins, qreal factor)
+{
+	return MarginsF(margins.left() * factor, margins.top() * factor,
+	  margins.right() * factor, margins.bottom() * factor);
+}
+
+inline MarginsF operator/(const MarginsF &margins, qreal factor)
+{
+	return MarginsF(margins.left() / factor, margins.top() / factor,
+	  margins.right() / factor, margins.bottom() / factor);
+}
+
 #ifndef QT_NO_DEBUG
 inline QDebug operator<<(QDebug dbg, const MarginsF &margins)
 {

src/GUI/marginswidget.cpp

@@ -0,0 +1,111 @@
+#include <QSpinBox>
+#include <QGridLayout>
+#include "units.h"
+#include "marginswidget.h"
+
+MarginsWidget::MarginsWidget(QWidget *parent) : QWidget(parent)
+{
+	_top = new QSpinBox();
+	_bottom = new QSpinBox();
+	_left = new QSpinBox();
+	_right = new QSpinBox();
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+
+	QGridLayout *layout = new QGridLayout();
+	layout->addWidget(_top, 0, 0, 1, 2, Qt::AlignCenter);
+	layout->addWidget(_left, 1, 0, 1, 1, Qt::AlignRight);
+	layout->addWidget(_right, 1, 1, 1, 1, Qt::AlignLeft);
+	layout->addWidget(_bottom, 2, 0, 1, 2, Qt::AlignCenter);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	setLayout(layout);
+}
+
+void MarginsWidget::setValue(const QMargins &value)
+{
+	_top->setValue(value.top());
+	_bottom->setValue(value.bottom());
+	_left->setValue(value.left());
+	_right->setValue(value.right());
+}
+
+void MarginsWidget::setUnits(const QString &units)
+{
+	_top->setSuffix(UNIT_SPACE + units);
+	_bottom->setSuffix(UNIT_SPACE + units);
+	_left->setSuffix(UNIT_SPACE + units);
+	_right->setSuffix(UNIT_SPACE + units);
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+}
+
+QMargins MarginsWidget::value() const
+{
+	return QMargins(_left->value(), _top->value(), _right->value(),
+	  _bottom->value());
+}
+
+
+MarginsFWidget::MarginsFWidget(QWidget *parent) : QWidget(parent)
+{
+	_top = new QDoubleSpinBox();
+	_bottom = new QDoubleSpinBox();
+	_left = new QDoubleSpinBox();
+	_right = new QDoubleSpinBox();
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+
+	QGridLayout *layout = new QGridLayout();
+	layout->addWidget(_top, 0, 0, 1, 2, Qt::AlignCenter);
+	layout->addWidget(_left, 1, 0, 1, 1, Qt::AlignRight);
+	layout->addWidget(_right, 1, 1, 1, 1, Qt::AlignLeft);
+	layout->addWidget(_bottom, 2, 0, 1, 2, Qt::AlignCenter);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	setLayout(layout);
+}
+
+void MarginsFWidget::setValue(const MarginsF &value)
+{
+	_top->setValue(value.top());
+	_bottom->setValue(value.bottom());
+	_left->setValue(value.left());
+	_right->setValue(value.right());
+}
+
+void MarginsFWidget::setUnits(const QString &units)
+{
+	_top->setSuffix(UNIT_SPACE + units);
+	_bottom->setSuffix(UNIT_SPACE + units);
+	_left->setSuffix(UNIT_SPACE + units);
+	_right->setSuffix(UNIT_SPACE + units);
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+}
+
+void MarginsFWidget::setSingleStep(qreal step)
+{
+	_top->setSingleStep(step);
+	_bottom->setSingleStep(step);
+	_left->setSingleStep(step);
+	_right->setSingleStep(step);
+}
+
+MarginsF MarginsFWidget::value() const
+{
+	return MarginsF(_left->value(), _top->value(), _right->value(),
+	  _bottom->value());
+}

src/GUI/marginswidget.h

@@ -0,0 +1,48 @@
+#ifndef MARGINSWIDGET_H
+#define MARGINSWIDGET_H
+
+#include <QWidget>
+#include <QMargins>
+#include "margins.h"
+
+class QSpinBox;
+class QDoubleSpinBox;
+
+class MarginsWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	MarginsWidget(QWidget *parent = 0);
+
+	QMargins value() const;
+	void setValue(const QMargins &value);
+	void setUnits(const QString &units);
+
+private:
+	QSpinBox *_top;
+	QSpinBox *_bottom;
+	QSpinBox *_left;
+	QSpinBox *_right;
+};
+
+class MarginsFWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	MarginsFWidget(QWidget *parent = 0);
+
+	MarginsF value() const;
+	void setValue(const MarginsF &value);
+	void setUnits(const QString &units);
+	void setSingleStep(qreal step);
+
+private:
+	QDoubleSpinBox *_top;
+	QDoubleSpinBox *_bottom;
+	QDoubleSpinBox *_left;
+	QDoubleSpinBox *_right;
+};
+
+#endif // MARGINSWIDGET_H

src/GUI/optionsdialog.cpp

@@ -12,6 +12,7 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QSysInfo>
+#include <QButtonGroup>
 #include "map/pcs.h"
 #include "icons.h"
 #include "colorbox.h"
@@ -36,22 +37,31 @@ static QFrame *line()
 }
 #endif // Q_OS_MAC
 
+
+void OptionsDialog::automaticPauseDetectionSet(bool set)
+{
+	_pauseInterval->setEnabled(!set);
+	_pauseSpeed->setEnabled(!set);
+}
+
 QWidget *OptionsDialog::createMapPage()
 {
 	_projection = new LimitedComboBox(200);
-	QList<PCS::Info> projections(PCS::pcsList());
+
+	QList<KV<int, QString> > projections(GCS::list() + PCS::list());
 	qSort(projections);
+
 	for (int i = 0; i < projections.size(); i++) {
-		QString text = QString::number(projections.at(i).id()) + " - "
-		  + projections.at(i).name();
-		_projection->addItem(text, QVariant(projections.at(i).id()));
+		QString text = QString::number(projections.at(i).key()) + " - "
+		  + projections.at(i).value();
+		_projection->addItem(text, QVariant(projections.at(i).key()));
 	}
-	_projection->setCurrentIndex(_projection->findData(_options->projection));
+	_projection->setCurrentIndex(_projection->findData(_options.projection));
 
 #ifdef ENABLE_HIDPI
 	_hidpi = new QRadioButton(tr("High-resolution"));
 	_lodpi = new QRadioButton(tr("Standard"));
-	if (_options->hidpiMap)
+	if (_options.hidpiMap)
 		_hidpi->setChecked(true);
 	else
 		_lodpi->setChecked(true);
@@ -102,10 +112,10 @@ QWidget *OptionsDialog::createAppearancePage()
 {
 	// Tracks
 	_trackWidth = new QSpinBox();
-	_trackWidth->setValue(_options->trackWidth);
+	_trackWidth->setValue(_options.trackWidth);
 	_trackWidth->setMinimum(1);
 	_trackStyle = new StyleComboBox();
-	_trackStyle->setValue(_options->trackStyle);
+	_trackStyle->setValue(_options.trackStyle);
 	QFormLayout *trackLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	trackLayout->addRow(tr("Track width:"), _trackWidth);
@@ -119,10 +129,10 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Routes
 	_routeWidth = new QSpinBox();
-	_routeWidth->setValue(_options->routeWidth);
+	_routeWidth->setValue(_options.routeWidth);
 	_routeWidth->setMinimum(1);
 	_routeStyle = new StyleComboBox();
-	_routeStyle->setValue(_options->routeStyle);
+	_routeStyle->setValue(_options.routeStyle);
 	QFormLayout *routeLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	routeLayout->addRow(tr("Route width:"), _routeWidth);
@@ -136,11 +146,11 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Areas
 	_areaWidth = new QSpinBox();
-	_areaWidth->setValue(_options->areaWidth);
+	_areaWidth->setValue(_options.areaWidth);
 	_areaStyle = new StyleComboBox();
-	_areaStyle->setValue(_options->areaStyle);
+	_areaStyle->setValue(_options.areaStyle);
 	_areaOpacity = new PercentSlider();
-	_areaOpacity->setValue(_options->areaOpacity);
+	_areaOpacity->setValue(_options.areaOpacity);
 	QFormLayout *areaLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	areaLayout->addRow(tr("Area border width:"), _areaWidth);
@@ -156,18 +166,15 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Palette & antialiasing
 	_baseColor = new ColorBox();
-	_baseColor->setColor(_options->palette.color());
-	_colorOffset = new QDoubleSpinBox();
-	_colorOffset->setMinimum(0);
-	_colorOffset->setMaximum(1.0);
-	_colorOffset->setSingleStep(0.01);
-	_colorOffset->setValue(_options->palette.shift());
+	_baseColor->setColor(_options.palette.color());
+	_colorOffset = new PercentSlider();
+	_colorOffset->setValue(_options.palette.shift() * 100);
 	QFormLayout *paletteLayout = new QFormLayout();
 	paletteLayout->addRow(tr("Base color:"), _baseColor);
 	paletteLayout->addRow(tr("Palette shift:"), _colorOffset);
 
 	_pathAA = new QCheckBox(tr("Use anti-aliasing"));
-	_pathAA->setChecked(_options->pathAntiAliasing);
+	_pathAA->setChecked(_options.pathAntiAliasing);
 	QFormLayout *pathAALayout = new QFormLayout();
 	pathAALayout->addWidget(_pathAA);
 
@@ -194,9 +201,9 @@ QWidget *OptionsDialog::createAppearancePage()
 	// Waypoints
 	_waypointSize = new QSpinBox();
 	_waypointSize->setMinimum(1);
-	_waypointSize->setValue(_options->waypointSize);
+	_waypointSize->setValue(_options.waypointSize);
 	_waypointColor = new ColorBox();
-	_waypointColor->setColor(_options->waypointColor);
+	_waypointColor->setColor(_options.waypointColor);
 	QFormLayout *waypointLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	waypointLayout->addRow(tr("Waypoint color:"), _waypointColor);
@@ -210,9 +217,9 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	_poiSize = new QSpinBox();
 	_poiSize->setMinimum(1);
-	_poiSize->setValue(_options->poiSize);
+	_poiSize->setValue(_options.poiSize);
 	_poiColor = new ColorBox();
-	_poiColor->setColor(_options->poiColor);
+	_poiColor->setColor(_options.poiColor);
 	QFormLayout *poiLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	poiLayout->addRow(tr("POI color:"), _poiColor);
@@ -240,9 +247,9 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Graphs
 	_sliderColor = new ColorBox();
-	_sliderColor->setColor(_options->sliderColor);
+	_sliderColor->setColor(_options.sliderColor);
 	_graphWidth = new QSpinBox();
-	_graphWidth->setValue(_options->graphWidth);
+	_graphWidth->setValue(_options.graphWidth);
 	_graphWidth->setMinimum(1);
 
 	QFormLayout *graphLayout = new QFormLayout();
@@ -250,7 +257,7 @@ QWidget *OptionsDialog::createAppearancePage()
 	graphLayout->addRow(tr("Slider color:"), _sliderColor);
 
 	_graphAA = new QCheckBox(tr("Use anti-aliasing"));
-	_graphAA->setChecked(_options->graphAntiAliasing);
+	_graphAA->setChecked(_options.graphAntiAliasing);
 	QFormLayout *graphAALayout = new QFormLayout();
 	graphAALayout->addWidget(_graphAA);
 
@@ -264,9 +271,9 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Map
 	_mapOpacity = new PercentSlider();
-	_mapOpacity->setValue(_options->mapOpacity);
+	_mapOpacity->setValue(_options.mapOpacity);
 	_backgroundColor = new ColorBox();
-	_backgroundColor->setColor(_options->backgroundColor);
+	_backgroundColor->setColor(_options.backgroundColor);
 	_backgroundColor->enableAlphaChannel(false);
 
 	QFormLayout *mapLayout = new QFormLayout();
@@ -294,19 +301,19 @@ QWidget *OptionsDialog::createDataPage()
 	QString filterToolTip = tr("Moving average window size");
 
 	_elevationFilter = new OddSpinBox();
-	_elevationFilter->setValue(_options->elevationFilter);
+	_elevationFilter->setValue(_options.elevationFilter);
 	_elevationFilter->setToolTip(filterToolTip);
 	_speedFilter = new OddSpinBox();
-	_speedFilter->setValue(_options->speedFilter);
+	_speedFilter->setValue(_options.speedFilter);
 	_speedFilter->setToolTip(filterToolTip);
 	_heartRateFilter = new OddSpinBox();
-	_heartRateFilter->setValue(_options->heartRateFilter);
+	_heartRateFilter->setValue(_options.heartRateFilter);
 	_heartRateFilter->setToolTip(filterToolTip);
 	_cadenceFilter = new OddSpinBox();
-	_cadenceFilter->setValue(_options->cadenceFilter);
+	_cadenceFilter->setValue(_options.cadenceFilter);
 	_cadenceFilter->setToolTip(filterToolTip);
 	_powerFilter = new OddSpinBox();
-	_powerFilter->setValue(_options->powerFilter);
+	_powerFilter->setValue(_options.powerFilter);
 	_powerFilter->setToolTip(filterToolTip);
 
 	QFormLayout *smoothLayout = new QFormLayout();
@@ -321,7 +328,7 @@ QWidget *OptionsDialog::createDataPage()
 #endif // Q_OS_MAC
 
 	_outlierEliminate = new QCheckBox(tr("Eliminate GPS outliers"));
-	_outlierEliminate->setChecked(_options->outlierEliminate);
+	_outlierEliminate->setChecked(_options.outlierEliminate);
 
 	QFormLayout *outlierLayout = new QFormLayout();
 	outlierLayout->addWidget(_outlierEliminate);
@@ -340,28 +347,52 @@ QWidget *OptionsDialog::createDataPage()
 	filterTab->setLayout(filterTabLayout);
 
 
+	_automaticPause = new QRadioButton(tr("Automatic"));
+	_manualPause = new QRadioButton(tr("Custom"));
+	if (_options.automaticPause)
+		_automaticPause->setChecked(true);
+	else
+		_manualPause->setChecked(true);
+
 	_pauseSpeed = new QDoubleSpinBox();
 	_pauseSpeed->setDecimals(1);
 	_pauseSpeed->setSingleStep(0.1);
 	_pauseSpeed->setMinimum(0.1);
-	if (_options->units == Imperial) {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2MIH);
+	_pauseSpeed->setEnabled(_manualPause->isChecked());
+	if (_units == Imperial) {
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2MIH);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("mi/h"));
-	} else if (_options->units == Nautical) {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2KN);
+	} else if (_units == Nautical) {
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2KN);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("kn"));
 	} else {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2KMH);
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2KMH);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("km/h"));
 	}
 	_pauseInterval = new QSpinBox();
 	_pauseInterval->setMinimum(1);
 	_pauseInterval->setSuffix(UNIT_SPACE + tr("s"));
-	_pauseInterval->setValue(_options->pauseInterval);
+	_pauseInterval->setValue(_options.pauseInterval);
+	_pauseInterval->setEnabled(_manualPause->isChecked());
 
-	QFormLayout *pauseLayout = new QFormLayout();
-	pauseLayout->addRow(tr("Minimal speed:"), _pauseSpeed);
-	pauseLayout->addRow(tr("Minimal duration:"), _pauseInterval);
+	connect(_automaticPause, SIGNAL(toggled(bool)), this,
+	  SLOT(automaticPauseDetectionSet(bool)));
+
+	QHBoxLayout *pauseTypeLayout = new QHBoxLayout();
+#ifdef Q_OS_MAC
+	pauseTypeLayout->addStretch();
+#endif
+	pauseTypeLayout->addWidget(_automaticPause);
+	pauseTypeLayout->addWidget(_manualPause);
+	pauseTypeLayout->addStretch();
+
+	QFormLayout *pauseValuesLayout = new QFormLayout();
+	pauseValuesLayout->addRow(tr("Minimal speed:"), _pauseSpeed);
+	pauseValuesLayout->addRow(tr("Minimal duration:"), _pauseInterval);
+
+	QVBoxLayout *pauseLayout = new QVBoxLayout();
+	pauseLayout->addLayout(pauseTypeLayout);
+	pauseLayout->addLayout(pauseValuesLayout);
 
 	QWidget *pauseTab = new QWidget();
 	pauseTab->setLayout(pauseLayout);
@@ -369,54 +400,129 @@ QWidget *OptionsDialog::createDataPage()
 
 	_computedSpeed = new QRadioButton(tr("Computed from distance/time"));
 	_reportedSpeed = new QRadioButton(tr("Recorded by device"));
-	if (_options->useReportedSpeed)
+	if (_options.useReportedSpeed)
 		_reportedSpeed->setChecked(true);
 	else
 		_computedSpeed->setChecked(true);
+	_showSecondarySpeed = new QCheckBox(tr("Show secondary speed"));
+	_showSecondarySpeed->setChecked(_options.showSecondarySpeed);
 
 	_dataGPSElevation = new QRadioButton(tr("GPS data"));
 	_dataDEMElevation = new QRadioButton(tr("DEM data"));
-	if (_options->dataUseDEM)
+	if (_options.dataUseDEM)
 		_dataDEMElevation->setChecked(true);
 	else
 		_dataGPSElevation->setChecked(true);
+	_showSecondaryElevation = new QCheckBox(tr("Show secondary elevation"));
+	_showSecondaryElevation->setChecked(_options.showSecondaryElevation);
 
+#ifdef ENABLE_TIMEZONES
+	_utcZone = new QRadioButton(tr("UTC"));
+	_systemZone = new QRadioButton(tr("System"));
+	_customZone = new QRadioButton(tr("Custom"));
+	if (_options.timeZone.type() == TimeZoneInfo::UTC)
+		_utcZone->setChecked(true);
+	else if (_options.timeZone.type() == TimeZoneInfo::System)
+		_systemZone->setChecked(true);
+	else
+		_customZone->setChecked(true);
+	_timeZone = new QComboBox();
+	_timeZone->setEnabled(_customZone->isChecked());
+	QList<QByteArray> zones = QTimeZone::availableTimeZoneIds();
+	for (int i = 0; i < zones.size(); i++)
+		_timeZone->addItem(zones.at(i));
+	_timeZone->setCurrentText(_options.timeZone.customZone().id());
+	connect(_customZone, SIGNAL(toggled(bool)), _timeZone,
+	  SLOT(setEnabled(bool)));
+	QHBoxLayout *customZoneLayout = new QHBoxLayout();
+	customZoneLayout->addSpacing(20);
+	customZoneLayout->addWidget(_timeZone);
+#endif // ENABLE_TIMEZONES
+
+	_useSegments = new QCheckBox(tr("Use segments"));
+	_useSegments->setChecked(_options.useSegments);
 
 	QWidget *sourceTab = new QWidget();
 	QVBoxLayout *sourceTabLayout = new QVBoxLayout();
 
 #ifdef Q_OS_MAC
+	QButtonGroup *speedGroup = new QButtonGroup(this);
+	speedGroup->addButton(_computedSpeed);
+	speedGroup->addButton(_reportedSpeed);
 	QVBoxLayout *speedOptions = new QVBoxLayout();
 	speedOptions->addWidget(_computedSpeed);
 	speedOptions->addWidget(_reportedSpeed);
+	speedOptions->addWidget(_showSecondarySpeed);
 
+	QButtonGroup *elevationGroup = new QButtonGroup(this);
+	elevationGroup->addButton(_dataGPSElevation);
+	elevationGroup->addButton(_dataDEMElevation);
 	QVBoxLayout *elevationOptions = new QVBoxLayout();
 	elevationOptions->addWidget(_dataGPSElevation);
 	elevationOptions->addWidget(_dataDEMElevation);
+	elevationOptions->addWidget(_showSecondaryElevation);
+
+#ifdef ENABLE_TIMEZONES
+	QButtonGroup *timeZoneGroup = new QButtonGroup(this);
+	timeZoneGroup->addButton(_utcZone);
+	timeZoneGroup->addButton(_systemZone);
+	timeZoneGroup->addButton(_customZone);
+	QVBoxLayout *zoneOptions = new QVBoxLayout();
+	zoneOptions->addWidget(_utcZone);
+	zoneOptions->addWidget(_systemZone);
+	zoneOptions->addWidget(_customZone);
+	zoneOptions->addItem(customZoneLayout);
+#endif // ENABLE_TIMEZONES
 
 	QFormLayout *formLayout = new QFormLayout();
 	formLayout->addRow(tr("Speed:"), speedOptions);
 	formLayout->addRow(tr("Elevation:"), elevationOptions);
+#ifdef ENABLE_TIMEZONES
+	formLayout->addRow(tr("Time zone:"), zoneOptions);
+#endif // ENABLE_TIMEZONES
+	formLayout->addRow(_useSegments);
 
 	sourceTabLayout->addLayout(formLayout);
 #else // Q_OS_MAC
 	QFormLayout *speedLayout = new QFormLayout();
 	QFormLayout *elevationLayout = new QFormLayout();
+#ifdef ENABLE_TIMEZONES
+	QFormLayout *timeZoneLayout = new QFormLayout();
+#endif // ENABLE_TIMEZONES
+	QFormLayout *segmentsLayout = new QFormLayout();
 
 	speedLayout->addWidget(_computedSpeed);
 	speedLayout->addWidget(_reportedSpeed);
+	speedLayout->addWidget(_showSecondarySpeed);
 
 	QGroupBox *speedBox = new QGroupBox(tr("Speed"));
 	speedBox->setLayout(speedLayout);
 
 	elevationLayout->addWidget(_dataGPSElevation);
 	elevationLayout->addWidget(_dataDEMElevation);
+	elevationLayout->addWidget(_showSecondaryElevation);
 
 	QGroupBox *elevationBox = new QGroupBox(tr("Elevation"));
 	elevationBox->setLayout(elevationLayout);
 
+#ifdef ENABLE_TIMEZONES
+	timeZoneLayout->addWidget(_utcZone);
+	timeZoneLayout->addWidget(_systemZone);
+	timeZoneLayout->addWidget(_customZone);
+	timeZoneLayout->addItem(customZoneLayout);
+
+	QGroupBox *timeZoneBox = new QGroupBox(tr("Time zone"));
+	timeZoneBox->setLayout(timeZoneLayout);
+#endif // ENABLE_TIMEZONES
+
+	segmentsLayout->addWidget(_useSegments);
+
 	sourceTabLayout->addWidget(speedBox);
 	sourceTabLayout->addWidget(elevationBox);
+#ifdef ENABLE_TIMEZONES
+	sourceTabLayout->addWidget(timeZoneBox);
+#endif // ENABLE_TIMEZONES
+	sourceTabLayout->addLayout(segmentsLayout);
 #endif // Q_OS_MAC
 	sourceTabLayout->addStretch();
 	sourceTab->setLayout(sourceTabLayout);
@@ -432,34 +538,22 @@ QWidget *OptionsDialog::createDataPage()
 
 QWidget *OptionsDialog::createPOIPage()
 {
-	_poiGPSElevation = new QRadioButton(tr("GPS data"));
-	_poiDEMElevation = new QRadioButton(tr("DEM data"));
-	if (_options->poiUseDEM)
-		_poiDEMElevation->setChecked(true);
-	else
-		_poiGPSElevation->setChecked(true);
-
 	_poiRadius = new QDoubleSpinBox();
 	_poiRadius->setSingleStep(1);
 	_poiRadius->setDecimals(1);
-	if (_options->units == Imperial) {
-		_poiRadius->setValue(_options->poiRadius / MIINM);
+	if (_units == Imperial) {
+		_poiRadius->setValue(_options.poiRadius / MIINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("mi"));
-	} else if (_options->units == Nautical) {
-		_poiRadius->setValue(_options->poiRadius / NMIINM);
+	} else if (_units == Nautical) {
+		_poiRadius->setValue(_options.poiRadius / NMIINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("nmi"));
 	} else {
-		_poiRadius->setValue(_options->poiRadius / KMINM);
+		_poiRadius->setValue(_options.poiRadius / KMINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("km"));
 	}
 
-	QVBoxLayout *elevationLayout = new QVBoxLayout();
-	elevationLayout->addWidget(_poiGPSElevation);
-	elevationLayout->addWidget(_poiDEMElevation);
-
 	QFormLayout *poiLayout = new QFormLayout();
 	poiLayout->addRow(tr("Radius:"), _poiRadius);
-	poiLayout->addRow(tr("Elevation:"), elevationLayout);
 
 	QWidget *poiTab = new QWidget();
 	poiTab->setLayout(poiLayout);
@@ -474,7 +568,7 @@ QWidget *OptionsDialog::createExportPage()
 {
 	_wysiwyg = new QRadioButton(tr("WYSIWYG"));
 	_hires = new QRadioButton(tr("High-Resolution"));
-	if (_options->hiresPrint)
+	if (_options.hiresPrint)
 		_hires->setChecked(true);
 	else
 		_wysiwyg->setChecked(true);
@@ -503,17 +597,17 @@ QWidget *OptionsDialog::createExportPage()
 
 
 	_name = new QCheckBox(tr("Name"));
-	_name->setChecked(_options->printName);
+	_name->setChecked(_options.printName);
 	_date = new QCheckBox(tr("Date"));
-	_date->setChecked(_options->printDate);
+	_date->setChecked(_options.printDate);
 	_distance = new QCheckBox(tr("Distance"));
-	_distance->setChecked(_options->printDistance);
+	_distance->setChecked(_options.printDistance);
 	_time = new QCheckBox(tr("Time"));
-	_time->setChecked(_options->printTime);
+	_time->setChecked(_options.printTime);
 	_movingTime = new QCheckBox(tr("Moving time"));
-	_movingTime->setChecked(_options->printMovingTime);
+	_movingTime->setChecked(_options.printMovingTime);
 	_itemCount = new QCheckBox(tr("Item count (>1)"));
-	_itemCount->setChecked(_options->printItemCount);
+	_itemCount->setChecked(_options.printItemCount);
 
 	QFormLayout *headerTabLayout = new QFormLayout();
 	headerTabLayout->addWidget(_name);
@@ -528,7 +622,7 @@ QWidget *OptionsDialog::createExportPage()
 
 
 	_separateGraphPage = new QCheckBox(tr("Separate graph page"));
-	_separateGraphPage->setChecked(_options->separateGraphPage);
+	_separateGraphPage->setChecked(_options.separateGraphPage);
 
 	QFormLayout *graphTabLayout = new QFormLayout();
 	graphTabLayout->addWidget(_separateGraphPage);
@@ -547,23 +641,23 @@ QWidget *OptionsDialog::createExportPage()
 QWidget *OptionsDialog::createSystemPage()
 {
 	_useOpenGL = new QCheckBox(tr("Use OpenGL"));
-	_useOpenGL->setChecked(_options->useOpenGL);
+	_useOpenGL->setChecked(_options.useOpenGL);
 #ifdef ENABLE_HTTP2
 	_enableHTTP2 = new QCheckBox(tr("Enable HTTP/2"));
-	_enableHTTP2->setChecked(_options->enableHTTP2);
+	_enableHTTP2->setChecked(_options.enableHTTP2);
 #endif // ENABLE_HTTP2
 
 	_pixmapCache = new QSpinBox();
 	_pixmapCache->setMinimum(16);
 	_pixmapCache->setMaximum(1024);
 	_pixmapCache->setSuffix(UNIT_SPACE + tr("MB"));
-	_pixmapCache->setValue(_options->pixmapCache);
+	_pixmapCache->setValue(_options.pixmapCache);
 
 	_connectionTimeout = new QSpinBox();
 	_connectionTimeout->setMinimum(30);
 	_connectionTimeout->setMaximum(120);
 	_connectionTimeout->setSuffix(UNIT_SPACE + tr("s"));
-	_connectionTimeout->setValue(_options->connectionTimeout);
+	_connectionTimeout->setValue(_options.connectionTimeout);
 
 	QFormLayout *formLayout = new QFormLayout();
 	formLayout->addRow(tr("Image cache size:"), _pixmapCache);
@@ -588,8 +682,8 @@ QWidget *OptionsDialog::createSystemPage()
 	return systemPage;
 }
 
-OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
-  : QDialog(parent), _options(options)
+OptionsDialog::OptionsDialog(Options &options, Units units, QWidget *parent)
+  : QDialog(parent), _options(options), _units(units)
 {
 	QStackedWidget *pages = new QStackedWidget();
 	pages->addWidget(createAppearancePage());
@@ -641,72 +735,82 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
 
 void OptionsDialog::accept()
 {
-	_options->palette.setColor(_baseColor->color());
-	_options->palette.setShift(_colorOffset->value());
-	_options->mapOpacity = _mapOpacity->value();
-	_options->backgroundColor = _backgroundColor->color();
-	_options->trackWidth = _trackWidth->value();
-	_options->trackStyle = (Qt::PenStyle) _trackStyle->itemData(
+	_options.palette.setColor(_baseColor->color());
+	_options.palette.setShift(_colorOffset->value() / 100.0);
+	_options.mapOpacity = _mapOpacity->value();
+	_options.backgroundColor = _backgroundColor->color();
+	_options.trackWidth = _trackWidth->value();
+	_options.trackStyle = (Qt::PenStyle) _trackStyle->itemData(
 	  _trackStyle->currentIndex()).toInt();
-	_options->routeWidth = _routeWidth->value();
-	_options->routeStyle = (Qt::PenStyle) _routeStyle->itemData(
+	_options.routeWidth = _routeWidth->value();
+	_options.routeStyle = (Qt::PenStyle) _routeStyle->itemData(
 	  _routeStyle->currentIndex()).toInt();
-	_options->pathAntiAliasing = _pathAA->isChecked();
-	_options->areaWidth = _areaWidth->value();
-	_options->areaStyle = (Qt::PenStyle) _areaStyle->itemData(
+	_options.pathAntiAliasing = _pathAA->isChecked();
+	_options.areaWidth = _areaWidth->value();
+	_options.areaStyle = (Qt::PenStyle) _areaStyle->itemData(
 	  _areaStyle->currentIndex()).toInt();
-	_options->areaOpacity = _areaOpacity->value();
-	_options->waypointSize = _waypointSize->value();
-	_options->waypointColor = _waypointColor->color();
-	_options->poiSize = _poiSize->value();
-	_options->poiColor = _poiColor->color();
-	_options->graphWidth = _graphWidth->value();
-	_options->sliderColor = _sliderColor->color();
-	_options->graphAntiAliasing = _graphAA->isChecked();
+	_options.areaOpacity = _areaOpacity->value();
+	_options.waypointSize = _waypointSize->value();
+	_options.waypointColor = _waypointColor->color();
+	_options.poiSize = _poiSize->value();
+	_options.poiColor = _poiColor->color();
+	_options.graphWidth = _graphWidth->value();
+	_options.sliderColor = _sliderColor->color();
+	_options.graphAntiAliasing = _graphAA->isChecked();
 
-	_options->projection = _projection->itemData(_projection->currentIndex())
+	_options.projection = _projection->itemData(_projection->currentIndex())
 	  .toInt();
 #ifdef ENABLE_HIDPI
-	_options->hidpiMap = _hidpi->isChecked();
+	_options.hidpiMap = _hidpi->isChecked();
 #endif // ENABLE_HIDPI
 
-	_options->elevationFilter = _elevationFilter->value();
-	_options->speedFilter = _speedFilter->value();
-	_options->heartRateFilter = _heartRateFilter->value();
-	_options->cadenceFilter = _cadenceFilter->value();
-	_options->powerFilter = _powerFilter->value();
-	_options->outlierEliminate = _outlierEliminate->isChecked();
-	qreal pauseSpeed = (_options->units == Imperial)
-		? _pauseSpeed->value() / MS2MIH : (_options->units == Nautical)
+	_options.elevationFilter = _elevationFilter->value();
+	_options.speedFilter = _speedFilter->value();
+	_options.heartRateFilter = _heartRateFilter->value();
+	_options.cadenceFilter = _cadenceFilter->value();
+	_options.powerFilter = _powerFilter->value();
+	_options.outlierEliminate = _outlierEliminate->isChecked();
+	_options.automaticPause = _automaticPause->isChecked();
+	qreal pauseSpeed = (_units == Imperial)
+		? _pauseSpeed->value() / MS2MIH : (_units == Nautical)
 		? _pauseSpeed->value() / MS2KN : _pauseSpeed->value() / MS2KMH;
-	if (qAbs(pauseSpeed - _options->pauseSpeed) > 0.01)
-		_options->pauseSpeed = pauseSpeed;
-	_options->pauseInterval = _pauseInterval->value();
-	_options->useReportedSpeed = _reportedSpeed->isChecked();
-	_options->dataUseDEM = _dataDEMElevation->isChecked();
+	if (qAbs(pauseSpeed - _options.pauseSpeed) > 0.01)
+		_options.pauseSpeed = pauseSpeed;
+	_options.pauseInterval = _pauseInterval->value();
+	_options.useReportedSpeed = _reportedSpeed->isChecked();
+	_options.dataUseDEM = _dataDEMElevation->isChecked();
+	_options.showSecondaryElevation = _showSecondaryElevation->isChecked();
+	_options.showSecondarySpeed = _showSecondarySpeed->isChecked();
+#ifdef ENABLE_TIMEZONES
+	_options.timeZone.setType(_utcZone->isChecked()
+	  ? TimeZoneInfo::UTC : _systemZone->isChecked()
+	  ? TimeZoneInfo::System : TimeZoneInfo::Custom);
+	_options.timeZone.setCustomZone(QTimeZone(_timeZone->currentText()
+	  .toLatin1()));
+#endif // ENABLE_TIMEZONES
+	_options.useSegments = _useSegments->isChecked();
 
-	qreal poiRadius = (_options->units == Imperial)
-		? _poiRadius->value() * MIINM : (_options->units == Nautical)
+	qreal poiRadius = (_units == Imperial)
+		? _poiRadius->value() * MIINM : (_units == Nautical)
 		? _poiRadius->value() * NMIINM : _poiRadius->value() * KMINM;
-	if (qAbs(poiRadius - _options->poiRadius) > 0.01)
-		_options->poiRadius = poiRadius;
-	_options->poiUseDEM = _poiDEMElevation->isChecked();
+	if (qAbs(poiRadius - _options.poiRadius) > 0.01)
+		_options.poiRadius = poiRadius;
 
-	_options->useOpenGL = _useOpenGL->isChecked();
+	_options.useOpenGL = _useOpenGL->isChecked();
 #ifdef ENABLE_HTTP2
-	_options->enableHTTP2 = _enableHTTP2->isChecked();
+	_options.enableHTTP2 = _enableHTTP2->isChecked();
 #endif // ENABLE_HTTP2
-	_options->pixmapCache = _pixmapCache->value();
-	_options->connectionTimeout = _connectionTimeout->value();
+	_options.pixmapCache = _pixmapCache->value();
+	_options.connectionTimeout = _connectionTimeout->value();
 
-	_options->hiresPrint = _hires->isChecked();
-	_options->printName = _name->isChecked();
-	_options->printDate = _date->isChecked();
-	_options->printDistance = _distance->isChecked();
-	_options->printTime = _time->isChecked();
-	_options->printMovingTime = _movingTime->isChecked();
-	_options->printItemCount = _itemCount->isChecked();
-	_options->separateGraphPage = _separateGraphPage->isChecked();
+	_options.hiresPrint = _hires->isChecked();
+	_options.printName = _name->isChecked();
+	_options.printDate = _date->isChecked();
+	_options.printDistance = _distance->isChecked();
+	_options.printTime = _time->isChecked();
+	_options.printMovingTime = _movingTime->isChecked();
+	_options.printItemCount = _itemCount->isChecked();
+	_options.separateGraphPage = _separateGraphPage->isChecked();
 
 	QDialog::accept();
 }

src/GUI/optionsdialog.h

@@ -5,6 +5,9 @@
 #include "common/config.h"
 #include "palette.h"
 #include "units.h"
+#ifdef ENABLE_TIMEZONES
+#include "timezoneinfo.h"
+#endif // ENABLE_TIMEZONES
 
 class ColorBox;
 class StyleComboBox;
@@ -17,6 +20,7 @@ class QRadioButton;
 class PercentSlider;
 class LimitedComboBox;
 
+
 struct Options {
 	// Appearance
 	Palette palette;
@@ -49,13 +53,19 @@ struct Options {
 	int cadenceFilter;
 	int powerFilter;
 	bool outlierEliminate;
+	bool automaticPause;
 	qreal pauseSpeed;
 	int pauseInterval;
 	bool useReportedSpeed;
 	bool dataUseDEM;
+	bool showSecondaryElevation;
+	bool showSecondarySpeed;
+#ifdef ENABLE_TIMEZONES
+	TimeZoneInfo timeZone;
+#endif // ENABLE_TIMEZONES
+	bool useSegments;
 	// POI
 	int poiRadius;
-	bool poiUseDEM;
 	// System
 	bool useOpenGL;
 #ifdef ENABLE_HTTP2
@@ -72,8 +82,6 @@ struct Options {
 	bool printMovingTime;
 	bool printItemCount;
 	bool separateGraphPage;
-
-	Units units;
 };
 
 class OptionsDialog : public QDialog
@@ -84,7 +92,10 @@ public slots:
 	void accept();
 
 public:
-	OptionsDialog(Options *options, QWidget *parent = 0);
+	OptionsDialog(Options &options, Units units, QWidget *parent = 0);
+
+private slots:
+	void automaticPauseDetectionSet(bool set);
 
 private:
 	QWidget *createMapPage();
@@ -94,11 +105,12 @@ private:
 	QWidget *createSystemPage();
 	QWidget *createExportPage();
 
-	Options *_options;
+	Options &_options;
 
+	Units _units;
 	// Appearance
 	ColorBox *_baseColor;
-	QDoubleSpinBox *_colorOffset;
+	PercentSlider *_colorOffset;
 	PercentSlider *_mapOpacity;
 	ColorBox *_backgroundColor;
 	QSpinBox *_trackWidth;
@@ -129,16 +141,25 @@ private:
 	OddSpinBox *_cadenceFilter;
 	OddSpinBox *_powerFilter;
 	QCheckBox *_outlierEliminate;
+	QRadioButton *_automaticPause;
+	QRadioButton *_manualPause;
 	QDoubleSpinBox *_pauseSpeed;
 	QSpinBox *_pauseInterval;
 	QRadioButton *_computedSpeed;
 	QRadioButton *_reportedSpeed;
 	QRadioButton *_dataGPSElevation;
 	QRadioButton *_dataDEMElevation;
+	QCheckBox *_showSecondaryElevation;
+	QCheckBox *_showSecondarySpeed;
+#ifdef ENABLE_TIMEZONES
+	QRadioButton *_utcZone;
+	QRadioButton *_systemZone;
+	QRadioButton *_customZone;
+	QComboBox *_timeZone;
+#endif // ENABLE_TIMEZONES
+	QCheckBox *_useSegments;
 	// POI
 	QDoubleSpinBox *_poiRadius;
-	QRadioButton *_poiGPSElevation;
-	QRadioButton *_poiDEMElevation;
 	// System
 	QSpinBox *_pixmapCache;
 	QSpinBox *_connectionTimeout;

src/GUI/pathitem.cpp

@@ -1,9 +1,11 @@
 #include <cmath>
 #include <QCursor>
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
 #include "common/greatcircle.h"
 #include "map/map.h"
 #include "pathtickitem.h"
+#include "popup.h"
 #include "pathitem.h"
 
 
@@ -19,12 +21,16 @@ static inline unsigned segments(qreal distance)
 	return ceil(distance / GEOGRAPHICAL_MILE);
 }
 
+Units PathItem::_units = Metric;
+#ifdef ENABLE_TIMEZONES
+QTimeZone PathItem::_timeZone = QTimeZone::utc();
+#endif // ENABLE_TIMEZONES
+
 PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
-  : QGraphicsObject(parent), _path(path), _map(map)
+  : GraphicsItem(parent), _path(path), _map(map)
 {
 	Q_ASSERT(_path.isValid());
 
-	_units = Metric;
 	_digitalZoom = 0;
 	_width = 3;
 	QBrush brush(Qt::SolidPattern);
@@ -38,6 +44,7 @@ PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
 
 	_markerDistance = _path.first().first().distance();
 	_marker = new MarkerItem(this);
+	_marker->setZValue(1);
 	_marker->setPos(position(_markerDistance));
 
 	setCursor(Qt::ArrowCursor);
@@ -336,7 +343,6 @@ void PathItem::updateTicks()
 		_ticks[i] = new PathTickItem(tr, (i + 1) * ts, this);
 		_ticks[i]->setPos(position((i + 1) * ts * xInM()));
 		_ticks[i]->setColor(_pen.color());
-		_ticks[i]->setToolTip(toolTip());
 	}
 }
 
@@ -350,16 +356,6 @@ void PathItem::showTicks(bool show)
 	updateTicks();
 }
 
-void PathItem::setUnits(Units units)
-{
-	if (_units == units)
-		return;
-
-	prepareGeometryChange();
-	_units = units;
-	updateTicks();
-}
-
 void PathItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
@@ -381,3 +377,9 @@ void PathItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
 	emit selected(false);
 }
+
+void PathItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), info(), event->widget());
+	GraphicsItem::mousePressEvent(event);
+}

src/GUI/pathitem.h

@@ -1,21 +1,27 @@
 #ifndef PATHITEM_H
 #define PATHITEM_H
 
+#include "common/config.h"
 #include <QGraphicsObject>
 #include <QPen>
+#ifdef ENABLE_TIMEZONES
+#include <QTimeZone>
+#endif // ENABLE_TIMEZONES
 #include "data/path.h"
 #include "markeritem.h"
 #include "units.h"
+#include "graphicsscene.h"
 
 class Map;
 class PathTickItem;
 
-class PathItem : public QGraphicsObject
+class PathItem : public QObject, public GraphicsItem
 {
 	Q_OBJECT
 
 public:
 	PathItem(const Path &path, Map *map, QGraphicsItem *parent = 0);
+	virtual ~PathItem() {}
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
@@ -26,7 +32,6 @@ public:
 
 	void setMap(Map *map);
 
-	void setUnits(Units units);
 	void setColor(const QColor &color);
 	void setWidth(qreal width);
 	void setStyle(Qt::PenStyle style);
@@ -35,7 +40,12 @@ public:
 	void showMarker(bool show);
 	void showTicks(bool show);
 
-	Units units() const {return _units;}
+	void updateTicks();
+
+	static void setUnits(Units units) {_units = units;}
+#ifdef ENABLE_TIMEZONES
+	static void setTimeZone(const QTimeZone &zone) {_timeZone = zone;}
+#endif // ENABLE_TIMEZONES
 
 public slots:
 	void moveMarker(qreal distance);
@@ -44,6 +54,16 @@ public slots:
 signals:
 	void selected(bool);
 
+protected:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
+	static Units _units;
+#ifdef ENABLE_TIMEZONES
+	static QTimeZone _timeZone;
+#endif // ENABLE_TIMEZONES
+
 private:
 	const PathSegment *segment(qreal x) const;
 	QPointF position(qreal distance) const;
@@ -53,17 +73,12 @@ private:
 
 	qreal xInM() const;
 	unsigned tickSize() const;
-	void updateTicks();
-
-	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 
 	Path _path;
 	Map *_map;
 	qreal _markerDistance;
 	int _digitalZoom;
 
-	Units _units;
 	qreal _width;
 	QPen _pen;
 	QPainterPath _shape;

src/GUI/pathtickitem.cpp

@@ -1,6 +1,9 @@
 #include <QPainter>
 #include <QCursor>
+#include <QGraphicsSceneMouseEvent>
 #include "font.h"
+#include "popup.h"
+#include "pathitem.h"
 #include "pathtickitem.h"
 
 
@@ -17,7 +20,7 @@ static QFont defaultFont()
 QFont PathTickItem::_font = defaultFont();
 
 PathTickItem::PathTickItem(const QRectF &tickRect, int value,
-  QGraphicsItem *parent) : QGraphicsItem(parent), _tickRect(tickRect),
+  QGraphicsItem *parent) : GraphicsItem(parent), _tickRect(tickRect),
   _text(QString::number(value))
 {
 	_tickRect.moveCenter(QPointF(0, -_tickRect.height()/2.0 - 3));
@@ -69,3 +72,10 @@ QRect PathTickItem::tickRect(int value)
 	return fm.boundingRect(QRect(), Qt::AlignCenter,
 	  QString::number(qMax(value, 10))).adjusted(-2, 0, 2, 0);
 }
+
+void PathTickItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	const PathItem *pi = static_cast<PathItem*>(parentItem());
+	Popup::show(event->screenPos(), pi->info(), event->widget());
+	QGraphicsItem::mousePressEvent(event);
+}

src/GUI/pathtickitem.h

@@ -3,8 +3,9 @@
 
 #include <QFont>
 #include <QGraphicsItem>
+#include "graphicsscene.h"
 
-class PathTickItem : public QGraphicsItem
+class PathTickItem : public GraphicsItem
 {
 public:
 	PathTickItem(const QRectF &tickRect, int value, QGraphicsItem *parent = 0);
@@ -16,8 +17,14 @@ public:
 	void setPos(const QPointF &pos);
 	void setColor(const QColor &color) {_brush = QBrush(color);}
 
+	int type() const {return parentItem()->type();}
+	QString info() const {return static_cast<GraphicsItem*>(parentItem())->info();}
+
 	static QRect tickRect(int value);
 
+protected:
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
 private:
 	QRectF _tickRect;
 	QString _text;