root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 03:29:16 +02:00
Code Issues Projects Releases Activity

Added support for track segments

Browse Source
This commit is contained in:
Martin Tůma
2019-02-11 23:28:08 +01:00
parent 3c112b0b6f
commit 0308dbbb09
46 changed files with 731 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/fitparser.cpp
View File

@ -58,7 +58,7 @@ public:
MessageDefinition defs[16];
qreal ratio;
Trackpoint trackpoint;
TrackData track;
SegmentData segment;
};
@ -306,7 +306,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
ctx.trackpoint.setTimestamp(QDateTime::fromTime_t(ctx.timestamp
+ 631065600));
ctx.trackpoint.setRatio(ctx.ratio);
ctx.track.append(ctx.trackpoint);
ctx.segment.append(ctx.trackpoint);
ctx.trackpoint = Trackpoint();
ctx.lastWrite = ctx.timestamp;
}
@ -388,7 +388,8 @@ bool FITParser::parse(QFile *file, QList<TrackData> &tracks,
if (!parseRecord(ctx))
return false;
tracks.append(ctx.track);
tracks.append(TrackData());
tracks.last().append(ctx.segment);
return true;
}

62
src/data/geojsonparser.cpp
View File

@ -70,17 +70,9 @@ bool GeoJSONParser::multiPoint(const QJsonArray &coordinates,
return true;
}
bool GeoJSONParser::lineString(const QJsonArray &coordinates, TrackData &track,
const QJsonObject &properties)
bool GeoJSONParser::lineString(const QJsonArray &coordinates,
SegmentData &segment)
{
if (properties.contains("title") && properties["title"].isString())
track.setName(properties["title"].toString());
if (properties.contains("name") && properties["name"].isString())
track.setName(properties["name"].toString());
if (properties.contains("description")
&& properties["description"].isString())
track.setDescription(properties["description"].toString());
for (int i = 0; i < coordinates.size(); i++) {
QJsonArray point(coordinates.at(i).toArray());
if (point.count() < 2 || !point.at(0).isDouble()
@ -93,23 +85,48 @@ bool GeoJSONParser::lineString(const QJsonArray &coordinates, TrackData &track,
point.at(1).toDouble()));
if (point.count() == 3 && point.at(2).isDouble())
t.setElevation(point.at(2).toDouble());
track.append(t);
segment.append(t);
}
return true;
}
bool GeoJSONParser::multiLineString(const QJsonArray &coordinates,
QList<TrackData> &tracks, const QJsonObject &properties)
bool GeoJSONParser::lineString(const QJsonArray &coordinates, TrackData &track,
const QJsonObject &properties)
{
if (properties.contains("title") && properties["title"].isString())
track.setName(properties["title"].toString());
if (properties.contains("name") && properties["name"].isString())
track.setName(properties["name"].toString());
if (properties.contains("description")
&& properties["description"].isString())
track.setDescription(properties["description"].toString());
track.append(SegmentData());
lineString(coordinates, track.last());
return true;
}
bool GeoJSONParser::multiLineString(const QJsonArray &coordinates,
TrackData &track, const QJsonObject &properties)
{
if (properties.contains("title") && properties["title"].isString())
track.setName(properties["title"].toString());
if (properties.contains("name") && properties["name"].isString())
track.setName(properties["name"].toString());
if (properties.contains("description")
&& properties["description"].isString())
track.setDescription(properties["description"].toString());
for (int i = 0; i < coordinates.size(); i++) {
if (!coordinates.at(i).isArray()) {
_errorString = "Invalid MultiLineString coordinates";
return false;
} else {
tracks.append(TrackData());
if (!lineString(coordinates.at(i).toArray(), tracks.last(),
properties))
track.append(SegmentData());
if (!lineString(coordinates.at(i).toArray(), track.last()))
return false;
}
}
@ -215,8 +232,9 @@ bool GeoJSONParser::geometryCollection(const QJsonObject &json,
return false;
break;
case MultiLineString:
if (!multiLineString(geometry["coordinates"].toArray(), tracks,
properties))
tracks.append(TrackData());
if (!multiLineString(geometry["coordinates"].toArray(),
tracks.last(), properties))
return false;
break;
case Polygon:
@ -265,8 +283,9 @@ bool GeoJSONParser::feature(const QJsonObject &json, QList<TrackData> &tracks,
return lineString(geometry["coordinates"].toArray(), tracks.last(),
properties);
case MultiLineString:
return multiLineString(geometry["coordinates"].toArray(), tracks,
properties);
tracks.append(TrackData());
return multiLineString(geometry["coordinates"].toArray(),
tracks.last(), properties);
case GeometryCollection:
return geometryCollection(geometry, tracks, areas, waypoints);
case Polygon:
@ -327,7 +346,8 @@ bool GeoJSONParser::parse(QFile *file, QList<TrackData> &tracks,
tracks.append(TrackData());
return lineString(json["coordinates"].toArray(), tracks.last());
case MultiLineString:
return multiLineString(json["coordinates"].toArray(), tracks);
tracks.append(TrackData());
return multiLineString(json["coordinates"].toArray(), tracks.last());
case GeometryCollection:
return geometryCollection(json, tracks, areas, waypoints);
case Feature:

3
src/data/geojsonparser.h
View File

@ -34,10 +34,11 @@ private:
const QJsonObject &properties = QJsonObject());
bool multiPoint(const QJsonArray &coordinates,
QVector<Waypoint> &waypoints, const QJsonObject &properties = QJsonObject());
bool lineString(const QJsonArray &coordinates, SegmentData &segment);
bool lineString(const QJsonArray &coordinates, TrackData &track,
const QJsonObject &properties = QJsonObject());
bool multiLineString(const QJsonArray &coordinates,
QList<TrackData> &tracks, const QJsonObject &properties = QJsonObject());
TrackData &track, const QJsonObject &properties = QJsonObject());
bool polygon(const QJsonArray &coordinates, ::Polygon &pg);
bool polygon(const QJsonArray &coordinates, Area &area,
const QJsonObject &properties = QJsonObject());

25
src/data/gpxparser.cpp
View File

@ -51,7 +51,7 @@ Coordinates GPXParser::coordinates()
return Coordinates(lon, lat);
}
void GPXParser::rpExtension(TrackData *autoRoute)
void GPXParser::rpExtension(SegmentData *autoRoute)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("rpt"))
@ -72,7 +72,7 @@ void GPXParser::tpExtension(Trackpoint &trackpoint)
}
}
void GPXParser::rteptExtensions(TrackData *autoRoute)
void GPXParser::rteptExtensions(SegmentData *autoRoute)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("RoutePointExtension"))
@ -124,7 +124,7 @@ void GPXParser::trackpointData(Trackpoint &trackpoint)
trackpoint.setElevation(trackpoint.elevation() - gh);
}
void GPXParser::waypointData(Waypoint &waypoint, TrackData *autoRoute)
void GPXParser::waypointData(Waypoint &waypoint, SegmentData *autoRoute)
{
qreal gh = NAN;
@ -149,12 +149,12 @@ void GPXParser::waypointData(Waypoint &waypoint, TrackData *autoRoute)
waypoint.setElevation(waypoint.elevation() - gh);
}
void GPXParser::trackpoints(TrackData &track)
void GPXParser::trackpoints(SegmentData &segment)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("trkpt")) {
track.append(Trackpoint(coordinates()));
trackpointData(track.last());
segment.append(Trackpoint(coordinates()));
trackpointData(segment.last());
} else
_reader.skipCurrentElement();
}
@ -163,11 +163,13 @@ void GPXParser::trackpoints(TrackData &track)
void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
{
TrackData autoRoute;
autoRoute.append(SegmentData());
SegmentData &autoRouteSegment = autoRoute.last();
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("rtept")) {
route.append(Waypoint(coordinates()));
waypointData(route.last(), &autoRoute);
waypointData(route.last(), &autoRouteSegment);
} else if (_reader.name() == QLatin1String("name"))
route.setName(_reader.readElementText());
else if (_reader.name() == QLatin1String("desc"))
@ -176,7 +178,7 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
_reader.skipCurrentElement();
}
if (!autoRoute.isEmpty()) {
if (!autoRouteSegment.isEmpty()) {
autoRoute.setName(route.name());
autoRoute.setDescription(route.description());
tracks.append(autoRoute);
@ -186,9 +188,10 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
void GPXParser::track(TrackData &track)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("trkseg"))
trackpoints(track);
else if (_reader.name() == QLatin1String("name"))
if (_reader.name() == QLatin1String("trkseg")) {
track.append(SegmentData());
trackpoints(track.last());
} else if (_reader.name() == QLatin1String("name"))
track.setName(_reader.readElementText());
else if (_reader.name() == QLatin1String("desc"))
track.setDescription(_reader.readElementText());

8
src/data/gpxparser.h
View File

@ -17,16 +17,16 @@ private:
void gpx(QList<TrackData> &tracks, QList<RouteData> &routes,
QList<Area> &areas, QVector<Waypoint> &waypoints);
void track(TrackData &track);
void trackpoints(TrackData &track);
void trackpoints(SegmentData &segment);
void routepoints(RouteData &route, QList<TrackData> &tracks);
void rpExtension(TrackData *autoRoute);
void rpExtension(SegmentData *autoRoute);
void tpExtension(Trackpoint &trackpoint);
void trkptExtensions(Trackpoint &trackpoint);
void rteptExtensions(TrackData *autoRoute);
void rteptExtensions(SegmentData *autoRoute);
void area(Area &area);
void gpxExtensions(QList<Area> &areas);
void trackpointData(Trackpoint &trackpoint);
void waypointData(Waypoint &waypoint, TrackData *autoRoute = 0);
void waypointData(Waypoint &waypoint, SegmentData *autoRoute = 0);
qreal number();
QDateTime time();
Coordinates coordinates();

29
src/data/graph.h
View File

@ -1,6 +1,7 @@
#ifndef GRAPH_H
#define GRAPH_H
#include <QList>
#include <QVector>
#include <QDebug>
#include <cmath>
@ -39,14 +40,30 @@ inline QDebug operator<<(QDebug dbg, const GraphPoint &point)
}
#endif // QT_NO_DEBUG
class Graph : public QVector<GraphPoint>
typedef QVector<GraphPoint> GraphSegment;
class Graph : public QList<GraphSegment>
{
public:
Graph() {}
Graph(int size) : QVector<GraphPoint>(size) {}
Graph(const Graph &other) : QVector<GraphPoint>(other) {}
bool isValid() const {return size() >= 2;}
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++) {
const GraphSegment &segment = at(i);
for (int j = 0; j < segment.size(); j++)
if (std::isnan(segment.at(j).t()))
return false;
}
return true;
}
};
#endif // GRAPH_H

8
src/data/igcparser.cpp
View File

@ -122,7 +122,8 @@ bool IGCParser::readHRecord(const char *line, int len)
return true;
}
bool IGCParser::readBRecord(TrackData &track, const char *line, int len)
bool IGCParser::readBRecord(SegmentData &segment, const char *line,
int len)
{
qreal lat, lon, ele;
QTime time;
@ -158,7 +159,7 @@ bool IGCParser::readBRecord(TrackData &track, const char *line, int len)
Trackpoint t(Coordinates(lon, lat));
t.setTimestamp(QDateTime(_date, _time, Qt::UTC));
t.setElevation(ele);
track.append(t);
segment.append(t);
return true;
}
@ -240,10 +241,11 @@ bool IGCParser::parse(QFile *file, QList<TrackData> &tracks,
}
if (!track) {
tracks.append(TrackData());
tracks.last().append(SegmentData());
_time = QTime(0, 0);
track = true;
}
if (!readBRecord(tracks.last(), line, len))
if (!readBRecord(tracks.last().last(), line, len))
return false;
}
}

2
src/data/igcparser.h
View File

@ -18,7 +18,7 @@ public:
private:
bool readHRecord(const char *line, int len);
bool readBRecord(TrackData &track, const char *line, int len);
bool readBRecord(SegmentData &segment, const char *line, int len);
bool readCRecord(RouteData &route, const char *line, int len);
int _errorLine;

90
src/data/kmlparser.cpp
View File

@ -127,7 +127,7 @@ bool KMLParser::pointCoordinates(Waypoint &waypoint)
return true;
}
bool KMLParser::lineCoordinates(TrackData &track)
bool KMLParser::lineCoordinates(SegmentData &segment)
{
QString data = _reader.readElementText();
const QChar *sp, *ep, *cp, *vp;
@ -170,11 +170,11 @@ bool KMLParser::lineCoordinates(TrackData &track)
if (!res)
return false;
track.append(Trackpoint(Coordinates(val[0], val[1])));
if (!track.last().coordinates().isValid())
segment.append(Trackpoint(Coordinates(val[0], val[1])));
if (!segment.last().coordinates().isValid())
return false;
if (c == 2)
track.last().setElevation(val[2]);
segment.last().setElevation(val[2]);
while (cp->isSpace())
cp++;
@ -257,11 +257,11 @@ QDateTime KMLParser::timeStamp()
return ts;
}
void KMLParser::lineString(TrackData &track)
void KMLParser::lineString(SegmentData &segment)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("coordinates")) {
if (!lineCoordinates(track))
if (!lineCoordinates(segment))
_reader.raiseError("Invalid coordinates");
} else
_reader.skipCurrentElement();
@ -328,15 +328,15 @@ void KMLParser::point(Waypoint &waypoint)
_reader.raiseError("Missing Point coordinates");
}
void KMLParser::heartRate(TrackData &track, int start)
void KMLParser::heartRate(SegmentData &segment, int start)
{
int i = start;
const char error[] = "Heartrate data count mismatch";
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("value")) {
if (i < track.size())
track[i++].setHeartRate(number());
if (i < segment.size())
segment[i++].setHeartRate(number());
else {
_reader.raiseError(error);
return;
@ -345,19 +345,19 @@ void KMLParser::heartRate(TrackData &track, int start)
_reader.skipCurrentElement();
}
if (i != track.size())
if (i != segment.size())
_reader.raiseError(error);
}
void KMLParser::cadence(TrackData &track, int start)
void KMLParser::cadence(SegmentData &segment, int start)
{
int i = start;
const char error[] = "Cadence data count mismatch";
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("value")) {
if (i < track.size())
track[i++].setCadence(number());
if (i < segment.size())
segment[i++].setCadence(number());
else {
_reader.raiseError(error);
return;
@ -366,19 +366,19 @@ void KMLParser::cadence(TrackData &track, int start)
_reader.skipCurrentElement();
}
if (i != track.size())
if (i != segment.size())
_reader.raiseError(error);
}
void KMLParser::speed(TrackData &track, int start)
void KMLParser::speed(SegmentData &segment, int start)
{
int i = start;
const char error[] = "Speed data count mismatch";
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("value")) {
if (i < track.size())
track[i++].setSpeed(number());
if (i < segment.size())
segment[i++].setSpeed(number());
else {
_reader.raiseError(error);
return;
@ -387,19 +387,19 @@ void KMLParser::speed(TrackData &track, int start)
_reader.skipCurrentElement();
}
if (i != track.size())
if (i != segment.size())
_reader.raiseError(error);
}
void KMLParser::temperature(TrackData &track, int start)
void KMLParser::temperature(SegmentData &segment, int start)
{
int i = start;
const char error[] = "Temperature data count mismatch";
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("value")) {
if (i < track.size())
track[i++].setTemperature(number());
if (i < segment.size())
segment[i++].setTemperature(number());
else {
_reader.raiseError(error);
return;
@ -408,11 +408,11 @@ void KMLParser::temperature(TrackData &track, int start)
_reader.skipCurrentElement();
}
if (i != track.size())
if (i != segment.size())
_reader.raiseError(error);
}
void KMLParser::schemaData(TrackData &track, int start)
void KMLParser::schemaData(SegmentData &segment, int start)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("SimpleArrayData")) {
@ -420,13 +420,13 @@ void KMLParser::schemaData(TrackData &track, int start)
QStringRef name = attr.value("name");
if (name == QLatin1String("Heartrate"))
heartRate(track, start);
heartRate(segment, start);
else if (name == QLatin1String("Cadence"))
cadence(track, start);
cadence(segment, start);
else if (name == QLatin1String("Speed"))
speed(track, start);
speed(segment, start);
else if (name == QLatin1String("Temperature"))
temperature(track, start);
temperature(segment, start);
else
_reader.skipCurrentElement();
} else
@ -434,51 +434,52 @@ void KMLParser::schemaData(TrackData &track, int start)
}
}
void KMLParser::extendedData(TrackData &track, int start)
void KMLParser::extendedData(SegmentData &segment, int start)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("SchemaData"))
schemaData(track, start);
schemaData(segment, start);
else
_reader.skipCurrentElement();
}
}
void KMLParser::track(TrackData &track)
void KMLParser::track(SegmentData &segment)
{
const char error[] = "gx:coord/when element count mismatch";
int first = track.size();
int first = segment.size();
int i = first;
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("when")) {
track.append(Trackpoint());
track.last().setTimestamp(time());
segment.append(Trackpoint());
segment.last().setTimestamp(time());
} else if (_reader.name() == QLatin1String("coord")) {
if (i == track.size()) {
if (i == segment.size()) {
_reader.raiseError(error);
return;
} else if (!coord(track[i])) {
} else if (!coord(segment[i])) {
_reader.raiseError("Invalid coordinates");
return;
}
i++;
} else if (_reader.name() == QLatin1String("ExtendedData"))
extendedData(track, first);
extendedData(segment, first);
else
_reader.skipCurrentElement();
}
if (i != track.size())
if (i != segment.size())
_reader.raiseError(error);
}
void KMLParser::multiTrack(TrackData &t)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Track"))
track(t);
else
if (_reader.name() == QLatin1String("Track")) {
t.append(SegmentData());
track(t.last());
} else
_reader.skipCurrentElement();
}
}
@ -498,9 +499,10 @@ void KMLParser::multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
} else if (_reader.name() == QLatin1String("LineString")) {
tracks.append(TrackData());
TrackData &t = tracks.last();
t.append(SegmentData());
t.setName(name);
t.setDescription(desc);
lineString(t);
lineString(t.last());
} else if (_reader.name() == QLatin1String("Polygon")) {
areas.append(Area());
Area &a = areas.last();
@ -538,15 +540,17 @@ void KMLParser::placemark(QList<TrackData> &tracks, QList<Area> &areas,
|| _reader.name() == QLatin1String("LinearRing")) {
tracks.append(TrackData());
TrackData &t = tracks.last();
t.append(SegmentData());
t.setName(name);
t.setDescription(desc);
lineString(t);
lineString(t.last());
} else if (_reader.name() == QLatin1String("Track")) {
tracks.append(TrackData());
TrackData &t = tracks.last();
t.append(SegmentData());
t.setName(name);
t.setDescription(desc);
track(t);
track(t.last());
} else if (_reader.name() == QLatin1String("MultiTrack")) {
tracks.append(TrackData());
TrackData &t = tracks.last();

18
src/data/kmlparser.h
View File

@ -25,23 +25,23 @@ private:
void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, const QString &name, const QString &desc,
const QDateTime timestamp);
void track(TrackData &track);
void track(SegmentData &segment);
void multiTrack(TrackData &t);
void lineString(TrackData &track);
void lineString(SegmentData &segment);
void linearRing(QVector<Coordinates> &coordinates);
void boundary(QVector<Coordinates> &coordinates);
void polygon(Area &area);
void point(Waypoint &waypoint);
bool pointCoordinates(Waypoint &waypoint);
bool lineCoordinates(TrackData &track);
bool lineCoordinates(SegmentData &segment);
bool polygonCoordinates(QVector<Coordinates> &points);
bool coord(Trackpoint &trackpoint);
void extendedData(TrackData &track, int start);
void schemaData(TrackData &track, int start);
void heartRate(TrackData &track, int start);
void cadence(TrackData &track, int start);
void speed(TrackData &track, int start);
void temperature(TrackData &track, int start);
void extendedData(SegmentData &segment, int start);
void schemaData(SegmentData &segment, int start);
void heartRate(SegmentData &segment, int start);
void cadence(SegmentData &segment, int start);
void speed(SegmentData &segment, int start);
void temperature(SegmentData &segment, int start);
QDateTime timeStamp();
qreal number();
QDateTime time();

27
src/data/nmeaparser.cpp
View File

@ -227,7 +227,7 @@ bool NMEAParser::readEW(const char *data, int len, qreal &lon)
return true;
}
bool NMEAParser::readRMC(TrackData &track, const char *line, int len)
bool NMEAParser::readRMC(SegmentData &segment, const char *line, int len)
{
int col = 1;
const char *vp = line;
@ -280,8 +280,8 @@ bool NMEAParser::readRMC(TrackData &track, const char *line, int len)
}
if (!date.isNull()) {
if (_date.isNull() && !_time.isNull() && !track.isEmpty())
track.last().setTimestamp(QDateTime(date, _time, Qt::UTC));
if (_date.isNull() && !_time.isNull() && !segment.isEmpty())
segment.last().setTimestamp(QDateTime(date, _time, Qt::UTC));
_date = date;
}
@ -290,13 +290,13 @@ bool NMEAParser::readRMC(TrackData &track, const char *line, int len)
Trackpoint t(c);
if (!_date.isNull() && !time.isNull())
t.setTimestamp(QDateTime(_date, time, Qt::UTC));
track.append(t);
segment.append(t);
}
return true;
}
bool NMEAParser::readGGA(TrackData &track, const char *line, int len)
bool NMEAParser::readGGA(SegmentData &segment, const char *line, int len)
{
int col = 1;
const char *vp = line;
@ -364,7 +364,7 @@ bool NMEAParser::readGGA(TrackData &track, const char *line, int len)
t.setTimestamp(QDateTime(_date, _time, Qt::UTC));
if (!std::isnan(ele))
t.setElevation(ele - gh);
track.append(t);
segment.append(t);
_GGA = true;
}
@ -485,6 +485,7 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
Q_UNUSED(polygons);
qint64 len;
char line[80 + 2 + 1 + 1];
SegmentData segment;
_errorLine = 1;
@ -493,9 +494,6 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
_time = QTime();
_GGA = false;
tracks.append(TrackData());
TrackData &track = tracks.last();
while (!file->atEnd()) {
len = file->readLine(line, sizeof(line));
@ -509,10 +507,10 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
if (validSentence(line, len)) {
if (!memcmp(line + 3, "RMC,", 4)) {
if (!readRMC(track, line + 7, len - 7))
if (!readRMC(segment, line + 7, len - 7))
return false;
} else if (!memcmp(line + 3, "GGA,", 4)) {
if (!readGGA(track, line + 7, len - 7))
if (!readGGA(segment, line + 7, len - 7))
return false;
} else if (!memcmp(line + 3, "WPL,", 4)) {
if (!readWPL(waypoints, line + 7, len - 7))
@ -526,10 +524,15 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
_errorLine++;
}
if (!tracks.last().size() && !waypoints.size()) {
if (!segment.size() && !waypoints.size()) {
_errorString = "No usable NMEA sentence found";
return false;
}
if (segment.size()) {
tracks.append(TrackData());
tracks.last().append(segment);
}
return true;
}

4
src/data/nmeaparser.h
View File

@ -25,8 +25,8 @@ private:
bool readAltitude(const char *data, int len, qreal &ele);
bool readGeoidHeight(const char *data, int len, qreal &gh);
bool readRMC(TrackData &track, const char *line, int len);
bool readGGA(TrackData &track, const char *line, int len);
bool readRMC(SegmentData &segment, const char *line, int len);
bool readGGA(SegmentData &segment, const char *line, int len);
bool readWPL(QVector<Waypoint> &waypoints, const char *line, int len);
bool readZDA(const char *line, int len);

5
src/data/oziparsers.cpp
View File

@ -41,6 +41,8 @@ bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
tracks.append(TrackData());
TrackData &track = tracks.last();
track.append(SegmentData());
SegmentData &segment = track.last();
while (!file->atEnd()) {
QByteArray line = file->readLine();
@ -105,7 +107,8 @@ bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
}
}
track.append(tp);
segment.append(tp);
}
_errorLine++;

19
src/data/path.cpp
View File

@ -1,14 +1,27 @@
#include "path.h"
bool Path::isValid() const
{
if (isEmpty())
return false;
for (int i = 0; i < size(); i++)
if (at(i).size() < 2)
return false;
return true;
}
RectC Path::boundingRect() const
{
RectC ret;
if (size() < 2)
if (!isValid())
return ret;
for (int i = 0; i < size(); i++)
ret = ret.united(at(i).coordinates());
for (int i = 0; i < size(); i++) {
const PathSegment &segment = at(i);
for (int j = 0; j < segment.size(); j++)
ret = ret.united(segment.at(j).coordinates());
}
return ret;
}

4
src/data/path.h
View File

@ -27,10 +27,12 @@ Q_DECLARE_TYPEINFO(PathPoint, Q_PRIMITIVE_TYPE);
QDebug operator<<(QDebug dbg, const PathPoint &point);
#endif // QT_NO_DEBUG
typedef QVector<PathPoint> PathSegment;
class Path : public QVector<PathPoint>
class Path : public QList<PathSegment>
{
public:
bool isValid() const;
RectC boundingRect() const;
};

27
src/data/poi.cpp
View File

@ -129,23 +129,28 @@ QList<Waypoint> POI::points(const Path &path) const
QSet<int>::const_iterator it;
for (int i = 1; i < path.count(); i++) {
double ds = path.at(i).distance() - path.at(i-1).distance();
unsigned n = (unsigned)ceil(ds / _radius);
for (int i = 0; i < path.count(); i++) {
const PathSegment &segment = path.at(i);
if (n > 1) {
GreatCircle gc(path.at(i-1).coordinates(), path.at(i).coordinates());
for (unsigned j = 0; j < n; j++) {
RectC br(gc.pointAt((double)j/n), _radius);
for (int j = 1; j < segment.size(); j++) {
double ds = segment.at(j).distance() - segment.at(j-1).distance();
unsigned n = (unsigned)ceil(ds / _radius);
if (n > 1) {
GreatCircle gc(segment.at(j-1).coordinates(),
segment.at(j).coordinates());
for (unsigned k = 0; k < n; k++) {
RectC br(gc.pointAt((double)k/n), _radius);
search(br, set);
}
} else {
RectC br(segment.at(j-1).coordinates(), _radius);
search(br, set);
}
} else {
RectC br(path.at(i-1).coordinates(), _radius);
search(br, set);
}
}
RectC br(path.last().coordinates(), _radius);
RectC br(path.last().last().coordinates(), _radius);
search(br, set);

12
src/data/route.cpp
View File

@ -19,9 +19,11 @@ Route::Route(const RouteData &data) : _data(data)
Path Route::path() const
{
Path ret;
ret.append(PathSegment());
PathSegment &ps = ret.last();
for (int i = 0; i < _data.size(); i++)
ret.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));
ps.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));
return ret;
}
@ -29,17 +31,19 @@ Path Route::path() const
Graph Route::elevation() const
{
Graph graph;
graph.append(GraphSegment());
GraphSegment &gs = graph.last();
for (int i = 0; i < _data.size(); i++) {
if (_data.at(i).hasElevation() && !_useDEM)
graph.append(GraphPoint(_distance.at(i), NAN,
gs.append(GraphPoint(_distance.at(i), NAN,
_data.at(i).elevation()));
else {
qreal elevation = DEM::elevation(_data.at(i).coordinates());
if (!std::isnan(elevation))
graph.append(GraphPoint(_distance.at(i), NAN, elevation));
gs.append(GraphPoint(_distance.at(i), NAN, elevation));
else if (_data.at(i).hasElevation())
graph.append(GraphPoint(_distance.at(i), NAN,
gs.append(GraphPoint(_distance.at(i), NAN,
_data.at(i).elevation()));
}
}

11
src/data/slfparser.cpp
View File

@ -26,7 +26,7 @@ bool SLFParser::data(const QXmlStreamAttributes &attr, const char *name,
return res;
}
void SLFParser::entries(const QDateTime &date, TrackData &track)
void SLFParser::entries(const QDateTime &date, SegmentData &segment)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Entry")) {
@ -60,7 +60,7 @@ void SLFParser::entries(const QDateTime &date, TrackData &track)
if (data(attr, "trainingTimeAbsolute", val))
t.setTimestamp(date.addMSecs(val * 10));
track.append(t);
segment.append(t);
}
_reader.skipCurrentElement();
@ -89,9 +89,10 @@ void SLFParser::activity(TrackData &track)
QDateTime date;
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Entries"))
entries(date, track);
else if (_reader.name() == QLatin1String("GeneralInformation"))
if (_reader.name() == QLatin1String("Entries")) {
track.append(SegmentData());
entries(date, track.last());
} else if (_reader.name() == QLatin1String("GeneralInformation"))
generalInformation(date, track);
else
_reader.skipCurrentElement();

2
src/data/slfparser.h
View File

@ -16,7 +16,7 @@ class SLFParser : public Parser
private:
void generalInformation(QDateTime &date, TrackData &track);
void activity(TrackData &track);
void entries(const QDateTime &date, TrackData &track);
void entries(const QDateTime &date, SegmentData &segment);
bool data(const QXmlStreamAttributes &attr, const char *name, qreal &val);
void warning(const char *text) const;

23
src/data/tcxparser.cpp
View File

@ -116,14 +116,14 @@ void TCXParser::waypointData(Waypoint &waypoint)
}
}
void TCXParser::trackpoints(TrackData &track)
void TCXParser::trackpoints(SegmentData &segment)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Trackpoint")) {
Trackpoint t;
trackpointData(t);
if (t.coordinates().isValid())
track.append(t);
segment.append(t);
else
warning("Missing Trackpoint coordinates");
} else
@ -131,11 +131,11 @@ void TCXParser::trackpoints(TrackData &track)
}
}
void TCXParser::lap(TrackData &track)
void TCXParser::lap(SegmentData &segment)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Track"))
trackpoints(track);
trackpoints(segment);
else
_reader.skipCurrentElement();
}
@ -144,9 +144,10 @@ void TCXParser::lap(TrackData &track)
void TCXParser::course(QVector<Waypoint> &waypoints, TrackData &track)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Track"))
trackpoints(track);
else if (_reader.name() == QLatin1String("Name"))
if (_reader.name() == QLatin1String("Track")) {
track.append(SegmentData());
trackpoints(track.last());
} else if (_reader.name() == QLatin1String("Name"))
track.setName(_reader.readElementText());
else if (_reader.name() == QLatin1String("Notes"))
track.setDescription(_reader.readElementText());
@ -164,9 +165,11 @@ void TCXParser::course(QVector<Waypoint> &waypoints, TrackData &track)
void TCXParser::activity(TrackData &track)
{
track.append(SegmentData());
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Lap"))
lap(track);
lap(track.last());
else if (_reader.name() == QLatin1String("Notes"))
track.setDescription(_reader.readElementText());
else
@ -190,7 +193,7 @@ void TCXParser::sport(QList<TrackData> &tracks)
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Activity")) {
tracks.append(TrackData());
activity(tracks.back());
activity(tracks.last());
} else
_reader.skipCurrentElement();
}
@ -212,7 +215,7 @@ void TCXParser::activities(QList<TrackData> &tracks)
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Activity")) {
tracks.append(TrackData());
activity(tracks.back());
activity(tracks.last());
} else if (_reader.name() == QLatin1String("MultiSportSession"))
multiSportSession(tracks);
else

4
src/data/tcxparser.h
View File

@ -21,8 +21,8 @@ private:
void sport(QList<TrackData> &tracks);
void course(QVector<Waypoint> &waypoints, TrackData &track);
void activity(TrackData &track);
void lap(TrackData &track);
void trackpoints(TrackData &track);
void lap(SegmentData &segment);
void trackpoints(SegmentData &segment);
void trackpointData(Trackpoint &trackpoint);
void waypointData(Waypoint &waypoint);
void extensions(Trackpoint &trackpoint);

437
src/data/track.cpp
View File

@ -45,13 +45,13 @@ static QSet<int> eliminate(const QVector<qreal> &v)
return rm;
}
static Graph filter(const Graph &g, int window)
static GraphSegment filter(const GraphSegment &g, int window)
{
if (g.size() < window || window < 2)
return Graph(g);
return GraphSegment(g);
qreal acc = 0;
Graph ret(g.size());
GraphSegment ret(g.size());
for (int i = 0; i < window; i++)
acc += g.at(i).y();
@ -70,239 +70,319 @@ static Graph filter(const Graph &g, int window)
}
Track::Track(const TrackData &data) : _data(data)
Track::Track(const TrackData &data) : _data(data), _pause(0)
{
QVector<qreal> acceleration;
qreal ds, dt;
_time.append(0);
_distance.append(0);
_speed.append(0);
acceleration.append(0);
for (int i = 1; i < _data.count(); i++) {
ds = _data.at(i).coordinates().distanceTo(_data.at(i-1).coordinates());
_distance.append(_distance.at(i-1) + ds);
if (_data.first().hasTimestamp() && _data.at(i).hasTimestamp()
&& _data.at(i).timestamp() >= _data.at(i-1).timestamp())
_time.append(_data.first().timestamp().msecsTo(
_data.at(i).timestamp()) / 1000.0);
else
_time.append(NAN);
dt = _time.at(i) - _time.at(i-1);
if (dt < 1e-3) {
_speed.append(_speed.at(i-1));
acceleration.append(acceleration.at(i-1));
} else {
_speed.append(ds / dt);
qreal dv = _speed.at(i) - _speed.at(i-1);
acceleration.append(dv / dt);
}
}
_pause = 0;
for (int i = 1; i < _data.count(); i++) {
if (_time.at(i) > _time.at(i-1) + _pauseInterval
&& _speed.at(i) < _pauseSpeed) {
_pause += _time.at(i) - _time.at(i-1);
_stop.insert(i-1);
_stop.insert(i);
}
}
if (!_outlierEliminate)
return;
_outliers = eliminate(acceleration);
QSet<int>::const_iterator it;
for (it = _stop.constBegin(); it != _stop.constEnd(); ++it)
_outliers.remove(*it);
int last = 0;
for (int i = 0; i < _data.size(); i++) {
if (_outliers.contains(i))
last++;
else
break;
}
for (int i = last + 1; i < _data.size(); i++) {
if (_outliers.contains(i))
const SegmentData &sd = _data.at(i);
if (sd.isEmpty())
continue;
if (discardStopPoint(i)) {
_distance[i] = _distance.at(last);
_speed[i] = 0;
} else {
ds = _data.at(i).coordinates().distanceTo(
_data.at(last).coordinates());
_distance[i] = _distance.at(last) + ds;
dt = _time.at(i) - _time.at(last);
_speed[i] = (dt < 1e-3) ? _speed.at(last) : ds / dt;
// precompute distances, times, speeds and acceleration
QVector<qreal> acceleration;
_segments.append(Segment());
Segment &seg = _segments.last();
seg.distance.append(i ? _segments.at(i-1).distance.last() : 0);
seg.time.append(i ? _segments.at(i-1).time.last() :
sd.first().hasTimestamp() ? 0 : NAN);
seg.speed.append(sd.first().hasTimestamp() ? 0 : NAN);
acceleration.append(sd.first().hasTimestamp() ? 0 : NAN);
for (int j = 1; j < sd.size(); j++) {
ds = sd.at(j).coordinates().distanceTo(
sd.at(j-1).coordinates());
seg.distance.append(seg.distance.last() + ds);
if (sd.at(j).timestamp() >= sd.at(j-1).timestamp())
dt = sd.at(j-1).timestamp().msecsTo(
sd.at(j).timestamp()) / 1000.0;
else
dt = NAN;
seg.time.append(seg.time.last() + dt);
if (dt < 1e-3) {
seg.speed.append(seg.speed.last());
acceleration.append(acceleration.last());
} else {
qreal v = ds / dt;
qreal dv = v - seg.speed.last();
seg.speed.append(v);
acceleration.append(dv / dt);
}
}
// get stop-points + pause duration
for (int j = 1; j < seg.time.size(); j++) {
if (seg.time.at(j) > seg.time.at(j-1) + _pauseInterval
&& seg.speed.at(j) < _pauseSpeed) {
_pause += seg.time.at(j) - seg.time.at(j-1);
seg.stop.insert(j-1);
seg.stop.insert(j);
}
}
if (!_outlierEliminate)
continue;
// eliminate outliers
seg.outliers = eliminate(acceleration);
// stop-points can not be outliers
QSet<int>::const_iterator it;
for (it = seg.stop.constBegin(); it != seg.stop.constEnd(); ++it)
seg.outliers.remove(*it);
// recompute distances (and dependand data) without outliers
int last = 0;
for (int j = 0; j < sd.size(); j++) {
if (seg.outliers.contains(j))
last++;
else
break;
}
for (int j = last + 1; j < sd.size(); j++) {
if (seg.outliers.contains(i))
continue;
if (discardStopPoint(seg, j)) {
seg.distance[j] = seg.distance.at(last);
seg.speed[j] = 0;
} else {
ds = sd.at(j).coordinates().distanceTo(
sd.at(last).coordinates());
seg.distance[j] = seg.distance.at(last) + ds;
dt = seg.time.at(i) - seg.time.at(last);
seg.speed[i] = (dt < 1e-3) ? seg.speed.at(last) : ds / dt;
}
last = j;
}
last = i;
}
}
Graph Track::elevation() const
{
Graph raw;
Graph ret;
for (int i = 0; i < _data.size(); i++) {
if (_outliers.contains(i))
continue;
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
if (_data.at(i).hasElevation() && !_useDEM)
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).elevation()));
else {
qreal elevation = DEM::elevation(_data.at(i).coordinates());
if (!std::isnan(elevation))
raw.append(GraphPoint(_distance.at(i), _time.at(i), elevation));
else if (_data.at(i).hasElevation())
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).elevation()));
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));
}
return filter(raw, _elevationWindow);
return ret;
}
Graph Track::speed() const
{
Graph raw, filtered;
qreal v;
QList<int> stop;
Graph ret;
for (int i = 0; i < _data.size(); i++) {
if (_stop.contains(i) && (!std::isnan(_speed.at(i))
|| _data.at(i).hasSpeed())) {
v = 0;
stop.append(raw.size());
} else if (_useReportedSpeed && _data.at(i).hasSpeed()
&& !_outliers.contains(i))
v = _data.at(i).speed();
else if (!std::isnan(_speed.at(i)) && !_outliers.contains(i))
v = _speed.at(i);
else
continue;
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
QList<int> stop;
qreal v;
raw.append(GraphPoint(_distance.at(i), _time.at(i), v));
for (int j = 0; j < sd.size(); j++) {
if (seg.stop.contains(j) && (!std::isnan(seg.speed.at(j))
|| sd.at(j).hasSpeed())) {
v = 0;
stop.append(gs.size());
} else if (_useReportedSpeed && sd.at(j).hasSpeed()
&& seg.outliers.contains(j))
v = sd.at(j).speed();
else if (!std::isnan(seg.speed.at(j)) && !seg.outliers.contains(j))
v = seg.speed.at(j);
else
continue;
gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), v));
}
ret.append(filter(gs, _speedWindow));
GraphSegment &filtered = ret.last();
for (int j = 0; j < stop.size(); j++)
filtered[stop.at(j)].setY(0);
}
filtered = filter(raw, _speedWindow);
for (int i = 0; i < stop.size(); i++)
filtered[stop.at(i)].setY(0);
return filtered;
return ret;
}
Graph Track::heartRate() const
{
Graph raw;
Graph ret;
for (int i = 0; i < _data.count(); i++)
if (_data.at(i).hasHeartRate() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).heartRate()));
for (int i = 0; i < _data.size(); i++) {
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
return filter(raw, _heartRateWindow);
for (int j = 0; j < sd.size(); j++)
if (sd.at(j).hasHeartRate() && !seg.outliers.contains(j))
gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
sd.at(j).heartRate()));
ret.append(filter(gs, _heartRateWindow));
}
return ret;
}
Graph Track::temperature() const
{
Graph raw;
Graph ret;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasTemperature() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).temperature()));
for (int i = 0; i < _data.size(); i++) {
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
return raw;
for (int j = 0; j < sd.count(); j++) {
if (sd.at(j).hasTemperature() && !seg.outliers.contains(j))
gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
sd.at(j).temperature()));
}
ret.append(gs);
}
return ret;
}
Graph Track::ratio() const
{
Graph raw;
Graph ret;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasRatio() && !_outliers.contains(i))
raw.append(GraphPoint(_distance.at(i), _time.at(i),
_data.at(i).ratio()));
for (int i = 0; i < _data.size(); i++) {
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
return raw;
for (int j = 0; j < sd.size(); j++)
if (sd.at(j).hasRatio() && !seg.outliers.contains(j))
gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
sd.at(j).ratio()));
ret.append(gs);
}
return ret;
}
Graph Track::cadence() const
{
Graph raw, filtered;
QList<int> stop;
qreal c;
Graph ret;
for (int i = 0; i < _data.size(); i++) {
if (_data.at(i).hasCadence() && _stop.contains(i)) {
c = 0;
stop.append(raw.size());
} else if (_data.at(i).hasCadence() && !_outliers.contains(i))
c = _data.at(i).cadence();
else
continue;
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
QList<int> stop;
qreal c;
raw.append(GraphPoint(_distance.at(i), _time.at(i), c));
for (int j = 0; j < sd.size(); j++) {
if (sd.at(j).hasCadence() && seg.stop.contains(j)) {
c = 0;
stop.append(gs.size());
} else if (sd.at(j).hasCadence() && !seg.outliers.contains(j))
c = sd.at(j).cadence();
else
continue;
gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), c));
}
ret.append(filter(gs, _cadenceWindow));
GraphSegment &filtered = ret.last();
for (int j = 0; j < stop.size(); j++)
filtered[stop.at(j)].setY(0);
}
filtered = filter(raw, _cadenceWindow);
for (int i = 0; i < stop.size(); i++)
filtered[stop.at(i)].setY(0);
return filtered;
return ret;
}
Graph Track::power() const
{
Graph raw, filtered;
Graph ret;
QList<int> stop;
qreal p;
for (int i = 0; i < _data.size(); i++) {
if (_data.at(i).hasPower() && _stop.contains(i)) {
p = 0;
stop.append(raw.size());
} else if (_data.at(i).hasPower() && !_outliers.contains(i))
p = _data.at(i).power();
else
continue;
raw.append(GraphPoint(_distance.at(i), _time.at(i), p));
for (int i = 0; i < _data.size(); i++) {
const SegmentData &segment = _data.at(i);
const Segment &seg = _segments.at(i);
GraphSegment gs;
for (int j = 0; j < segment.size(); j++) {
if (segment.at(j).hasPower() && seg.stop.contains(j)) {
p = 0;
stop.append(gs.size());
} else if (segment.at(j).hasPower() && !seg.outliers.contains(j))
p = segment.at(j).power();
else
continue;
gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), p));
}
ret.append(filter(gs, _powerWindow));
GraphSegment &filtered = ret.last();
for (int j = 0; j < stop.size(); j++)
filtered[stop.at(j)].setY(0);
}
filtered = filter(raw, _powerWindow);
for (int i = 0; i < stop.size(); i++)
filtered[stop.at(i)].setY(0);
return filtered;
return ret;
}
qreal Track::distance() const
{
for (int i = _distance.size() - 1; i >= 0; i--)
if (!_outliers.contains(i))
return _distance.at(i);
for (int i = _segments.size() - 1; i >= 0; i--) {
const Segment &seg = _segments.at(i);
for (int j = seg.distance.size() - 1; j >= 0; j--)
if (!seg.outliers.contains(j))
return seg.distance.at(j);
}
return 0;
}
qreal Track::time() const
{
for (int i = _data.size() - 1; i >= 0; i--)
if (!_outliers.contains(i))
return _data.first().timestamp().msecsTo(_data.at(i).timestamp())
/ 1000.0;
for (int i = _segments.size() - 1; i >= 0; i--) {
const Segment &seg = _segments.at(i);
for (int j = seg.time.size() - 1; j >= 0; j--)
if (!seg.outliers.contains(j))
return seg.time.at(j);
}
return 0;
}
@ -314,22 +394,41 @@ qreal Track::movingTime() const
QDateTime Track::date() const
{
return (_data.size()) ? _data.first().timestamp() : QDateTime();
return (_data.size() && _data.first().size())
? _data.first().first().timestamp() : QDateTime();
}
Path Track::path() const
{
Path ret;
for (int i = 0; i < _data.size(); i++)
if (!_outliers.contains(i) && !discardStopPoint(i))
ret.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));
for (int i = 0; i < _data.size(); i++) {
const SegmentData &sd = _data.at(i);
const Segment &seg = _segments.at(i);
ret.append(PathSegment());
PathSegment &ps = ret.last();
for (int j = 0; j < sd.size(); j++)
if (!seg.outliers.contains(j) && !discardStopPoint(seg, j))
ps.append(PathPoint(sd.at(j).coordinates(),
seg.distance.at(j)));
}
return ret;
}
bool Track::discardStopPoint(int i) const
bool Track::discardStopPoint(const Segment &seg, int i) const
{
return (_stop.contains(i) && i > 0 && _stop.contains(i-1)
&& i < _data.size() - 1 && _stop.contains(i+1));
return (seg.stop.contains(i) && seg.stop.contains(i-1)
&& seg.stop.contains(i+1) && i > 0 && i < seg.distance.size() - 1);
}
bool Track::isValid() const
{
if (_data.isEmpty())
return false;
for (int i = 0; i < _data.size(); i++)
if (_data.at(i).size() < 2)
return false;
return true;
}

21
src/data/track.h
View File

@ -33,7 +33,7 @@ public:
const QString &name() const {return _data.name();}
const QString &description() const {return _data.description();}
bool isValid() const {return _data.size() >= 2;}
bool isValid() const;
static void setElevationFilter(int window) {_elevationWindow = window;}
static void setSpeedFilter(int window) {_speedWindow = window;}
@ -48,17 +48,18 @@ public:
static void useDEM(bool use) {_useDEM = use;}
private:
bool discardStopPoint(int i) const;
struct Segment {
QVector<qreal> distance;
QVector<qreal> time;
QVector<qreal> speed;
QSet<int> outliers;
QSet<int> stop;
};
bool discardStopPoint(const Segment &seg, int i) const;
TrackData _data;
QVector<qreal> _distance;
QVector<qreal> _time;
QVector<qreal> _speed;
QSet<int> _outliers;
QSet<int> _stop;
QList<Segment> _segments;
qreal _pause;
static bool _outlierEliminate;

5
src/data/trackdata.h
View File

@ -1,11 +1,14 @@
#ifndef TRACKDATA_H
#define TRACKDATA_H
#include <QList>
#include <QVector>
#include <QString>
#include "trackpoint.h"
class TrackData : public QVector<Trackpoint>
typedef QVector<Trackpoint> SegmentData;
class TrackData : public QList<SegmentData>
{
public:
const QString& name() const {return _name;}