nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix interpolation of GPS data for bad samples

Browse Source 
[manually folded in commit #8e43eb31a from 2.1 branch]
This commit is contained in:
Mark Liversedge
2012-01-22 15:37:32 +00:00
parent e59c32a311
commit 7bfbc3e9b3
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TcxParser.cpp
View File

@@ -77,6 +77,7 @@ TcxParser::startElement( const QString&, const QString&, const QString& qName, c
hr = 0.0;
lat = 0.0;
lon = 0.0;
badgps = false;
//alt = 0.0; // TCS from FIT files have not alt point for each trackpoint
distance = -1; // nh - we set this to -1 so we can detect if there was a distance in the trackpoint.
secs = 0;
@@ -130,6 +131,8 @@ TcxParser::endElement( const QString&, const QString&, const QString& qName)
// Record trackpoint
if (lat == 0 && lon == 0) badgps = true;
// for smart recording, the delta_t will not be constant
// average all the calculations based on the previous
// point.
@@ -155,6 +158,7 @@ TcxParser::endElement( const QString&, const QString&, const QString& qName)
double deltaLon = lon - prevPoint->lon;
double deltaLat = lat - prevPoint->lat;
if (prevPoint->lat == 0 && prevPoint->lon == 0) badgps = true;
// Smart Recording High Water Mark.
if ((isGarminSmartRecording.toInt() == 0) || (deltaSecs == 1) || (deltaSecs >= GarminHWM.toInt())) {
@@ -172,8 +176,8 @@ TcxParser::endElement( const QString&, const QString&, const QString& qName)
kph = kph > 0.35 ? kph : 0;
double cad = prevPoint->cad + (deltaCad * weight);
cad = cad > 0.35 ? cad : 0;
double lat = prevPoint->lat + (deltaLat * weight);
double lon = prevPoint->lon + (deltaLon * weight);
//double lat = prevPoint->lat + (deltaLat * weight);
//double lon = prevPoint->lon + (deltaLon * weight);
rideFile->appendPoint(prevPoint->secs + (deltaSecs * weight),
prevPoint->cad + (deltaCad * weight),
@@ -183,8 +187,8 @@ TcxParser::endElement( const QString&, const QString&, const QString& qName)
prevPoint->nm + (deltaTorque * weight),
prevPoint->watts + (deltaPower * weight),
prevPoint->alt + (deltaAlt * weight),
lon, // lon
lat, // lat
badgps ? 0 : prevPoint->lon + (deltaLon * weight), // lon
badgps ? 0 : prevPoint->lat + (deltaLat * weight), // lat
headwind, // headwind
0.0,
RideFile::noTemp,

1
src/TcxParser.h
View File

@@ -67,6 +67,7 @@ private:
double lon;
double headwind;
double secs;
bool badgps;
};
#endif // _TcxParser_h