diff --git a/src/RideItem.cpp b/src/RideItem.cpp index 6eebcce24..eb73cb72e 100644 --- a/src/RideItem.cpp +++ b/src/RideItem.cpp @@ -1211,7 +1211,7 @@ RideItem::updateIntervals() match.start, match.stop, f->timeToDistance(match.start), f->timeToDistance(match.stop), count++, - QColor(255,165,0), + match.exhaust ? QColor(255,69,0) : QColor(255,165,0), RideFileInterval::EFFORT); intervalItem->rideInterval = NULL; intervalItem->refresh(); // XXX will get called in constructore when refactor @@ -1224,11 +1224,12 @@ RideItem::updateIntervals() double duration = intervalItem->getForSymbol("workout_time"); int zone = 1 + context->athlete->zones()->whichZone(zoneRange, ap); - intervalItem->name = QString(tr("L%1 MATCH %2 (%3w %4 kJ)")) + intervalItem->name = QString(tr("L%1 %5 %2 (%3w %4 kJ)")) .arg(zone) .arg(time_to_string(duration)) .arg((int)ap) - .arg(match.cost/1000); + .arg(match.cost/1000) + .arg(match.exhaust ? "TE MATCH" : "MATCH"); intervals_ << intervalItem; } diff --git a/src/WPrime.cpp b/src/WPrime.cpp index e62afd9d9..c2a757abf 100644 --- a/src/WPrime.cpp +++ b/src/WPrime.cpp @@ -313,7 +313,7 @@ WPrime::setRide(RideFile *input) match.stop = end; match.secs = (match.stop-match.start) +1; // don't fencepost! match.cost = values[match.start] - values[match.stop]; - + match.exhaust = values[match.stop] <= 500 ? true : false; // its to exhaustion! if (match.cost >= WprimeMatchMinJoules) { matches << match; } diff --git a/src/WPrime.h b/src/WPrime.h index ca60c2c60..25641957e 100644 --- a/src/WPrime.h +++ b/src/WPrime.h @@ -33,6 +33,7 @@ struct Match { int start, stop, secs; // all in whole seconds int cost; // W' depletion + bool exhaust; }; class WPrime {