Version++

+ code/API cleanup

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.12.{build}
+version: 7.13.{build}
 configuration: Release
 platform: Any CPU
 environment:

README.md

@@ -2,7 +2,7 @@
 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, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin 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).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.12
+VERSION = 7.13
 
 QT += core \
     gui \

pkg/gpxsee.nsi

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

pkg/gpxsee64.nsi

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

src/GUI/areaitem.cpp

@@ -153,3 +153,21 @@ 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();
+}

src/GUI/areaitem.h

@@ -27,6 +27,9 @@ public:
 	void setDigitalZoom(int zoom);
 
 private:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
 	QString toolTip() const;

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);
+			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType,
-			GraphView::addGraph(gi);
+			  _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,7 +4,8 @@
 
 
 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, parent)
 {
 	setToolTip(toolTip());
 }

src/GUI/cadencegraphitem.h

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

src/GUI/elevationgraph.cpp

@@ -8,26 +8,18 @@
 
 static qreal nMin(qreal a, qreal b)
 {
-	if (!std::isnan(a) && !std::isnan(b))
+	if (std::isnan(a))
-		return qMin(a, b);
+		return std::isnan(b) ? NAN : b;
-	else if (!std::isnan(a))
-		return a;
-	else if (!std::isnan(b))
-		return 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))
+	if (std::isnan(a))
-		return qMax(a, b);
+		return std::isnan(b) ? NAN : b;
-	else if (!std::isnan(a))
-		return a;
-	else if (!std::isnan(b))
-		return 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()))
@@ -70,19 +68,28 @@ void ElevationGraph::setInfo()
 GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 {
 	if (!graph.isValid()) {
-		skipColor();
+		_palette.nextColor();
 		return 0;
 	}
 
-	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType);
+	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
-	GraphView::addGraph(gi, type);
+	  _palette.nextColor());
+	gi->setUnits(_units);
 
 	if (type == Track) {
+		_tracks.append(gi);
+		if (_showTracks)
+			addGraph(gi);
+
 		_trackAscent += gi->ascent();
 		_trackDescent += gi->descent();
 		_trackMax = nMax(_trackMax, gi->max());
 		_trackMin = nMin(_trackMin, gi->min());
 	} else {
+		_routes.append(gi);
+		if (_showRoutes)
+			addGraph(gi);
+
 		_routeAscent += gi->ascent();
 		_routeDescent += gi->descent();
 		_routeMax = nMax(_routeMax, gi->max());
@@ -101,7 +108,7 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 	for (int i = 0; i < data.routes().count(); i++)
 		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -111,6 +118,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 +154,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 +179,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);
@@ -29,6 +32,7 @@ private:
 	void setInfo();
 
 	GraphItem *loadGraph(const Graph &graph, Type type);
+	void showItems(const QList<ElevationGraphItem *> &list, bool show);
 
 	qreal _trackAscent, _trackDescent;
 	qreal _routeAscent, _routeDescent;
@@ -36,6 +40,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, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();

src/GUI/elevationgraphitem.h

@@ -8,8 +8,8 @@ class ElevationGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	ElevationGraphItem(const Graph &graph, GraphType type,
+	ElevationGraphItem(const Graph &graph, GraphType type, int width,
-	  QGraphicsItem *parent = 0);
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}

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);
+			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType,
-			GraphView::addGraph(gi);
+			  _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()) {
+		if (std::isnan(val) || it.value() > val) {
-			val = it.value();
-			key = it.key();
-		} else if (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,20 +5,26 @@
 
 
 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, parent)
 {
-	qreal val = NAN;
+	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);
+		}
+	}
 
+	qreal key = NAN, val = NAN;
 	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
 	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
+		if (std::isnan(val) || it.value() > val) {
 			val = it.value();
-			_top = it.key();
+			key = it.key();
-		} else if (it.value() > val) {
-			val = it.value();
-			_top = it.key();
 		}
 	}
+	_top = key;
 
 	setToolTip(toolTip());
 }

src/GUI/gearratiographitem.h

@@ -9,8 +9,8 @@ class GearRatioGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	GearRatioGraphItem(const Graph &graph, GraphType type,
+	GearRatioGraphItem(const Graph &graph, GraphType type, int width,
-	  QGraphicsItem *parent = 0);
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal top() const {return _top;}
 

src/GUI/graphitem.cpp

@@ -2,30 +2,25 @@
 #include "graphitem.h"
 
 
-GraphItem::GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent)
+GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, QGraphicsItem *parent)
   : QGraphicsObject(parent), _graph(graph), _type(type)
 {
 	Q_ASSERT(_graph.isValid());
 
-	_id = 0;
+	_pen = QPen(color, width);
-	_width = 1;
+	_sx = 0; _sy = 0;
-	_pen = QPen(Qt::black, _width);
-	_sx = 1.0; _sy = 1.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 +49,6 @@ void GraphItem::setGraphType(GraphType type)
 
 	_type = type;
 	updatePath();
-	updateShape();
 	updateBounds();
 }
 
@@ -69,12 +63,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 +163,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,25 +182,32 @@ void GraphItem::setScale(qreal sx, qreal sy)
 
 	_sx = sx; _sy = sy;
 	updatePath();
-	updateShape();
 }
 
 void GraphItem::updatePath()
 {
-	_path = QPainterPath();
+	if (_sx == 0 && _sy == 0)
-
-	if (_type == Time && !_time)
 		return;
 
+	prepareGeometryChange();
+
+	_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);
+			_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.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y()
+				  * _sy);
 		}
 	}
 
+	updateShape();
+}
+
 void GraphItem::updateBounds()
 {
 	if (_type == Time && !_time) {
@@ -286,7 +286,7 @@ void GraphItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width + 1);
+	_pen.setWidth(_pen.width() + 1);
 	setZValue(zValue() + 1.0);
 	update();
 
@@ -297,7 +297,7 @@ void GraphItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width);
+	_pen.setWidth(_pen.width() - 1);
 	setZValue(zValue() - 1.0);
 	update();
 

src/GUI/graphitem.h

@@ -11,7 +11,8 @@ class GraphItem : public QGraphicsObject
 	Q_OBJECT
 
 public:
-	GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width, const QColor &color,
+	  QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
 	QPainterPath shape() const {return _shape;}
@@ -27,8 +28,6 @@ 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);}
@@ -55,17 +54,13 @@ private:
 	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;
 };

src/GUI/graphview.cpp

@@ -1,8 +1,7 @@
 #include <QGraphicsScene>
 #include <QEvent>
 #include <QMouseEvent>
-#include <QPaintEngine>
+#include <QScrollBar>
-#include <QPaintDevice>
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
 #include <QLocale>
@@ -64,6 +63,8 @@ GraphView::GraphView(QWidget *parent)
 	_units = Metric;
 	_graphType = Distance;
 	_xLabel = tr("Distance");
+
+	_zoom = 1.0;
 }
 
 GraphView::~GraphView()
@@ -74,8 +75,6 @@ GraphView::~GraphView()
 	delete _info;
 	delete _grid;
 	delete _message;
-
-	qDeleteAll(_graphs);
 }
 
 void GraphView::createXLabel()
@@ -166,13 +165,6 @@ 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();
 	}
 
@@ -195,29 +187,31 @@ 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 (!_hide.contains(id)) {
-		_visible.append(graph);
-		if (graph->bounds().width() > 0) {
 	_scene->addItem(graph);
 	_bounds |= graph->bounds();
-		}
+
 	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 +226,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);
@@ -313,9 +284,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++)
+	for (int i = 0; i < _graphs.size(); i++)
-		_visible.at(i)->setScale(sx, sy);
+		_graphs.at(i)->setScale(sx, sy);
 
 	QPointF p(r.left() * sx, r.top() * sy);
 	QSizeF s(r.width() * sx, r.height() * sy);
@@ -360,6 +332,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 *event)
+{
+	QRectF viewRect(mapToScene(rect()).boundingRect());
+	_info->setPos(QPointF(viewRect.left() + (viewRect.width()
+	  - _info->boundingRect().width())/2.0, _info->pos().y()));
+
+	QGraphicsView::paintEvent(event);
+}
+
 void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 {
 	QSizeF canvas = QSizeF(target.width() / scale, target.height() / scale);
@@ -376,54 +382,45 @@ 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;
 
-
+	if (_graphs.count() == 1) {
-	if (_visible.count() > 1) {
+		QRectF br(_graphs.first()->bounds());
-		r = 0;
-		y = 0;
-	} else {
-		QRectF br(_visible.first()->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 = _graphs.first()->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}
 
@@ -435,7 +432,7 @@ void GraphView::updateSliderInfo()
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
 	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_visible.count() > 1) ? QString()
+	  + UNIT_SPACE + _xUnits, (_graphs.count() > 1) ? QString()
 	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
 	  + _yUnits);
 }
@@ -455,7 +452,7 @@ void GraphView::emitSliderPositionChanged(const QPointF &pos)
 
 void GraphView::setSliderPosition(qreal pos)
 {
-	if (_visible.isEmpty())
+	if (_graphs.isEmpty())
 		return;
 
 	_sliderPos = pos;
@@ -483,11 +480,8 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();
 
-	for (int i = 0; i < _graphs.count(); i++) {
+	for (int i = 0; i < _graphs.count(); i++)
-		QColor color(_palette.nextColor());
+		_graphs.at(i)->setColor(_palette.nextColor());
-		color.setAlpha(255);
-		_graphs.at(i)->setColor(color);
-	}
 }
 
 void GraphView::setGraphWidth(int width)

src/GUI/graphview.h

@@ -46,9 +46,9 @@ signals:
 	void sliderPositionChanged(qreal);
 
 protected:
-	void addGraph(GraphItem *graph, int id = 0);
+	void addGraph(GraphItem *graph);
+	void removeGraph(GraphItem *graph);
 
-	void showGraph(bool show, int id = 0);
 	void setGraphType(GraphType type);
 	void setUnits(Units units);
 
@@ -68,12 +68,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);
@@ -91,15 +90,9 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 	void mousePressEvent(QMouseEvent *e);
-
+	void wheelEvent(QWheelEvent *e);
-	Units _units;
+	void changeEvent(QEvent *e);
-	qreal _xScale, _yScale;
+	void paintEvent(QPaintEvent *event);
-	qreal _yOffset;
-	QString _xUnits, _yUnits;
-	QString _xLabel, _yLabel;
-	int _precision;
-	qreal _minYRange;
-	qreal _sliderPos;
 
 	QGraphicsScene *_scene;
 
@@ -109,12 +102,19 @@ private:
 	InfoItem *_info;
 	GridItem *_grid;
 	QGraphicsSimpleTextItem *_message;
+	QList<GraphItem*> _graphs;
 
-	QList<GraphItem*> _visible;
-	QSet<int> _hide;
 	QRectF _bounds;
-	Palette _palette;
+	qreal _sliderPos;
-	int _width;
+
+	qreal _xScale, _yScale;
+	qreal _yOffset;
+	QString _xUnits, _yUnits;
+	QString _xLabel, _yLabel;
+	int _precision;
+	qreal _minYRange;
+
+	qreal _zoom;
 };
 
 #endif // GRAPHVIEW_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);
+			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType,
-			GraphView::addGraph(gi);
+			  _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,7 +4,8 @@
 
 
 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, parent)
 {
 	setToolTip(toolTip());
 }

src/GUI/heartrategraphitem.h

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

src/GUI/percentslider.cpp

@@ -24,7 +24,7 @@ PercentSlider::PercentSlider(QWidget *parent) : QWidget(parent)
 	_label->setAlignment(Qt::AlignRight);
 	_label->setText(format(_slider->value()));
 
-	connect(_slider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabel(int)));
+	connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateLabel(int)));
 
 	QHBoxLayout *layout = new QHBoxLayout();
 	layout->addWidget(_slider);

src/GUI/powergraph.cpp

@@ -14,6 +14,11 @@ PowerGraph::PowerGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+PowerGraph::~PowerGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void PowerGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,27 @@ QList<GraphItem*> PowerGraph::loadData(const Data &data)
 		const Graph &graph = track.power();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			PowerGraphItem *gi = new PowerGraphItem(graph, _graphType);
+			PowerGraphItem *gi = new PowerGraphItem(graph, _graphType, _width,
-			GraphView::addGraph(gi);
+			  _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 +84,9 @@ qreal PowerGraph::avg() const
 
 void PowerGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +96,13 @@ void PowerGraph::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/powergraph.h

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

src/GUI/powergraphitem.cpp

@@ -3,8 +3,9 @@
 #include "powergraphitem.h"
 
 
-PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type,
+PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type, int width,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	setToolTip(toolTip());
 }

src/GUI/powergraphitem.h

@@ -8,8 +8,8 @@ class PowerGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	PowerGraphItem(const Graph &graph, GraphType type,
+	PowerGraphItem(const Graph &graph, GraphType type, int width,
-	  QGraphicsItem *parent = 0);
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 private:
 	QString toolTip() const;

src/GUI/routeitem.cpp

@@ -24,7 +24,7 @@ QString RouteItem::toolTip(Units units) const
 RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
   : PathItem(route.path(), map, parent)
 {
-	const QVector<Waypoint> &waypoints = route.waypoints();
+	const RouteData &waypoints = route.data();
 
 	_waypoints.resize(waypoints.size());
 	for (int i = 0; i < waypoints.size(); i++)

src/GUI/speedgraph.cpp

@@ -18,6 +18,11 @@ SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+SpeedGraph::~SpeedGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void SpeedGraph::setInfo()
 {
 	if (_showTracks) {
@@ -44,13 +49,18 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 		const Graph &graph = track.speed();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType,
+			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
-			  track.movingTime());
+			  _palette.nextColor(), track.movingTime());
 			gi->setTimeType(_timeType);
-			GraphView::addGraph(gi);
+			gi->setUnits(_units);
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			_mavg.append(QPointF(track.distance(), gi->mavg()));
 			graphs.append(gi);
@@ -58,12 +68,12 @@ QList<GraphItem*> SpeedGraph::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();
@@ -87,6 +97,9 @@ qreal SpeedGraph::avg() const
 
 void SpeedGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 	_mavg.clear();
 
@@ -121,8 +134,8 @@ void SpeedGraph::setTimeType(enum TimeType type)
 {
 	_timeType = type;
 
-	for (int i = 0; i < _graphs.size(); i++)
+	for (int i = 0; i < _tracks.size(); i++)
-		static_cast<SpeedGraphItem*>(_graphs.at(i))->setTimeType(type);
+		_tracks.at(i)->setTimeType(type);
 
 	setInfo();
 	redraw();
@@ -132,7 +145,13 @@ void SpeedGraph::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/speedgraph.h

@@ -4,12 +4,15 @@
 #include <QList>
 #include "graphtab.h"
 
+class SpeedGraphItem;
+
 class SpeedGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	SpeedGraph(QWidget *parent = 0);
+	~SpeedGraph();
 
 	QString label() const {return tr("Speed");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -29,7 +32,9 @@ private:
 
 	Units _units;
 	TimeType _timeType;
+
 	bool _showTracks;
+	QList<SpeedGraphItem *> _tracks;
 };
 
 #endif // SPEEDGRAPH_H

src/GUI/speedgraphitem.cpp

@@ -4,8 +4,9 @@
 #include "speedgraphitem.h"
 
 
-SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type,
+SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type, int width,
-  qreal movingTime, QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  const QColor &color, qreal movingTime, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	_units = Metric;
 	_timeType = Total;

src/GUI/speedgraphitem.h

@@ -9,8 +9,8 @@ class SpeedGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	SpeedGraphItem(const Graph &graph, GraphType type, qreal movingTime,
+	SpeedGraphItem(const Graph &graph, GraphType type, int width,
-	  QGraphicsItem *parent = 0);
+	  const QColor &color, qreal movingTime, QGraphicsItem *parent = 0);
 
 	qreal avg() const {return _avg;}
 	qreal mavg() const {return _mavg;}
@@ -23,9 +23,8 @@ private:
 	QString toolTip() const;
 
 	qreal _avg, _mavg, _max;
-
-	Units _units;
 	TimeType _timeType;
+	Units _units;
 };
 
 #endif // SPEEDGRAPHITEM_H

src/GUI/temperaturegraph.cpp

@@ -14,6 +14,11 @@ TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+TemperatureGraph::~TemperatureGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void TemperatureGraph::setInfo()
 {
 	if (_showTracks) {
@@ -38,24 +43,29 @@ QList<GraphItem*> TemperatureGraph::loadData(const Data &data)
 		const Graph &graph = track.temperature();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
 			TemperatureGraphItem *gi = new TemperatureGraphItem(graph,
-			  _graphType);
+			  _graphType, _width, _palette.nextColor());
-			GraphView::addGraph(gi);
+			gi->setUnits(_units);
+
+			_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();
@@ -78,6 +88,9 @@ qreal TemperatureGraph::avg() const
 
 void TemperatureGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -108,7 +121,13 @@ void TemperatureGraph::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/temperaturegraph.h

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

src/GUI/temperaturegraphitem.cpp

@@ -4,7 +4,8 @@
 
 
 TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();

src/GUI/temperaturegraphitem.h

@@ -8,8 +8,8 @@ class TemperatureGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	TemperatureGraphItem(const Graph &graph, GraphType type,
+	TemperatureGraphItem(const Graph &graph, GraphType type, int width,
-	  QGraphicsItem *parent = 0);
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}

src/data/data.cpp

@@ -71,13 +71,35 @@ static QHash<QString, Parser*> parsers()
 QHash<QString, Parser*> Data::_parsers = parsers();
 bool Data::_useDEM = false;
 
-void Data::processData(const QList<TrackData> &trackData,
+void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
-  const QList<RouteData> &routeData)
 {
-	for (int i = 0; i < trackData.count(); i++)
+	for (int i = 0; i < trackData.count(); i++) {
+		TrackData &track = trackData[i];
+		for (int j = 0; j < track.size(); j++) {
+			SegmentData &segment = track[j];
+			for (int k = 0; k < segment.size(); k++) {
+				Trackpoint &t = segment[k];
+				if (!t.hasElevation() || _useDEM) {
+					qreal elevation = DEM::elevation(t.coordinates());
+					if (!std::isnan(elevation))
+						t.setElevation(elevation);
+				}
+			}
+		}
 		_tracks.append(Track(trackData.at(i)));
-	for (int i = 0; i < routeData.count(); i++)
+	}
+	for (int i = 0; i < routeData.count(); i++) {
+		RouteData &route = routeData[i];
+		for (int j = 0; j < route.size(); j++) {
+			Waypoint &w = route[j];
+			if (!w.hasElevation() || _useDEM) {
+				qreal elevation = DEM::elevation(w.coordinates());
+				if (!std::isnan(elevation))
+					w.setElevation(elevation);
+			}
+		}
 		_routes.append(Route(routeData.at(i)));
+	}
 	for (int i = 0; i < _waypoints.size(); i++) {
 		if (!_waypoints.at(i).hasElevation() || _useDEM) {
 			qreal elevation = DEM::elevation(_waypoints.at(i).coordinates());
@@ -181,6 +203,4 @@ QStringList Data::filter()
 void Data::useDEM(bool use)
 {
 	_useDEM = use;
-	Route::useDEM(use);
-	Track::useDEM(use);
 }

src/data/data.h

@@ -31,8 +31,7 @@ public:
 	static void useDEM(bool use);
 
 private:
-	void processData(const QList<TrackData> &trackData,
+	void processData(QList<TrackData> &trackData, QList<RouteData> &routeData);
-	  const QList<RouteData> &routeData);
 
 	bool _valid;
 	QString _errorString;

src/data/igcparser.cpp

@@ -130,6 +130,8 @@ bool IGCParser::readBRecord(SegmentData &segment, const char *line,
 
 	if (len < 35)
 		return false;
+	if (line[24] != 'A')
+		return true;
 
 	if (!readTimestamp(line + 1, time)) {
 		_errorString = "Invalid timestamp";

src/data/route.cpp

@@ -2,8 +2,6 @@
 #include "route.h"
 
 
-bool Route::_useDEM = false;
-
 Route::Route(const RouteData &data) : _data(data)
 {
 	qreal dist = 0;
@@ -34,19 +32,8 @@ Graph Route::elevation() const
 	graph.append(GraphSegment());
 	GraphSegment &gs = graph.last();
 
-	for (int i = 0; i < _data.size(); i++) {
+	for (int i = 0; i < _data.size(); i++)
-		if (_data.at(i).hasElevation() && !_useDEM)
+		gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation()));
-			gs.append(GraphPoint(_distance.at(i), NAN,
-			  _data.at(i).elevation()));
-		else {
-			qreal elevation = DEM::elevation(_data.at(i).coordinates());
-			if (!std::isnan(elevation))
-				gs.append(GraphPoint(_distance.at(i), NAN, elevation));
-			else if (_data.at(i).hasElevation())
-				gs.append(GraphPoint(_distance.at(i), NAN,
-				  _data.at(i).elevation()));
-		}
-	}
 
 	return graph;
 }

src/data/route.h

@@ -13,7 +13,7 @@ public:
 
 	Path path() const;
 
-	const QVector<Waypoint> &waypoints() const {return _data;}
+	const RouteData &data() const {return _data;}
 
 	Graph elevation() const;
 
@@ -24,13 +24,9 @@ public:
 
 	bool isValid() const {return _data.size() >= 2;}
 
-	static void useDEM(bool use) {_useDEM = use;}
-
 private:
 	RouteData _data;
 	QVector<qreal> _distance;
-
-	static bool _useDEM;
 };
 
 #endif // ROUTE_H

src/data/track.cpp

@@ -13,7 +13,6 @@ int Track::_pauseInterval = 10;
 
 bool Track::_outlierEliminate = true;
 bool Track::_useReportedSpeed = false;
-bool Track::_useDEM = false;
 
 
 static qreal median(QVector<qreal> &v)
@@ -180,19 +179,8 @@ Graph Track::elevation() const
 		for (int j = 0; j < sd.size(); j++) {
 			if (seg.outliers.contains(j))
 				continue;
-
-			if (sd.at(j).hasElevation() && !_useDEM)
 			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
 			  sd.at(j).elevation()));
-			else {
-				qreal elevation = DEM::elevation(sd.at(j).coordinates());
-				if (!std::isnan(elevation))
-					gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-					  elevation));
-				else if (sd.at(j).hasElevation())
-					gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-					  sd.at(j).elevation()));
-			}
 		}
 
 		ret.append(filter(gs, _elevationWindow));

src/data/track.h

@@ -45,7 +45,6 @@ public:
 	static void setOutlierElimination(bool eliminate)
 	  {_outlierEliminate = eliminate;}
 	static void useReportedSpeed(bool use) {_useReportedSpeed = use;}
-	static void useDEM(bool use) {_useDEM = use;}
 
 private:
 	struct Segment {
@@ -71,7 +70,6 @@ private:
 	static qreal _pauseSpeed;
 	static int _pauseInterval;
 	static bool _useReportedSpeed;
-	static bool _useDEM;
 };
 
 #endif // TRACK_H