Add only valid graph segments to the graphs

Fixes #489

src/GUI/cadencegraph.cpp

@@ -47,7 +47,7 @@ QList<GraphItem*> CadenceGraph::loadData(const Data &data)
 		const Track &track = data.tracks().at(i);
 		const Graph &graph = track.cadence();
 
-		if (!graph.isValid()) {
+		if (graph.isEmpty()) {
 			_palette.nextColor();
 			graphs.append(0);
 		} else {

src/GUI/elevationgraph.cpp

@@ -85,7 +85,7 @@ void ElevationGraph::setInfo()
 GraphItem *ElevationGraph::loadGraph(const Graph &graph, PathType type,
   const QColor &color, bool primary)
 {
-	if (!graph.isValid())
+	if (graph.isEmpty())
 		return 0;
 
 	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,

src/GUI/gearratiograph.cpp

@@ -50,7 +50,7 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 	for (int i = 0; i < data.tracks().count(); i++) {
 		const Graph &graph = data.tracks().at(i).ratio();
 
-		if (!graph.isValid()) {
+		if (graph.isEmpty()) {
 			_palette.nextColor();
 			graphs.append(0);
 		} else {

src/GUI/graphitem.cpp

@@ -8,8 +8,6 @@ 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());
-
 	_units = Metric;
 	_sx = 0; _sy = 0;
 	_color = color;

src/GUI/heartrategraph.cpp

@@ -47,7 +47,7 @@ QList<GraphItem*> HeartRateGraph::loadData(const Data &data)
 		const Track &track = data.tracks().at(i);
 		const Graph &graph = track.heartRate();
 
-		if (!graph.isValid()) {
+		if (graph.isEmpty()) {
 			_palette.nextColor();
 			graphs.append(0);
 		} else {

src/GUI/powergraph.cpp

@@ -47,7 +47,7 @@ QList<GraphItem*> PowerGraph::loadData(const Data &data)
 		const Track &track = data.tracks().at(i);
 		const Graph &graph = track.power();
 
-		if (!graph.isValid()) {
+		if (graph.isEmpty()) {
 			_palette.nextColor();
 			graphs.append(0);
 		} else {

src/GUI/speedgraph.cpp

@@ -50,7 +50,7 @@ void SpeedGraph::setInfo()
 GraphItem *SpeedGraph::loadGraph(const Graph &graph, const Track &track,
   const QColor &color, bool primary)
 {
-	if (!graph.isValid())
+	if (graph.isEmpty())
 		return 0;
 
 	SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,

src/GUI/temperaturegraph.cpp

@@ -51,7 +51,7 @@ QList<GraphItem*> TemperatureGraph::loadData(const Data &data)
 		const Track &track = data.tracks().at(i);
 		const Graph &graph = track.temperature();
 
-		if (!graph.isValid()) {
+		if (graph.isEmpty()) {
 			_palette.nextColor();
 			graphs.append(0);
 		} else {

src/data/graph.h

@@ -46,16 +46,6 @@ typedef QVector<GraphPoint> GraphSegment;
 class Graph : public QList<GraphSegment>
 {
 public:
-	bool isValid() const
-	{
-		if (isEmpty())
-			return false;
-		for (int i = 0; i < size(); i++)
-			if (at(i).size() < 2)
-				return false;
-		return true;
-	}
-
 	bool hasTime() const
 	{
 		for (int i = 0; i < size(); i++) {

src/data/route.cpp

@@ -68,16 +68,14 @@ GraphPair Route::elevation() const
 {
 	if (_useDEM) {
 		Graph dem(demElevation());
-		if (dem.isValid())
+		return (dem.isEmpty())
-			return GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph());
+		  ? GraphPair(gpsElevation(), Graph())
-		else
+		  : GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph());
-			return GraphPair(gpsElevation(), Graph());
 	} else {
 		Graph gps(gpsElevation());
-		if (gps.isValid())
+		return (gps.isEmpty())
-			return GraphPair(gps, _show2ndElevation ? demElevation() : Graph());
+		  ? GraphPair(gps, _show2ndElevation ? demElevation() : Graph())
-		else
+		  : GraphPair(demElevation(), Graph());
-			return GraphPair(demElevation(), Graph());
 	}
 }
 

src/data/track.cpp

@@ -266,6 +266,7 @@ Graph Track::gpsElevation() const
 			  sd.at(j).elevation()));
 		}
 
+		if (gs.size() >= 2)
 			ret.append(filter(gs, _elevationWindow));
 	}
 
@@ -293,6 +294,7 @@ Graph Track::demElevation() const
 			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), dem));
 		}
 
+		if (gs.size() >= 2)
 			ret.append(filter(gs, _elevationWindow));
 	}
 
@@ -306,16 +308,14 @@ GraphPair Track::elevation() const
 {
 	if (_useDEM) {
 		Graph dem(demElevation());
-		if (dem.isValid())
+		return (dem.isEmpty())
-			return GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph());
+		  ? GraphPair(gpsElevation(), Graph())
-		else
+		  : GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph());
-			return GraphPair(gpsElevation(), Graph());
 	} else {
 		Graph gps(gpsElevation());
-		if (gps.isValid())
+		return (gps.isEmpty())
-			return GraphPair(gps, _show2ndElevation ? demElevation() : Graph());
+		  ? GraphPair(demElevation(), Graph())
-		else
+		  : GraphPair(gps, _show2ndElevation ? demElevation() : Graph());
-			return GraphPair(demElevation(), Graph());
 	}
 }
 
@@ -344,12 +344,14 @@ Graph Track::computedSpeed() const
 			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), v));
 		}
 
+		if (gs.size() >= 2) {
 			ret.append(filter(gs, _speedWindow));
 			GraphSegment &filtered = ret.last();
 
 			for (int j = 0; j < stop.size(); j++)
 				filtered[stop.at(j)].setY(0);
 		}
+	}
 
 	if (_data.style().color().isValid())
 		ret.setColor(_data.style().color());
@@ -382,12 +384,14 @@ Graph Track::reportedSpeed() const
 			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), v));
 		}
 
+		if (gs.size() >= 2) {
 			ret.append(filter(gs, _speedWindow));
 			GraphSegment &filtered = ret.last();
 
 			for (int j = 0; j < stop.size(); j++)
 				filtered[stop.at(j)].setY(0);
 		}
+	}
 
 	if (_data.style().color().isValid())
 		ret.setColor(_data.style().color());
@@ -399,18 +403,14 @@ GraphPair Track::speed() const
 {
 	if (_useReportedSpeed) {
 		Graph reported(reportedSpeed());
-		if (reported.isValid())
+		return (reported.isEmpty())
-			return GraphPair(reported, _show2ndSpeed ? computedSpeed()
+		  ? GraphPair(computedSpeed(), Graph())
-			  : Graph());
+		  : GraphPair(reported, _show2ndSpeed ? computedSpeed() : Graph());
-		else
-			return GraphPair(computedSpeed(), Graph());
 	} else {
 		Graph computed(computedSpeed());
-		if (computed.isValid())
+		return (computed.isEmpty())
-			return GraphPair(computed, _show2ndSpeed ? reportedSpeed()
+		  ? GraphPair(reportedSpeed(), Graph())
-			  : Graph());
+		  : GraphPair(computed, _show2ndSpeed ? reportedSpeed() : Graph());
-		else
-			return GraphPair(reportedSpeed(), Graph());
 	}
 }
 
@@ -430,6 +430,7 @@ Graph Track::heartRate() const
 				gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
 				  sd.at(j).heartRate()));
 
+		if (gs.size() >= 2)
 			ret.append(filter(gs, _heartRateWindow));
 	}
 
@@ -456,6 +457,7 @@ Graph Track::temperature() const
 				  sd.at(j).temperature()));
 		}
 
+		if (gs.size() >= 2)
 			ret.append(gs);
 	}
 
@@ -481,6 +483,7 @@ Graph Track::ratio() const
 				gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
 				  sd.at(j).ratio()));
 
+		if (gs.size() >= 2)
 			ret.append(gs);
 	}
 
@@ -515,12 +518,14 @@ Graph Track::cadence() const
 			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), c));
 		}
 
+		if (gs.size() >= 2) {
 			ret.append(filter(gs, _cadenceWindow));
 			GraphSegment &filtered = ret.last();
 
 			for (int j = 0; j < stop.size(); j++)
 				filtered[stop.at(j)].setY(0);
 		}
+	}
 
 	if (_data.style().color().isValid())
 		ret.setColor(_data.style().color());
@@ -554,12 +559,14 @@ Graph Track::power() const
 			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), p));
 		}
 
+		if (gs.size() >= 2) {
 			ret.append(filter(gs, _powerWindow));
 			GraphSegment &filtered = ret.last();
 
 			for (int j = 0; j < stop.size(); j++)
 				filtered[stop.at(j)].setY(0);
 		}
+	}
 
 	if (_data.style().color().isValid())
 		ret.setColor(_data.style().color());