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

added left/right balance values into ridefile

Browse Source
This commit is contained in:
Walter Bürki
2013-02-18 11:06:32 +01:00
parent d0cb13eb4c
commit 49c1f485fc
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/JsonRideFile.l
View File

@@ -64,6 +64,7 @@
\"HEADWIND\" return HEADWIND;
\"SLOPE\" return SLOPE;
\"TEMP\" return TEMP;
\"LRBALANCE\" return LRBALANCE;
[-+]?[0-9]+ return INTEGER;
[-+]?[0-9]+e-[0-9]+ return FLOAT;
[-+]?[0-9]+\.[-e0-9]* return FLOAT;

1
src/JsonRideFile.y
View File

@@ -407,6 +407,7 @@ JsonFileReader::writeRideFile(MainWindow *, const RideFile *ride, QFile &file) c
if (ride->areDataPresent()->headwind) out << ", \"HEADWIND\":" << QString("%1").arg(p->headwind);
if (ride->areDataPresent()->slope) out << ", \"SLOPE\":" << QString("%1").arg(p->slope);
if (ride->areDataPresent()->temp && p->temp != RideFile::noTemp) out << ", \"TEMP\":" << QString("%1").arg(p->temp);
if (ride->areDataPresent()->lrbalance) out << ", \"LRBALANCE\":" << QString("%1").arg(p->lrbalance);
// sample points in here!
out << " }";

12
src/RideFile.cpp
View File

@@ -75,6 +75,7 @@ RideFile::seriesName(SeriesType series)
case RideFile::headwind: return QString(tr("Headwind"));
case RideFile::slope: return QString(tr("Slope"));
case RideFile::temp: return QString(tr("Temperature"));
case RideFile::lrbalance: return QString(tr("Left/Right Balance"));
case RideFile::interval: return QString(tr("Interval"));
case RideFile::vam: return QString(tr("VAM"));
case RideFile::wattsKg: return QString(tr("Watts per Kilogram"));
@@ -103,6 +104,7 @@ RideFile::unitName(SeriesType series, MainWindow *main)
case RideFile::headwind: return QString(tr("kph"));
case RideFile::slope: return QString(tr("%"));
case RideFile::temp: return QString(tr("°C"));
case RideFile::lrbalance: return QString(tr("%"));
case RideFile::interval: return QString(tr("Interval"));
case RideFile::vam: return QString(tr("meters per hour"));
case RideFile::wattsKg: return QString(useMetricUnits ? tr("watts/kg") : tr("watts/lb"));
@@ -350,7 +352,8 @@ RideFile *RideFileFactory::openRideFile(MainWindow *main, QFile &file,
else flags += '-';
if (result->areDataPresent()->temp) flags += 'E'; // Temperature
else flags += '-';
if (result->areDataPresent()->lrbalance) flags += 'B'; // Left/Right Balance, TODO Walibu, unsure about this flag? 'B' ok?
else flags += '-';
result->setTag("Data", flags);
}
@@ -454,6 +457,9 @@ RideFile::isDataPresent(SeriesType series)
case lon : return dataPresent.lon; break;
case lat : return dataPresent.lat; break;
case headwind : return dataPresent.headwind; break;
case slope : return dataPresent.slope; break;
case temp : return dataPresent.temp; break;
case lrbalance : return dataPresent.lrbalance; break;
case interval : return dataPresent.interval; break;
default:
case none : return false; break;
@@ -475,6 +481,9 @@ RideFile::setPointValue(int index, SeriesType series, double value)
case lon : dataPoints_[index]->lon = value; break;
case lat : dataPoints_[index]->lat = value; break;
case headwind : dataPoints_[index]->headwind = value; break;
case slope : dataPoints_[index]->slope = value; break;
case temp : dataPoints_[index]->temp = value; break;
case lrbalance : dataPoints_[index]->lrbalance = value; break;
case interval : dataPoints_[index]->interval = value; break;
default:
case none : break;
@@ -498,6 +507,7 @@ RideFilePoint::value(RideFile::SeriesType series) const
case RideFile::headwind : return headwind; break;
case RideFile::slope : return slope; break;
case RideFile::temp : return temp; break;
case RideFile::lrbalance : return lrbalance; break;
case RideFile::interval : return interval; break;
default:

4
src/RideFileTableModel.cpp
View File

@@ -121,6 +121,10 @@ RideFileTableModel::setHeadings(RideFile::SeriesType series)
headings_ << tr("Temperature");
headingsType << RideFile::temp;
}
if (series == RideFile::lrbalance || ride->areDataPresent()->lrbalance) {
headings_ << tr("Left/Right Balance");
headingsType << RideFile::lrbalance;
}
if (series == RideFile::interval || ride->areDataPresent()->interval) {
headings_ << tr("Interval");
headingsType << RideFile::interval;