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

tolerate swapped marker in srm files

Browse Source 
in certain circumstances srmwin seems to (have?) written bad files: The
first/last data chunks referenced by a marker were swapped plus the "real"
start index was 0 - although chunks are counted from 1.

This patch checks for this defect and interprets the data in the same way
as recent srmwin versions do when reading files with this defect.

Though the way marker are stored in PCV makes me guess, the refernce the
bad chunk index 0 really means "last" chunk in the recording.
This commit is contained in:
Rainer Clasen
2010-10-08 20:24:46 +02:00
committed by Justin Knotzke
parent ea05ba2151
commit 99c330edc2
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/SrmRideFile.cpp
View File

@@ -122,8 +122,20 @@ RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errorStrings) co
quint16 avgcad = readShort(in); quint16 avgcad = readShort(in);
quint16 avgspeed = readShort(in); quint16 avgspeed = readShort(in);
quint16 pwc150 = readShort(in); quint16 pwc150 = readShort(in);
markers[i].start = start;
markers[i].end = end; // data fixup: Although the data chunk index in srm files starts
// with 1, some srmwin wrote files referencing index 0.
if( end < 1 ) end = 1;
if( start < 1 ) start = 1;
// data fixup: some srmwin versions wrote markers with start > end
if( end > start ){
markers[i].start = end;
markers[i].end = start;
} else {
markers[i].start = start;
markers[i].end = end;
}
(void) active; (void) active;
(void) avgwatts; (void) avgwatts;
@@ -234,7 +246,7 @@ RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errorStrings) co
double last = 0.0; double last = 0.0;
for (int i = 1; i < markers.size(); ++i) { for (int i = 1; i < markers.size(); ++i) {
const marker &marker = markers[i]; const marker &marker = markers[i];
int start = qMax(0, marker.start - 1); int start = marker.start - 1;
double start_secs = result->dataPoints()[start]->secs; double start_secs = result->dataPoints()[start]->secs;
int end = qMin(marker.end - 1, result->dataPoints().size() - 1); int end = qMin(marker.end - 1, result->dataPoints().size() - 1);
double end_secs = result->dataPoints()[end]->secs + result->recIntSecs(); double end_secs = result->dataPoints()[end]->secs + result->recIntSecs();