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

Merge pull request #3104 from jgpallero/patch-3

Browse Source 
Update AvgLTE, AvgRTE, AvgLPS, and AvgRPS in BasicRideMetrics.cpp to fix #3102
This commit is contained in:
Alejandro Martinez
2019-05-20 17:11:28 -03:00
committed by GitHub
parent 9a0f291057 91c9d2d770
commit c02714ecc8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Metrics/BasicRideMetrics.cpp
View File

@@ -2787,7 +2787,7 @@ class AvgLTE : public RideMetric {
void compute(RideItem *item, Specification spec, const QHash<QString,RideMetric*> &) {
// no ride or no samples
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->lte) {
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->watts || !item->ride()->areDataPresent()->lte) {
setValue(RideFile::NIL);
setCount(0);
return;
@@ -2800,7 +2800,7 @@ class AvgLTE : public RideMetric {
while (it.hasNext()) {
struct RideFilePoint *point = it.next();
if (point->lte) {
if (point->lte && point->watts > 0.0f && point->cad && point->lrbalance > 0.0f && point->lrbalance < 100.0f) {
samples ++;
total += point->lte;
}
@@ -2842,7 +2842,7 @@ class AvgRTE : public RideMetric {
void compute(RideItem *item, Specification spec, const QHash<QString,RideMetric*> &) {
// no ride or no samples
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->rte) {
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->watts || !item->ride()->areDataPresent()->rte) {
setValue(RideFile::NIL);
setCount(0);
return;
@@ -2854,7 +2854,7 @@ class AvgRTE : public RideMetric {
RideFileIterator it(item->ride(), spec);
while (it.hasNext()) {
struct RideFilePoint *point = it.next();
if (point->rte) {
if (point->rte && point->watts > 0.0f && point->cad && point->lrbalance > 0.0f && point->lrbalance < 100.0f) {
samples ++;
total += point->rte;
}
@@ -2896,7 +2896,7 @@ class AvgLPS : public RideMetric {
void compute(RideItem *item, Specification spec, const QHash<QString,RideMetric*> &) {
// no ride or no samples
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->lps) {
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->watts || !item->ride()->areDataPresent()->lps) {
setValue(RideFile::NIL);
setCount(0);
return;
@@ -2908,7 +2908,7 @@ class AvgLPS : public RideMetric {
RideFileIterator it(item->ride(), spec);
while (it.hasNext()) {
struct RideFilePoint *point = it.next();
if (point->lps) {
if (point->lps && point->watts > 0.0f && point->cad && point->lrbalance > 0.0f && point->lrbalance < 100.0f) {
samples ++;
total += point->lps;
}
@@ -2950,7 +2950,7 @@ class AvgRPS : public RideMetric {
void compute(RideItem *item, Specification spec, const QHash<QString,RideMetric*> &) {
// no ride or no samples
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->rps) {
if (spec.isEmpty(item->ride()) || !item->ride()->areDataPresent()->watts || !item->ride()->areDataPresent()->rps) {
setValue(RideFile::NIL);
setCount(0);
return;
@@ -2962,7 +2962,7 @@ class AvgRPS : public RideMetric {
RideFileIterator it(item->ride(), spec);
while (it.hasNext()) {
struct RideFilePoint *point = it.next();
if (point->rps) {
if (point->rps && point->watts > 0.0f && point->cad && point->lrbalance > 0.0f && point->lrbalance < 100.0f) {
samples ++;
total += point->rps;
}