Some more shortcuts

Version 2.6
Scale artefacts fix
2025-07-02 05:49:15 +02:00 · 2016-02-02 23:13:08 +01:00 · 2016-02-02 23:02:03 +01:00 · 2016-02-02 22:56:38 +01:00 · 2016-02-02 20:12:56 +01:00 · 2016-02-02 09:07:04 +01:00
26 changed files with 643 additions and 156 deletions
--- a/gpxsee.nsi
+++ b/gpxsee.nsi
@ -63,7 +63,7 @@ Section "GPXSee (required)" SEC_APP
  ; Write the uninstall keys for Windows
  WriteRegStr HKCU "${REGENTRY}" "DisplayName" "GPXSee"
  WriteRegStr HKCU "${REGENTRY}" "Publisher" "Martin Tuma"
-  WriteRegStr HKCU "${REGENTRY}" "DisplayVersion" "2.4"
+  WriteRegStr HKCU "${REGENTRY}" "DisplayVersion" "2.6"
  WriteRegStr HKCU "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
  WriteRegDWORD HKCU "${REGENTRY}" "NoModify" 1
  WriteRegDWORD HKCU "${REGENTRY}" "NoRepair" 1
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -27,7 +27,10 @@ HEADERS += src/config.h \
    src/filebrowser.h \
    src/map.h \
    src/maplist.h \
-    src/downloader.h
+    src/downloader.h \
+    src/units.h \
+    src/scaleitem.h \
+    src/nicenum.h
 SOURCES += src/main.cpp \
    src/gui.cpp \
    src/gpx.cpp \
@ -48,7 +51,9 @@ SOURCES += src/main.cpp \
    src/filebrowser.cpp \
    src/map.cpp \
    src/maplist.cpp \
-    src/downloader.cpp
+    src/downloader.cpp \
+    src/scaleitem.cpp \
+    src/nicenum.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts
 macx:ICON = icons/gpxsee.icns
--- a/lang/gpxsee_cs.ts
+++ b/lang/gpxsee_cs.ts
@ -15,31 +15,43 @@
    </message>
    <message>
        <location filename="../src/elevationgraph.cpp" line="15"/>
+        <location filename="../src/elevationgraph.cpp" line="81"/>
        <source>km</source>
        <translation>km</translation>
    </message>
    <message>
        <location filename="../src/elevationgraph.cpp" line="16"/>
+        <location filename="../src/elevationgraph.cpp" line="82"/>
        <source>m</source>
        <translation>m</translation>
    </message>
    <message>
-        <location filename="../src/elevationgraph.cpp" line="52"/>
+        <location filename="../src/elevationgraph.cpp" line="22"/>
        <source>Ascent</source>
        <translation>Stoupání</translation>
    </message>
    <message>
-        <location filename="../src/elevationgraph.cpp" line="54"/>
+        <location filename="../src/elevationgraph.cpp" line="24"/>
        <source>Descent</source>
        <translation>Klesání</translation>
    </message>
    <message>
-        <location filename="../src/elevationgraph.cpp" line="58"/>
+        <location filename="../src/elevationgraph.cpp" line="28"/>
        <source>Minimum</source>
        <translation>Minimum</translation>
    </message>
    <message>
-        <location filename="../src/elevationgraph.cpp" line="56"/>
+        <location filename="../src/elevationgraph.cpp" line="86"/>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <location filename="../src/elevationgraph.cpp" line="87"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../src/elevationgraph.cpp" line="26"/>
        <source>Maximum</source>
        <translation>Maximum</translation>
    </message>
@ -52,12 +64,12 @@
        <translation>O Qt</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="319"/>
+        <location filename="../src/gui.cpp" line="339"/>
        <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
        <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="381"/>
+        <location filename="../src/gui.cpp" line="400"/>
        <source>Open file</source>
        <translation>Otevřít soubor</translation>
    </message>
@ -67,7 +79,7 @@
        <translation>Uložit jako</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="434"/>
+        <location filename="../src/gui.cpp" line="455"/>
        <source>Open POI file</source>
        <translation>Otevřít POI soubor</translation>
    </message>
@ -83,8 +95,8 @@
    </message>
    <message>
        <location filename="../src/gui.cpp" line="132"/>
-        <location filename="../src/gui.cpp" line="335"/>
-        <location filename="../src/gui.cpp" line="336"/>
+        <location filename="../src/gui.cpp" line="355"/>
+        <location filename="../src/gui.cpp" line="356"/>
        <source>Keyboard controls</source>
        <translation>Ovládací klávesy</translation>
    </message>
@ -104,20 +116,20 @@
        <translation>Znovu načíst</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="262"/>
+        <location filename="../src/gui.cpp" line="279"/>
        <source>Show</source>
        <translation>Zobrazit</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="216"/>
-        <location filename="../src/gui.cpp" line="253"/>
+        <location filename="../src/gui.cpp" line="229"/>
+        <location filename="../src/gui.cpp" line="270"/>
        <source>File</source>
        <translation>Soubor</translation>
    </message>
    <message>
        <location filename="../src/gui.cpp" line="130"/>
-        <location filename="../src/gui.cpp" line="354"/>
-        <location filename="../src/gui.cpp" line="355"/>
+        <location filename="../src/gui.cpp" line="373"/>
+        <location filename="../src/gui.cpp" line="374"/>
        <source>Data sources</source>
        <translation>Zdroje dat</translation>
    </message>
@ -148,190 +160,225 @@
    </message>
    <message>
        <location filename="../src/gui.cpp" line="198"/>
+        <source>Metric</source>
+        <translation>Metrické</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="204"/>
+        <source>Imperial</source>
+        <translation>Imperiální</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="211"/>
        <source>Next</source>
        <translation>Následující</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="201"/>
+        <location filename="../src/gui.cpp" line="214"/>
        <source>Previous</source>
        <translation>Předchozí</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="205"/>
+        <location filename="../src/gui.cpp" line="218"/>
        <source>Last</source>
        <translation>Poslední</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="208"/>
+        <location filename="../src/gui.cpp" line="221"/>
        <source>First</source>
        <translation>První</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="230"/>
+        <location filename="../src/gui.cpp" line="243"/>
        <source>Map</source>
        <translation>Mapa</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="235"/>
+        <location filename="../src/gui.cpp" line="248"/>
        <source>POI</source>
        <translation>POI</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="239"/>
+        <location filename="../src/gui.cpp" line="252"/>
        <source>Settings</source>
        <translation>Nastavení</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="243"/>
+        <location filename="../src/gui.cpp" line="253"/>
+        <source>Units</source>
+        <translation>Jednotky</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="260"/>
        <source>Help</source>
        <translation>Nápověda</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="287"/>
+        <location filename="../src/gui.cpp" line="307"/>
        <source>Elevation</source>
        <translation>Výška</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="288"/>
+        <location filename="../src/gui.cpp" line="308"/>
        <source>Speed</source>
        <translation>Rychlost</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="338"/>
+        <location filename="../src/gui.cpp" line="358"/>
        <source>Next file</source>
        <translation>Následující soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="339"/>
+        <location filename="../src/gui.cpp" line="359"/>
        <source>Previous file</source>
        <translation>Předchozí soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="341"/>
+        <location filename="../src/gui.cpp" line="361"/>
        <source>First file</source>
        <translation>První soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="342"/>
+        <location filename="../src/gui.cpp" line="362"/>
        <source>Last file</source>
        <translation>Poslední soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="344"/>
+        <location filename="../src/gui.cpp" line="363"/>
        <source>Append modifier</source>
        <translation>Modifikátor nahradit/přidat</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="358"/>
+        <location filename="../src/gui.cpp" line="377"/>
        <source>Map (tiles) source URLs are read on program startup from the following file:</source>
        <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="362"/>
+        <location filename="../src/gui.cpp" line="381"/>
        <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
        <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="370"/>
+        <location filename="../src/gui.cpp" line="389"/>
        <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
        <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="425"/>
-        <location filename="../src/gui.cpp" line="441"/>
+        <location filename="../src/gui.cpp" line="446"/>
+        <location filename="../src/gui.cpp" line="462"/>
        <source>Line: %1</source>
        <translation>Řádka: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="493"/>
+        <location filename="../src/gui.cpp" line="509"/>
+        <location filename="../src/gui.cpp" line="629"/>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="512"/>
+        <location filename="../src/gui.cpp" line="514"/>
+        <location filename="../src/gui.cpp" line="516"/>
+        <location filename="../src/gui.cpp" line="518"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="515"/>
+        <location filename="../src/gui.cpp" line="527"/>
        <source>Maximum</source>
        <translation>Maximum</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="495"/>
+        <location filename="../src/gui.cpp" line="517"/>
+        <location filename="../src/gui.cpp" line="529"/>
        <source>Minimum</source>
        <translation>Minimum</translation>
    </message>
    <message>
        <location filename="../src/gui.cpp" line="135"/>
-        <location filename="../src/gui.cpp" line="315"/>
+        <location filename="../src/gui.cpp" line="335"/>
        <source>About GPXSee</source>
        <translation>O aplikaci GPXSee</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="269"/>
+        <location filename="../src/gui.cpp" line="286"/>
        <source>Navigation</source>
        <translation>Navigace</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="317"/>
+        <location filename="../src/gui.cpp" line="337"/>
        <source>GPX viewer and analyzer</source>
        <translation>Prohlížeč a analyzátor GPX</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="357"/>
+        <location filename="../src/gui.cpp" line="376"/>
        <source>Map sources</source>
        <translation>Mapové zdroje</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="369"/>
+        <location filename="../src/gui.cpp" line="388"/>
        <source>POIs</source>
        <translation>POI body</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="486"/>
+        <location filename="../src/gui.cpp" line="508"/>
+        <location filename="../src/gui.cpp" line="520"/>
        <source>Distance</source>
        <translation>Vzdálenost</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="488"/>
+        <location filename="../src/gui.cpp" line="510"/>
+        <location filename="../src/gui.cpp" line="522"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="489"/>
+        <location filename="../src/gui.cpp" line="511"/>
+        <location filename="../src/gui.cpp" line="523"/>
        <source>Ascent</source>
        <translation>Stoupání</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="490"/>
-        <location filename="../src/gui.cpp" line="492"/>
-        <location filename="../src/gui.cpp" line="494"/>
-        <location filename="../src/gui.cpp" line="496"/>
+        <location filename="../src/gui.cpp" line="524"/>
+        <location filename="../src/gui.cpp" line="526"/>
+        <location filename="../src/gui.cpp" line="528"/>
+        <location filename="../src/gui.cpp" line="530"/>
        <source>m</source>
        <translation>m</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="491"/>
+        <location filename="../src/gui.cpp" line="513"/>
+        <location filename="../src/gui.cpp" line="525"/>
        <source>Descent</source>
        <translation>Klesání</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="588"/>
+        <location filename="../src/gui.cpp" line="625"/>
        <source>%1 tracks</source>
        <translation>Počet tras: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="487"/>
-        <location filename="../src/gui.cpp" line="591"/>
+        <location filename="../src/gui.cpp" line="521"/>
+        <location filename="../src/gui.cpp" line="632"/>
        <source>km</source>
        <translation>km</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="427"/>
-        <location filename="../src/gui.cpp" line="442"/>
+        <location filename="../src/gui.cpp" line="448"/>
+        <location filename="../src/gui.cpp" line="463"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="422"/>
+        <location filename="../src/gui.cpp" line="443"/>
        <source>Error loading GPX file:
 %1</source>
        <translation>Soubor GPX nelze otevřít:
 %1</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="438"/>
+        <location filename="../src/gui.cpp" line="459"/>
        <source>Error loading POI file:
 %1</source>
        <translation>Soubor POI nelze otevřít:
@ -352,23 +399,35 @@
    </message>
    <message>
        <location filename="../src/speedgraph.cpp" line="11"/>
+        <location filename="../src/speedgraph.cpp" line="70"/>
        <source>km</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../src/speedgraph.cpp" line="12"/>
+        <location filename="../src/speedgraph.cpp" line="71"/>
        <source>km/h</source>
        <translation>km/h</translation>
    </message>
    <message>
-        <location filename="../src/speedgraph.cpp" line="35"/>
+        <location filename="../src/speedgraph.cpp" line="20"/>
        <source>Average</source>
        <translation>Průměr</translation>
    </message>
    <message>
-        <location filename="../src/speedgraph.cpp" line="37"/>
+        <location filename="../src/speedgraph.cpp" line="22"/>
        <source>Maximum</source>
        <translation>Maximum</translation>
    </message>
+    <message>
+        <location filename="../src/speedgraph.cpp" line="75"/>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <location filename="../src/speedgraph.cpp" line="76"/>
+        <source>mi/h</source>
+        <translation>mi/h</translation>
+    </message>
 </context>
 </TS>
--- a/src/axisitem.cpp
+++ b/src/axisitem.cpp
@ -1,6 +1,7 @@
 #include <cmath>
 #include <QPainter>
 #include "config.h"
+#include "nicenum.h"
 #include "axisitem.h"


@ -15,38 +16,6 @@ struct Label {
 	double d;
 };

-static double niceNum(double x, int round)
-{
-	int expv;
-	double f;
-	double nf;
-
-	expv = floor(log10(x));
-	f = x / pow(10.0, expv);
-
-	if (round) {
-		if (f < 1.5)
-			nf = 1.0;
-		else if (f < 3.0)
-			nf = 2.0;
-		else if (f < 7.0)
-			nf = 5.0;
-		else
-			nf = 10.0;
-	} else {
-		if (f <= 1.0)
-			nf = 1.;
-		else if (f <= 2.0)
-			nf = 2.0;
-		else if (f <= 5.0)
-			nf = 5.0;
-		else
-			nf = 10.0;
-	}
-
-	return nf * pow(10.0, expv);
-}
-
 static struct Label label(double min, double max, int ticks)
 {
 	double range;
@ -123,7 +92,6 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	QFont font;
 	font.setPixelSize(FONT_SIZE);
 	font.setFamily(FONT_FAMILY);
-	painter->setFont(font);
 	QFontMetrics fm(font);
 	QRect ts, ls;
 	struct Label l;
@ -131,6 +99,8 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	qreal val;


+	painter->setFont(font);
+
 	ls = fm.tightBoundingRect(_label);

 	if (_type == X) {
--- a/src/config.h
+++ b/src/config.h
@ -3,7 +3,7 @@

 #define APP_NAME       "GPXSee"
 #define APP_HOMEPAGE   "http://tumic.wz.cz/gpxsee"
-#define APP_VERSION    "2.4"
+#define APP_VERSION    "2.6"

 #define FONT_FAMILY    "Arial"
 #define FONT_SIZE      12
--- a/src/elevationgraph.cpp
+++ b/src/elevationgraph.cpp
@ -14,7 +14,19 @@ ElevationGraph::ElevationGraph(QWidget *parent) : Graph(parent)
 	Graph::setYLabel(tr("Elevation"));
 	Graph::setXUnits(tr("km"));
 	Graph::setYUnits(tr("m"));
-	Graph::setXScale(0.001);
+	Graph::setXScale(M2KM);
+}
+
+void ElevationGraph::addInfo()
+{
+	Graph::addInfo(tr("Ascent"), QString::number(_ascent * _yScale, 'f', 0)
+	  + THIN_SPACE + _yUnits);
+	Graph::addInfo(tr("Descent"), QString::number(_descent * _yScale, 'f', 0)
+	  + THIN_SPACE + _yUnits);
+	Graph::addInfo(tr("Maximum"), QString::number(_max * _yScale, 'f', 0)
+	  + THIN_SPACE + _yUnits);
+	Graph::addInfo(tr("Minimum"), QString::number(_min * _yScale, 'f', 0)
+	  + THIN_SPACE + _yUnits);
 }

 void ElevationGraph::loadGPX(const GPX &gpx)
@ -49,16 +61,8 @@ void ElevationGraph::loadGPX(const GPX &gpx)
 	_max = qMax(_max, max);
 	_min = qMin(_min, min);

-	addInfo(tr("Ascent"), QString::number(_ascent, 'f', 0)
-	  + THIN_SPACE + _yUnits);
-	addInfo(tr("Descent"), QString::number(_descent, 'f', 0)
-	  + THIN_SPACE + _yUnits);
-	addInfo(tr("Maximum"), QString::number(_max, 'f', 0)
-	  + THIN_SPACE + _yUnits);
-	addInfo(tr("Minimum"), QString::number(_min, 'f', 0)
-	  + THIN_SPACE + _yUnits);
-
-	Graph::loadData(data);
+	addInfo();
+	loadData(data);
 }

 void ElevationGraph::clear()
@ -70,3 +74,23 @@ void ElevationGraph::clear()

 	Graph::clear();
 }
+
+void ElevationGraph::setUnits(enum Units units)
+{
+	if (units == Metric) {
+		Graph::setXUnits(tr("km"));
+		Graph::setYUnits(tr("m"));
+		Graph::setXScale(M2KM);
+		Graph::setYScale(1);
+	} else {
+		Graph::setXUnits(tr("mi"));
+		Graph::setYUnits(tr("ft"));
+		Graph::setXScale(M2MI);
+		Graph::setYScale(M2FT);
+	}
+
+	clearInfo();
+	addInfo();
+
+	redraw();
+}
--- a/src/elevationgraph.h
+++ b/src/elevationgraph.h
@ -3,6 +3,7 @@

 #include "graph.h"
 #include "gpx.h"
+#include "units.h"

 class ElevationGraph : public Graph
 {
@ -13,6 +14,7 @@ public:

 	void loadGPX(const GPX &gpx);
 	void clear();
+	void setUnits(enum Units units);

 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}
@ -20,6 +22,8 @@ public:
 	qreal min() const {return _min;}

 private:
+	void addInfo();
+
 	qreal _ascent, _descent;
 	qreal _max, _min;
 };
--- a/src/graph.cpp
+++ b/src/graph.cpp
@ -116,6 +116,16 @@ void Graph::setYUnits(const QString &units)
 	createYLabel();
 }

+void Graph::setXScale(qreal scale)
+{
+	_xScale = scale;
+}
+
+void Graph::setYScale(qreal scale)
+{
+	_yScale = scale;
+}
+
 void Graph::loadData(const QVector<QPointF> &data)
 {
 	QPainterPath path;
@ -143,7 +153,13 @@ void Graph::loadData(const QVector<QPointF> &data)
 	if (_graphs.size() > 1)
 		_sliderInfo->hide();

-	resize(viewport()->size() - QSizeF(MARGIN, MARGIN));
+	redraw();
+}
+
+void Graph::redraw()
+{
+	if (!_graphs.isEmpty())
+		resize(viewport()->size() - QSizeF(MARGIN, MARGIN));
 }

 void Graph::resize(const QSizeF &size)
@ -187,10 +203,17 @@ void Graph::resize(const QSizeF &size)
 	_scene->addItem(_xAxis);
 	_scene->addItem(_yAxis);

+	qreal sp = (_slider->pos().x() == _slider->area().left())
+		? 0 : (_slider->pos().x() - _slider->area().left())
+		  / _slider->area().width();
 	_slider->setArea(r);
-	_slider->setPos(r.bottomLeft());
+	_slider->setPos(QPointF(sp * r.width(), r.bottom()));
 	_scene->addItem(_slider);

+	const QPainterPath &path = _graphs.at(0)->path();
+	QPointF p = path.pointAtPercent(sp);
+	_sliderInfo->setText(QString::number(-p.y() * _yScale, 'f', _precision));
+
 	r = _scene->itemsBoundingRect();
 	_info->setPos(r.topLeft() + QPointF(r.width()/2
 	  - _info->boundingRect().width()/2, -_info->boundingRect().height()));
@ -202,7 +225,7 @@ void Graph::resize(const QSizeF &size)
 void Graph::resizeEvent(QResizeEvent *)
 {
 	if (!_graphs.empty())
-		resize(viewport()->size() - QSizeF(MARGIN, MARGIN));
+		redraw();
 }

 void Graph::plot(QPainter *painter, const QRectF &target)
@ -214,7 +237,7 @@ void Graph::plot(QPainter *painter, const QRectF &target)
 	resize(canvas);
 	_slider->hide();
 	_info->hide();
-	_scene->render(painter, target, QRectF(), Qt::KeepAspectRatioByExpanding);
+	_scene->render(painter, target, QRectF());
 	_slider->show();
 	_info->show();
 	resize(orig);
@ -234,6 +257,7 @@ void Graph::clear()
 		_scene->removeItem(_info);
 	_sliderInfo->show();

+	_slider->clear();
 	_info->clear();
 	_scene->clear();
 	_graphs.clear();
@ -285,3 +309,8 @@ void Graph::addInfo(const QString &key, const QString &value)
 {
 	_info->insert(key, value);
 }
+
+void Graph::clearInfo()
+{
+	_info->clear();
+}
--- a/src/graph.h
+++ b/src/graph.h
@ -41,10 +41,12 @@ public:
 	void setYLabel(const QString &label);
 	void setXUnits(const QString &units);
 	void setYUnits(const QString &units);
-	void setXScale(qreal scale) {_xScale = scale;}
-	void setYScale(qreal scale) {_yScale = scale;}
+	void setXScale(qreal scale);
+	void setYScale(qreal scale);
 	void setPrecision(int p) {_precision = p;}

+	void redraw();
+
 	void plot(QPainter *painter, const QRectF &target);
 	void clear();

@ -52,6 +54,7 @@ public:
 	void setSliderPosition(qreal pos);

 	void addInfo(const QString &key, const QString &value);
+	void clearInfo();

 signals:
 	void sliderPositionChanged(qreal);
--- a/src/gui.cpp
+++ b/src/gui.cpp
@ -31,7 +31,7 @@ static QString timeSpan(qreal time)
 	s = time - (h * 3600) - (m * 60);

 	return QString("%1:%2:%3").arg(h).arg(m, 2, 10, QChar('0'))
-	  .arg(s,2, 10, QChar('0'));
+	  .arg(s, 2, 10, QChar('0'));
 }


@ -170,12 +170,14 @@ void GUI::createActions()
 	_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
 	  tr("Show POIs"), this);
 	_showPOIAction->setCheckable(true);
+	_showPOIAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P));
 	connect(_showPOIAction, SIGNAL(triggered(bool)), this, SLOT(showPOI(bool)));

 	// Map actions
 	_showMapAction = new QAction(QIcon(QPixmap(SHOW_MAP_ICON)), tr("Show map"),
 	  this);
 	_showMapAction->setCheckable(true);
+	_showMapAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
 	connect(_showMapAction, SIGNAL(triggered(bool)), this, SLOT(showMap(bool)));
 	if (_maps.empty())
 		_showMapAction->setEnabled(false);
@ -186,6 +188,7 @@ void GUI::createActions()
 	_showGraphsAction = new QAction(tr("Show graphs"), this);
 	_showGraphsAction->setCheckable(true);
 	_showGraphsAction->setChecked(true);
+	_showGraphsAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G));
 	connect(_showGraphsAction, SIGNAL(triggered(bool)), this,
 	  SLOT(showGraphs(bool)));
 	_showToolbarsAction = new QAction(tr("Show toolbars"), this);
@ -193,6 +196,19 @@ void GUI::createActions()
 	_showToolbarsAction->setChecked(true);
 	connect(_showToolbarsAction, SIGNAL(triggered(bool)), this,
 	  SLOT(showToolbars(bool)));
+	QActionGroup *ag = new QActionGroup(this);
+	ag->setExclusive(true);
+	_metricUnitsAction = new QAction(tr("Metric"), this);
+	_metricUnitsAction->setCheckable(true);
+	_metricUnitsAction->setActionGroup(ag);
+	_metricUnitsAction->setChecked(true);
+	connect(_metricUnitsAction, SIGNAL(triggered()), this,
+	  SLOT(setMetricUnits()));
+	_imperialUnitsAction = new QAction(tr("Imperial"), this);
+	_imperialUnitsAction->setCheckable(true);
+	_imperialUnitsAction->setActionGroup(ag);
+	connect(_imperialUnitsAction, SIGNAL(triggered()), this,
+	  SLOT(setImperialUnits()));

 	// Navigation actions
 	_nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this);
@ -237,6 +253,10 @@ void GUI::createMenus()
 	_poiMenu->addAction(_showPOIAction);

 	_settingsMenu = menuBar()->addMenu(tr("Settings"));
+	_unitsMenu = _settingsMenu->addMenu(tr("Units"));
+	_unitsMenu->addAction(_metricUnitsAction);
+	_unitsMenu->addAction(_imperialUnitsAction);
+	_settingsMenu->addSeparator();
 	_settingsMenu->addAction(_showToolbarsAction);
 	_settingsMenu->addAction(_showGraphsAction);

@ -487,17 +507,31 @@ void GUI::saveFile(const QString &fileName)

 	QGraphicsScene scene;
 	InfoItem info;
-	info.insert(tr("Distance"), QString::number(_distance / 1000, 'f', 1)
-	  + THIN_SPACE + tr("km"));
-	info.insert(tr("Time"), timeSpan(_time));
-	info.insert(tr("Ascent"), QString::number(_elevationGraph->ascent(), 'f', 0)
-	  + THIN_SPACE + tr("m"));
-	info.insert(tr("Descent"), QString::number(_elevationGraph->descent(), 'f',
-	  0) + THIN_SPACE + tr("m"));
-	info.insert(tr("Maximum"), QString::number(_elevationGraph->max(), 'f', 0)
-	  + THIN_SPACE + tr("m"));
-	info.insert(tr("Minimum"), QString::number(_elevationGraph->min(), 'f', 0)
-	  + THIN_SPACE + tr("m"));
+	if (_imperialUnitsAction->isChecked()) {
+		info.insert(tr("Distance"), QString::number(_distance * M2MI, 'f', 1)
+		  + THIN_SPACE + tr("mi"));
+		info.insert(tr("Time"), timeSpan(_time));
+		info.insert(tr("Ascent"), QString::number(_elevationGraph->ascent()
+		  * M2FT, 'f', 0) + THIN_SPACE + tr("ft"));
+		info.insert(tr("Descent"), QString::number(_elevationGraph->descent()
+		  * M2FT, 'f', 0) + THIN_SPACE + tr("ft"));
+		info.insert(tr("Maximum"), QString::number(_elevationGraph->max()
+		  * M2FT, 'f', 0) + THIN_SPACE + tr("ft"));
+		info.insert(tr("Minimum"), QString::number(_elevationGraph->min()
+		  * M2FT, 'f', 0) + THIN_SPACE + tr("ft"));
+	} else {
+		info.insert(tr("Distance"), QString::number(_distance * M2KM, 'f', 1)
+		  + THIN_SPACE + tr("km"));
+		info.insert(tr("Time"), timeSpan(_time));
+		info.insert(tr("Ascent"), QString::number(_elevationGraph->ascent(),
+		  'f', 0) + THIN_SPACE + tr("m"));
+		info.insert(tr("Descent"), QString::number(_elevationGraph->descent(),
+		  'f', 0) + THIN_SPACE + tr("m"));
+		info.insert(tr("Maximum"), QString::number(_elevationGraph->max(), 'f',
+		  0) + THIN_SPACE + tr("m"));
+		info.insert(tr("Minimum"), QString::number(_elevationGraph->min(), 'f',
+		  0) + THIN_SPACE + tr("m"));
+	}
 	scene.addItem(&info);
 	scene.render(&p, QRectF(0, 0, printer.width(), 200));

@ -593,8 +627,12 @@ void GUI::updateStatusBarInfo()
 	else
 		_fileNameLabel->setText(tr("%1 tracks").arg(_files.size()));

-	_distanceLabel->setText(QString::number(_distance / 1000, 'f', 1)
-	  + " " + tr("km"));
+	if (_imperialUnitsAction->isChecked())
+		_distanceLabel->setText(QString::number(_distance * M2MI, 'f', 1)
+		  + " " + tr("mi"));
+	else
+		_distanceLabel->setText(QString::number(_distance * M2KM, 'f', 1)
+		  + " " + tr("km"));
 	_timeLabel->setText(timeSpan(_time));
 }

@ -633,6 +671,22 @@ void GUI::updateNavigationActions()
 	}
 }

+void GUI::setMetricUnits()
+{
+	_track->setUnits(Metric);
+	_elevationGraph->setUnits(Metric);
+	_speedGraph->setUnits(Metric);
+	updateStatusBarInfo();
+}
+
+void GUI::setImperialUnits()
+{
+	_track->setUnits(Imperial);
+	_elevationGraph->setUnits(Imperial);
+	_speedGraph->setUnits(Imperial);
+	updateStatusBarInfo();
+}
+
 void GUI::next()
 {
 	QString file = _browser->next();
--- a/src/gui.h
+++ b/src/gui.h
@ -50,6 +50,9 @@ private slots:
 	void last();
 	void first();

+	void setMetricUnits();
+	void setImperialUnits();
+
 private:
 	void loadFiles();

@ -73,6 +76,7 @@ private:
 	QMenu *_poiMenu;
 	QMenu *_mapMenu;
 	QMenu *_settingsMenu;
+	QMenu *_unitsMenu;

 	QToolBar *_fileToolBar;
 	QToolBar *_showToolBar;
@ -100,6 +104,8 @@ private:
 	QAction *_prevAction;
 	QAction *_lastAction;
 	QAction *_firstAction;
+	QAction *_metricUnitsAction;
+	QAction *_imperialUnitsAction;
 	QList<QAction*> _mapActions;

 	QLabel *_fileNameLabel;
--- a/src/infoitem.cpp
+++ b/src/infoitem.cpp
@ -3,7 +3,6 @@
 #include "config.h"
 #include "infoitem.h"

-
 #define PADDING     10

 InfoItem::InfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)
@ -11,24 +10,21 @@ InfoItem::InfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)

 }

-QRectF InfoItem::boundingRect() const
+void InfoItem::updateBoundingRect()
 {
 	QFont font;
 	font.setPixelSize(FONT_SIZE);
 	font.setFamily(FONT_FAMILY);
 	QFontMetrics fm(font);
 	QList<KV>::const_iterator i;
-	int width = 0;
-
-	if (_list.isEmpty())
-		return QRectF();
+	qreal width = 0;

 	for (i = _list.constBegin(); i != _list.constEnd(); i++) {
 		width += fm.width(i->key + ": ");
 		width += fm.width(i->value) + ((i == _list.end() - 1) ? 0 : PADDING);
 	}

-	return QRectF(0, 0, width, fm.height());
+	_boundingRect = QRectF(0, 0, width, _list.isEmpty() ? 0 : fm.height());
 }

 void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@ -74,5 +70,13 @@ void InfoItem::insert(const QString &key, const QString &value)
 	else
 		_list[i] = kv;

+	updateBoundingRect();
+	prepareGeometryChange();
+}
+
+void InfoItem::clear()
+{
+	_list.clear();
+	updateBoundingRect();
 	prepareGeometryChange();
 }
--- a/src/infoitem.h
+++ b/src/infoitem.h
@ -9,14 +9,16 @@ class InfoItem : public QGraphicsItem
 public:
 	InfoItem(QGraphicsItem *parent = 0);

-	QRectF boundingRect() const;
+	QRectF boundingRect() const {return _boundingRect;}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);

 	void insert(const QString &key, const QString &value);
-	void clear() {_list.clear();}
+	void clear();

 private:
+	void updateBoundingRect();
+
 	class KV {
 	public:
 		QString key;
@ -29,6 +31,7 @@ private:
 	};

 	QList<KV> _list;
+	QRectF _boundingRect;
 };

 #endif // INFOITEM_H
--- a/src/ll.cpp
+++ b/src/ll.cpp
@ -68,3 +68,9 @@ int scale2zoom(qreal scale)
 		return ZOOM_MAX;
 	return zoom;
 }
+
+qreal zoom2resolution(int zoom, qreal y)
+{
+	return (WGS84_RADIUS * 2 * M_PI / 256 * cos(2 * atan(exp(deg2rad(y)))
+	  - M_PI/2)) / pow(2.0, zoom);
+}
--- a/src/ll.h
+++ b/src/ll.h
@ -12,5 +12,6 @@ qreal llDistance(const QPointF &p1, const QPointF &p2);
 QPoint mercator2tile(const QPointF &m, int zoom);
 QPointF tile2mercator(const QPoint &tile, int zoom);
 int scale2zoom(qreal scale);
+qreal zoom2resolution(int zoom, qreal y);

 #endif // LL_H
--- a/src/nicenum.cpp
+++ b/src/nicenum.cpp
@ -0,0 +1,34 @@
+#include <cmath>
+#include "nicenum.h"
+
+double niceNum(double x, int round)
+{
+	int expv;
+	double f;
+	double nf;
+
+	expv = floor(log10(x));
+	f = x / pow(10.0, expv);
+
+	if (round) {
+		if (f < 1.5)
+			nf = 1.0;
+		else if (f < 3.0)
+			nf = 2.0;
+		else if (f < 7.0)
+			nf = 5.0;
+		else
+			nf = 10.0;
+	} else {
+		if (f <= 1.0)
+			nf = 1.0;
+		else if (f <= 2.0)
+			nf = 2.0;
+		else if (f <= 5.0)
+			nf = 5.0;
+		else
+			nf = 10.0;
+	}
+
+	return nf * pow(10.0, expv);
+}
--- a/src/nicenum.h
+++ b/src/nicenum.h
@ -0,0 +1,6 @@
+#ifndef NICENUM_H
+#define NICENUM_H
+
+double niceNum(double x, int round);
+
+#endif // NICENUM_H
--- a/src/scaleitem.cpp
+++ b/src/scaleitem.cpp
@ -0,0 +1,129 @@
+#include <QPainter>
+#include "config.h"
+#include "ll.h"
+#include "nicenum.h"
+#include "scaleitem.h"
+
+
+#define SCALE_WIDTH  132
+#define SCALE_HEIGHT 5
+#define SEGMENTS 3
+
+#define PADDING 4
+
+
+ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
+{
+	_units = Metric;
+	_zoom = ZOOM_MIN;
+	_lat = 0;
+}
+
+void ScaleItem::updateBoundingRect()
+{
+	QFont font;
+	font.setPixelSize(FONT_SIZE);
+	font.setFamily(FONT_FAMILY);
+	QFontMetrics fm(font);
+	QRect ss, es, us;
+
+	ss = fm.tightBoundingRect(QString::number(0));
+	es = fm.tightBoundingRect(QString::number(_length * SEGMENTS));
+	us = fm.tightBoundingRect(units());
+
+	_boundingRect = QRectF(-ss.width()/2, 0,
+	  _width * SEGMENTS + ss.width()/2 + qMax(us.width() + PADDING, es.width()/2),
+	  SCALE_HEIGHT + PADDING + ss.height() + 2*fm.descent());
+}
+
+void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+  QWidget *widget)
+{
+	Q_UNUSED(option);
+	Q_UNUSED(widget);
+	QFont font;
+	font.setPixelSize(FONT_SIZE);
+	font.setFamily(FONT_FAMILY);
+	QFontMetrics fm(font);
+	QRect br;
+
+	painter->setFont(font);
+
+	for (int i = 0; i <= SEGMENTS; i++) {
+		QString label = QString::number(_length * i);
+		br = fm.tightBoundingRect(label);
+		painter->drawText(_width * i - br.width()/2, br.height(), label);
+	}
+	painter->drawText(_width * SEGMENTS + PADDING, SCALE_HEIGHT + PADDING
+	  + br.height() + fm.descent(), units());
+
+	painter->drawRect(QRectF(0, br.height() + PADDING, SEGMENTS * _width,
+	  SCALE_HEIGHT));
+	for (int i = 0; i < SEGMENTS; i += 2)
+		painter->fillRect(QRectF(i * _width, br.height() + PADDING, _width,
+		  SCALE_HEIGHT), Qt::black);
+
+/*
+	painter->setPen(Qt::red);
+	painter->drawRect(boundingRect());
+*/
+}
+
+QString ScaleItem::units() const
+{
+	if (_units == Imperial)
+		return _scale ? QObject::tr("mi") : QObject::tr("ft");
+	else
+		return _scale ? QObject::tr("km") : QObject::tr("m");
+}
+
+void ScaleItem::computeScale()
+{
+	qreal res = zoom2resolution(_zoom, _lat);
+
+	if (_units == Imperial) {
+		_length = niceNum((res * M2FT * SCALE_WIDTH) / SEGMENTS, 1);
+		if (_length >= MIINFT) {
+			_length = niceNum((res * M2FT * FT2MI * SCALE_WIDTH) / SEGMENTS, 1);
+			_width = (_length / (res * M2FT * FT2MI));
+			_scale = true;
+		} else {
+			_width = (_length / (res * M2FT));
+			_scale = false;
+		}
+	} else {
+		_length = niceNum((res * SCALE_WIDTH) / SEGMENTS, 1);
+		if (_length >= KMINM) {
+			_length *= M2KM;
+			_width = (_length / (res * M2KM));
+			_scale = true;
+		} else {
+			_width = (_length / res);
+			_scale = false;
+		}
+	}
+}
+
+void ScaleItem::setLatitude(qreal lat)
+{
+	_lat = lat;
+	computeScale();
+	updateBoundingRect();
+	prepareGeometryChange();
+}
+
+void ScaleItem::setZoom(int z)
+{
+	_zoom = z;
+	computeScale();
+	updateBoundingRect();
+	prepareGeometryChange();
+}
+
+void ScaleItem::setUnits(enum Units units)
+{
+	_units = units;
+	computeScale();
+	updateBoundingRect();
+	prepareGeometryChange();
+}
--- a/src/scaleitem.h
+++ b/src/scaleitem.h
@ -0,0 +1,35 @@
+#ifndef SCALEITEM_H
+#define SCALEITEM_H
+
+#include <QGraphicsItem>
+#include "units.h"
+
+class ScaleItem : public QGraphicsItem
+{
+public:
+	ScaleItem(QGraphicsItem *parent = 0);
+
+	QRectF boundingRect() const {return _boundingRect;}
+	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	  QWidget *widget);
+
+	void setLatitude(qreal lat);
+	void setZoom(int z);
+	void setUnits(enum Units units);
+
+private:
+	void updateBoundingRect();
+	void computeScale();
+	QString units() const;
+
+	int _zoom;
+	qreal _lat;
+	qreal _width;
+	qreal _length;
+	Units _units;
+	bool _scale;
+
+	QRectF _boundingRect;
+};
+
+#endif // SCALEITEM_H
--- a/src/slideritem.cpp
+++ b/src/slideritem.cpp
@ -46,3 +46,9 @@ QVariant SliderItem::itemChange(GraphicsItemChange change, const QVariant &value

 	return QGraphicsItem::itemChange(change, value);
 }
+
+void SliderItem::clear()
+{
+	_area = QRectF();
+	setPos(QPointF());
+}
--- a/src/slideritem.h
+++ b/src/slideritem.h
@ -17,6 +17,8 @@ public:
 	QRectF area() {return _area;}
 	void setArea(const QRectF &area) {_area = area;}

+	void clear();
+
 signals:
 	void positionChanged(const QPointF&);

--- a/src/speedgraph.cpp
+++ b/src/speedgraph.cpp
@ -10,11 +10,19 @@ SpeedGraph::SpeedGraph(QWidget *parent) : Graph(parent)
 	Graph::setYLabel(tr("Speed"));
 	Graph::setXUnits(tr("km"));
 	Graph::setYUnits(tr("km/h"));
-	Graph::setXScale(0.001);
-	Graph::setYScale(3.6);
+	Graph::setXScale(M2KM);
+	Graph::setYScale(MS2KMH);
 	Graph::setPrecision(1);
 }

+void SpeedGraph::addInfo()
+{
+	Graph::addInfo(tr("Average"), QString::number(avg() * _yScale, 'f', 1)
+	  + THIN_SPACE + _yUnits);
+	Graph::addInfo(tr("Maximum"), QString::number(_max * _yScale,  'f', 1)
+	  + THIN_SPACE + _yUnits);
+}
+
 void SpeedGraph::loadGPX(const GPX &gpx)
 {
 	QVector<QPointF> data;
@ -31,13 +39,8 @@ void SpeedGraph::loadGPX(const GPX &gpx)
 		max = qMax(max, data.at(i).y());
 	_max = qMax(_max, max);

-
-	addInfo(tr("Average"), QString::number(avg() * _yScale, 'f', 1)
-	  + THIN_SPACE + _yUnits);
-	addInfo(tr("Maximum"), QString::number(_max * _yScale,  'f', 1)
-	  + THIN_SPACE + _yUnits);
-
-	Graph::loadData(data);
+	addInfo();
+	loadData(data);
 }

 qreal SpeedGraph::avg() const
@ -60,3 +63,23 @@ void SpeedGraph::clear()

 	Graph::clear();
 }
+
+void SpeedGraph::setUnits(enum Units units)
+{
+	if (units == Metric) {
+		Graph::setXUnits(tr("km"));
+		Graph::setYUnits(tr("km/h"));
+		Graph::setXScale(M2KM);
+		Graph::setYScale(MS2KMH);
+	} else {
+		Graph::setXUnits(tr("mi"));
+		Graph::setYUnits(tr("mi/h"));
+		Graph::setXScale(M2MI);
+		Graph::setYScale(MS2MIH);
+	}
+
+	clearInfo();
+	addInfo();
+
+	redraw();
+}
--- a/src/speedgraph.h
+++ b/src/speedgraph.h
@ -4,6 +4,7 @@
 #include <QList>
 #include "graph.h"
 #include "gpx.h"
+#include "units.h"

 class SpeedGraph : public Graph
 {
@ -14,11 +15,14 @@ public:

 	void loadGPX(const GPX &gpx);
 	void clear();
+	void setUnits(enum Units units);

 	qreal avg() const;
 	qreal max() const {return _max;}

 private:
+	void addInfo();
+
 	qreal _max;
 	QList<QPointF> _avg;
 };
--- a/src/track.cpp
+++ b/src/track.cpp
@ -5,12 +5,14 @@
 #include <QWheelEvent>
 #include "poiitem.h"
 #include "markeritem.h"
+#include "scaleitem.h"
 #include "ll.h"
 #include "track.h"


-#define MARGIN 10.0
-#define TRACK_WIDTH 3
+#define MARGIN          10.0
+#define TRACK_WIDTH     3
+#define SCALE_OFFSET    7

 Track::Track(QWidget *parent)
 	: QGraphicsView(parent)
@ -19,9 +21,13 @@ Track::Track(QWidget *parent)
 	setScene(_scene);
 	setCacheMode(QGraphicsView::CacheBackground);
 	setDragMode(QGraphicsView::ScrollHandDrag);
+	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

+	_mapScale = new ScaleItem();
+	_mapScale->setZValue(2.0);
+
 	_zoom = -1;
 	_scale = 1.0;
 	_map = 0;
@ -79,6 +85,12 @@ void Track::loadGPX(const GPX &gpx)
 	QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
 	_scene->setSceneRect(ba);
 	centerOn(ba.center());
+
+	if (_mapScale->scene() != _scene)
+		_scene->addItem(_mapScale);
+
+	_mapScale->setLatitude(track.at(track.size() / 2).y());
+	_mapScale->setZoom(_zoom);
 }

 QRectF Track::trackBoundingRect() const
@ -198,6 +210,11 @@ void Track::setMap(Map *map)
 	resetCachedContent();
 }

+void Track::setUnits(enum Units units)
+{
+	_mapScale->setUnits(units);
+}
+
 void Track::redraw()
 {
 	resetCachedContent();
@ -225,13 +242,9 @@ void Track::wheelEvent(QWheelEvent *event)
 	else
 		centerOn(pos * scale/_scale);

-	resetCachedContent();
-}
+	_mapScale->setZoom(_zoom);

-void Track::showMarkers(bool show)
-{
-	for (int i = 0; i < _markers.size(); i++)
-		_markers.at(i)->setVisible(show);
+	resetCachedContent();
 }

 void Track::setTrackLineWidth(qreal width)
@ -245,10 +258,14 @@ void Track::setTrackLineWidth(qreal width)

 void Track::plot(QPainter *painter, const QRectF &target)
 {
-	QRectF orig = _scene->itemsBoundingRect();
-	QRectF adj;
+	QRectF orig, adj;
 	qreal ratio, diff;

+	_scene->removeItem(_mapScale);
+	orig = _scene->itemsBoundingRect().adjusted(0, 0, 0,
+	  _mapScale->boundingRect().height());
+	_scene->addItem(_mapScale);
+
 	if (target.width()/target.height() > orig.width()/orig.height()) {
 		ratio = target.width()/target.height();
 		diff = qAbs((orig.height() * ratio) - orig.width());
@ -259,11 +276,13 @@ void Track::plot(QPainter *painter, const QRectF &target)
 		adj = orig.adjusted(0, -diff/2, 0, diff/2);
 	}

-	showMarkers(false);
+	_mapScale->setPos(adj.bottomRight()
+	  + QPoint(-_mapScale->boundingRect().width(),
+	  -_mapScale->boundingRect().height()));
+
 	setTrackLineWidth(0);
-	_scene->render(painter, target, adj, Qt::KeepAspectRatioByExpanding);
+	_scene->render(painter, target, adj);
 	setTrackLineWidth(TRACK_WIDTH * _scale);
-	showMarkers(true);
 }

 enum QPrinter::Orientation Track::orientation() const
@ -286,6 +305,9 @@ void Track::clearPOI()

 void Track::clear()
 {
+	if (_mapScale->scene() == _scene)
+		_scene->removeItem(_mapScale);
+
 	_pois.clear();
 	_tracks.clear();
 	_trackPaths.clear();
@ -339,3 +361,36 @@ void Track::drawBackground(QPainter *painter, const QRectF &rect)
 		painter->drawPixmap(tp, t.pixmap());
 	}
 }
+
+void Track::resizeEvent(QResizeEvent *e)
+{
+	if (_tracks.isEmpty())
+		return;
+
+	QRectF br = trackBoundingRect();
+	QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
+
+	if (ba.width() < e->size().width()) {
+		qreal diff = e->size().width() - ba.width();
+		ba.adjust(-diff/2, 0, diff/2, 0);
+	}
+	if (ba.height() < e->size().height()) {
+		qreal diff = e->size().height() - ba.height();
+		ba.adjust(0, -diff/2, 0, diff/2);
+	}
+
+	_scene->setSceneRect(ba);
+
+	centerOn(br.center());
+	resetCachedContent();
+}
+
+void Track::paintEvent(QPaintEvent *e)
+{
+	QPointF scenePos = mapToScene(rect().bottomLeft() + QPoint(SCALE_OFFSET,
+	  -(SCALE_OFFSET + _mapScale->boundingRect().height())));
+	if (_mapScale->pos() != scenePos)
+		_mapScale->setPos(scenePos);
+
+	QGraphicsView::paintEvent(e);
+}
--- a/src/track.h
+++ b/src/track.h
@ -9,11 +9,13 @@
 #include "poi.h"
 #include "gpx.h"
 #include "map.h"
+#include "units.h"
 #include "colorshop.h"


 class POIItem;
 class MarkerItem;
+class ScaleItem;

 class Track : public QGraphicsView
 {
@ -30,6 +32,7 @@ public:
 	void clear();

 	void setMap(Map *map);
+	void setUnits(enum Units units);

 	void plot(QPainter *painter, const QRectF &target);
 	enum QPrinter::Orientation orientation() const;
@ -51,6 +54,8 @@ private:

 	void wheelEvent(QWheelEvent *event);
 	void drawBackground(QPainter *painter, const QRectF &rect);
+	void resizeEvent(QResizeEvent *e);
+	void paintEvent(QPaintEvent *e);

 	QGraphicsScene *_scene;
 	QList<QVector<QPointF> > _tracks;
@ -58,6 +63,7 @@ private:
 	QList<MarkerItem*> _markers;
 	QHash<Entry, POIItem*> _pois;
 	Map *_map;
+	ScaleItem *_mapScale;

 	ColorShop _colorShop;
 	qreal _maxLen;
--- a/src/units.h
+++ b/src/units.h
@ -0,0 +1,19 @@
+#ifndef UNITS_H
+#define UNITS_H
+
+enum Units {
+	Metric,
+	Imperial
+};
+
+#define M2KM    0.001000000000  // m -> km
+#define M2MI    0.000621371192  // m -> mi
+#define M2FT    3.280839900000  // m -> ft
+#define MS2KMH  3.600000000000  // m/s -> km/h
+#define MS2MIH  2.236936290000  // m/s -> mi/h
+#define FT2MI   0.000189393939  // ft -> mi
+
+#define MIINFT  5280 // 1 mi in ft
+#define KMINM   1000 // 1 km in m
+
+#endif // UNITS_H
Author	SHA1	Message	Date
Martin Tůma	30e78591c5	Some more shortcuts	2016-02-02 23:13:08 +01:00
Martin Tůma	a26b1257b2	Version 2.6	2016-02-02 23:02:03 +01:00
Martin Tůma	97a9dadd39	Scale artefacts fix	2016-02-02 22:56:38 +01:00
Martin Tůma	6acbf0d89f	Fixed scale flicker issue on OS X Performance improvements	2016-02-02 20:12:56 +01:00
Martin Tůma	9941faa218	Added proper initialization to silence analysis tools	2016-02-02 09:07:04 +01:00
Martin Tůma	e7edd5c3c3	Improved PDF export	2016-02-02 01:10:05 +01:00
Martin Tůma	16cce5abd0	Code cleanup	2016-01-19 09:04:54 +01:00
Martin Tůma	c2391929d3	Added track scale info	2016-01-14 00:37:51 +01:00
Martin Tůma	5bd4999205	Localization update	2015-12-20 17:42:45 +01:00
Martin Tůma	d8068ad994	Fixed track view resizing issues	2015-12-20 09:33:40 +01:00
Martin Tůma	6659e2ffa7	Fixed slider info value on unit change	2015-12-19 20:49:22 +01:00
Martin Tůma	141226b509	Added support for imperial units	2015-12-19 20:23:07 +01:00