diff --git a/src/FileIO/CsvRideFile.cpp b/src/FileIO/CsvRideFile.cpp index 425a887517..8919bd47fa 100644 --- a/src/FileIO/CsvRideFile.cpp +++ b/src/FileIO/CsvRideFile.cpp @@ -126,6 +126,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QListsetFileFormat("GoldenCheetah CSV (csv)"); unitsHeader = 1; recInterval = 1; + ++lineno; continue; } @@ -540,6 +542,8 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList 0.0) { + if (trainSeries == NULL) { + // add XDATA + trainSeries = new XDataSeries(); + trainSeries->name = "TRAIN"; + trainSeries->valuename << "TARGET"; + trainSeries->unitname << "Watts"; + } + + XDataPoint *p = new XDataPoint(); + p->secs = minutes * 60.0; + p->km = km; + p->number[0] = target; + + trainSeries->datapoints.append(p); + } } } ++lineno; @@ -1102,6 +1124,13 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QListsetTag("Sport","Row"); + if (trainSeries != NULL) { + if (trainSeries->datapoints.count()>0) + rideFile->addXData("TRAIN", trainSeries); + else + delete trainSeries; + } + // did we actually read any samples? if (rideFile->dataPoints().count() > 0) { return rideFile; diff --git a/src/Train/TrainSidebar.cpp b/src/Train/TrainSidebar.cpp index f9c1b18147..999ec698c9 100644 --- a/src/Train/TrainSidebar.cpp +++ b/src/Train/TrainSidebar.cpp @@ -1159,7 +1159,7 @@ void TrainSidebar::Start() // when start button is pressed // CSV File header QTextStream recordFileStream(recordFile); - recordFileStream << "secs, cad, hr, km, kph, nm, watts, alt, lon, lat, headwind, slope, temp, interval, lrbalance, lte, rte, lps, rps, smo2, thb, o2hb, hhb\n"; + recordFileStream << "secs, cad, hr, km, kph, nm, watts, alt, lon, lat, headwind, slope, temp, interval, lrbalance, lte, rte, lps, rps, smo2, thb, o2hb, hhb, target\n"; disk_timer->start(SAMPLERATE); // start screen } @@ -1666,7 +1666,7 @@ void TrainSidebar::diskUpdate() << "," << displayTHB << "," << displayO2HB << "," << displayHHB - + << "," << load << "," << "\n"; }