nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1768 from jonbev/RowPro

Browse Source 
Add RowPro csv import
This commit is contained in:
Mark Liversedge
2016-01-03 14:51:01 +00:00
parent 244209b1ab a4766e9c06
commit 200a26d7a7
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/CsvRideFile.cpp
View File

@@ -149,6 +149,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
QRegExp periCSV("mm-dd,hh:mm:ss,SmO2 Live,SmO2 Averaged,THb,Target Power,Heart Rate,Speed,Power,Cadence");
QRegExp freemotionCSV("Stages Data", Qt::CaseInsensitive);
QRegExp cpexportCSV("seconds, value,[ model,]* date", Qt::CaseInsensitive);
QRegExp rowproCSV("Date,Comment,Password,ID,Version,RowfileId,Rowfile_Id", Qt::CaseInsensitive);
int recInterval = 1;
@@ -304,7 +305,15 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
++lineno;
continue;
}
else { // default
else if(rowproCSV.indexIn(line) != -1) {
csvType = rowpro;
rideFile->setDeviceType("RowPro");
rideFile->setFileFormat("RowPro CSV (csv)");
unitsHeader = 10;
++lineno;
continue;
}
else { // default
csvType = generic;
rideFile->setDeviceType("Unknow");
rideFile->setFileFormat("Generic CSV (csv)");
@@ -354,6 +363,9 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
}
}
}
if (csvType == rowpro && lineno == 8) {
startTime = QDateTime::fromString(line.section(',', 0, 0), "dd/MM/yyyy H:mm:ss");
}
if (lineno == unitsHeader && (csvType == generic || csvType == bsx)) {
QRegExp timeHeaderSecs("( )*(secs|sec|time|timestamp)( )*", Qt::CaseInsensitive);
//QRegExp timeHeaderMins("( )*(min|minutes)( )*", Qt::CaseInsensitive);
@@ -390,7 +402,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
}
}
}
else if (lineno == unitsHeader && csvType != moxy && csvType != peripedal) {
else if (lineno == unitsHeader && csvType != moxy && csvType != peripedal && csvType != rowpro) {
if (metricUnits.indexIn(line) != -1)
metric = true;
else if (englishUnits.indexIn(line) != -1)
@@ -742,6 +754,28 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
//qDebug() << seconds << avgwatts << precSecs << precWatts << ":" <<watts << "->" << precAvg;
precSecs = seconds;
//precWatts = avgwatts;
} else if (csvType == rowpro) {
// RowPro CSV type "Time,Distance,Pace,Watts,Cals,SPM,HR,DutyCycle,Rowfile_Id"
// 0 , 1 , 2 , 3 , 4 , 5 , 6, 7 , 8
// Time is milliseconds
// Distance in meters
// Pace is seconds per meter
// Skip the summary at the end of the file
if (line == "Type,Time,Distance,AvgPace,AvgWatts,Cals,SPM,EndHR,Rowfile_Id,AvgHR") {
unitsHeader = lineno + 1000;
continue;
}
seconds = line.section(',', 0, 0).toDouble() / 1000;
minutes = seconds / 60.0f;
km = line.section(',', 1, 1).toDouble() / 1000;
double pace = line.section(',', 2, 2).toDouble();
if (pace > 0 ) {
kph = 3.6 / pace;
}
watts = line.section(',', 3, 3).toDouble();
cad = line.section(',', 5, 5).toDouble();
hr = line.section(',', 6, 6).toDouble();
} else {
if (secsIndex > -1) {
@@ -882,6 +916,8 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
}
}
if (csvType == rowpro) rideFile->setTag("Sport","Row");
// did we actually read any samples?
if (rideFile->dataPoints().count() > 0) {
return rideFile;

2
src/CsvRideFile.h
View File

@@ -23,7 +23,7 @@
#include "RideFile.h"
struct CsvFileReader : public RideFileReader {
enum csvtypes { generic, gc, powertap, joule, ergomo, motoactv, ibike, moxy, freemotion, peripedal, cpexport, bsx };
enum csvtypes { generic, gc, powertap, joule, ergomo, motoactv, ibike, moxy, freemotion, peripedal, cpexport, bsx, rowpro };
typedef enum csvtypes CsvType;
virtual RideFile *openRideFile(QFile &file, QStringList &errors, QList<RideFile*>* = 0) const;