From d8cf1e3d08ace0c0fe6901c7c656cca4635c5b98 Mon Sep 17 00:00:00 2001 From: Damien Date: Wed, 7 Jan 2015 17:29:00 +0100 Subject: [PATCH] LeftRightBalance: isRelevantForRide use DataFlag --- src/LeftRightBalance.cpp | 3 ++- src/RideMetric.h | 3 ++- src/RideSummaryWindow.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/LeftRightBalance.cpp b/src/LeftRightBalance.cpp index 00e4da6db..5297b34e3 100644 --- a/src/LeftRightBalance.cpp +++ b/src/LeftRightBalance.cpp @@ -18,6 +18,7 @@ #include "RideMetric.h" #include "Zones.h" +#include "RideItem.h" #include #include @@ -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); } diff --git a/src/RideMetric.h b/src/RideMetric.h index 68d502729..3a6c70e66 100644 --- a/src/RideMetric.h +++ b/src/RideMetric.h @@ -37,6 +37,7 @@ class HrZones; class Context; class RideMetric; class RideFile; +class RideItem; typedef QSharedPointer 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_; } diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index 9ea6bffb9..3ce0e9675 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -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("%1%2:%3");