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

Fixes #3439 - Activity start time for imported iBike CSV files is incorrect (#3825)

Browse Source
This commit is contained in:
Paul Johnson
2021-02-16 13:55:16 +00:00
committed by GitHub
parent 537b6677d3
commit cbe75fae47
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/FileIO/CsvRideFile.cpp
View File

@@ -100,7 +100,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
enum temperature { degF, degC, degNone };
typedef enum temperature Temperature;
static Temperature tempType = degNone;
QDateTime startTime;
QDateTime startTime, iBikeTime;
// Minutes,Torq (N-m),Km/h,Watts,Km,Cadence,Hrate,ID
// Minutes, Torq (N-m),Km/h,Watts,Km,Cadence,Hrate,ID
@@ -455,6 +455,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
if (lineno == 2) {
QStringList f = line.split(",");
if (f.size() == 6) {
// iBike line 2 is a local time.
startTime = QDateTime(
QDate(f[0].toInt(), f[1].toInt(), f[2].toInt()),
QTime(f[3].toInt(), f[4].toInt(), f[5].toInt()));
@@ -498,10 +499,11 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
// when merged with external GPS data.
else if (lineno == 6)
{
QString timestamp = line.section( ',', 14, 14);
if (timestamp.length()>0){
startTime = QDateTime::fromString(timestamp, Qt::ISODate);
}
// iBike line 6 is a UTC time.
QString timestamp = line.section( ',', 14, 14);
if (timestamp.length()>0){
iBikeTime = QDateTime::fromString(timestamp, Qt::ISODate);
}
}
}
@@ -782,7 +784,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
minutes = (recInterval * lineno - unitsHeader)/60.0;
QString timestamp = line.section( ',', 14, 14);
if (timestamp.length()>0){
minutes = startTime.secsTo(QDateTime::fromString(timestamp, Qt::ISODate))/60.0;
minutes = iBikeTime.secsTo(QDateTime::fromString(timestamp, Qt::ISODate))/60.0;
}
nm = 0; //no torque
kph = line.section(',', 0, 0).toDouble();