LeftRightBalance: isRelevantForRide use DataFlag

This commit is contained in:
Damien
2015-01-07 17:29:00 +01:00
parent 5c54b50722
commit d8cf1e3d08
3 changed files with 5 additions and 3 deletions

View File

@@ -18,6 +18,7 @@
#include "RideMetric.h"
#include "Zones.h"
#include "RideItem.h"
#include <cmath>
#include <QApplication>
@@ -58,7 +59,7 @@ class LeftRightBalance : public RideMetric {
setCount(count);
}
bool isRelevantForRide(const RideFile *ride) const { return ride->areDataPresent()->lrbalance; }
bool isRelevantForRide(const RideItem *ride) const { return ride->present.contains("V"); }
RideMetric *clone() const { return new LeftRightBalance(*this); }

View File

@@ -37,6 +37,7 @@ class HrZones;
class Context;
class RideMetric;
class RideFile;
class RideItem;
typedef QSharedPointer<RideMetric> RideMetricPtr;
@@ -107,7 +108,7 @@ public:
virtual bool aggregateZero() const { return false; }
// is this metric relevant
virtual bool isRelevantForRide(const RideFile *) const { return true; }
virtual bool isRelevantForRide(const RideItem *) const { return true; }
// Factor to multiple value to convert from metric to imperial
virtual double conversion() const { return conversion_; }

View File

@@ -636,7 +636,7 @@ RideSummaryWindow::htmlSummary()
const RideMetric *m = factory.rideMetric(symbol);
if (!m) break;
if (ridesummary && !m->isRelevantForRide(ride)) continue; // don't display non relevant metric
if (ridesummary && !m->isRelevantForRide(rideItem)) continue; // don't display non relevant metric
// HTML table row
QString s("<tr><td>%1%2:</td><td align=\"right\">%3</td></tr>");