nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

BasiRideMetric handle no speed/distance gracefully

Browse Source
This commit is contained in:
Mark Liversedge
2013-05-13 20:05:32 +01:00
parent 62a687b815
commit 56eedf224e
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/BasicRideMetrics.cpp
View File

@@ -111,10 +111,13 @@ class TimeRiding : public RideMetric {
const HrZones *, int,
const QHash<QString,RideMetric*> &,
const MainWindow *) {
secsMovingOrPedaling = 0;
foreach (const RideFilePoint *point, ride->dataPoints()) {
if ((point->kph > 0.0) || (point->cad > 0.0))
secsMovingOrPedaling += ride->recIntSecs();
if (ride->areDataPresent()->kph) {
foreach (const RideFilePoint *point, ride->dataPoints()) {
if ((point->kph > 0.0) || (point->cad > 0.0))
secsMovingOrPedaling += ride->recIntSecs();
}
}
setValue(secsMovingOrPedaling);
}
@@ -153,14 +156,21 @@ class TotalDistance : public RideMetric {
const HrZones *, int,
const QHash<QString,RideMetric*> &,
const MainWindow *) {
// Note: The 'km' in each sample is the distance travelled by the
// *end* of the sampling period. The last term in this equation
// accounts for the distance traveled *during* the first sample.
if (!ride->dataPoints().isEmpty()) {
km = ride->dataPoints().back()->km - ride->dataPoints().front()->km
+ ride->dataPoints().front()->kph / 3600.0 * ride->recIntSecs();
if (ride->dataPoints().count() > 1 && ride->areDataPresent()->km) {
km = ride->dataPoints().back()->km - ride->dataPoints().front()->km;
if (ride->areDataPresent()->kph)
km += ride->dataPoints().front()->kph / 3600.0 * ride->recIntSecs();
} else {
km = 0;
}
setValue(km);
}
@@ -287,10 +297,19 @@ class AvgSpeed : public RideMetric {
const MainWindow *) {
assert(deps.contains("total_distance"));
km = deps.value("total_distance")->value(true);
foreach (const RideFilePoint *point, ride->dataPoints())
if (point->kph > 0.0) secsMoving += ride->recIntSecs();
setValue(secsMoving ? km / secsMoving * 3600.0 : 0.0);
if (ride->areDataPresent()->kph) {
secsMoving = 0;
foreach (const RideFilePoint *point, ride->dataPoints())
if (point->kph > 0.0) secsMoving += ride->recIntSecs();
setValue(secsMoving ? km / secsMoving * 3600.0 : 0.0);
} else {
setValue(0);
}
}
void aggregateWith(const RideMetric &other) {
@@ -655,8 +674,11 @@ class MaxSpeed : public RideMetric {
const QHash<QString,RideMetric*> &,
const MainWindow *) {
double max = 0.0;
foreach (const RideFilePoint *point, ride->dataPoints())
if (point->kph > max) max = point->kph;
if (ride->areDataPresent()->kph) {
foreach (const RideFilePoint *point, ride->dataPoints())
if (point->kph > max) max = point->kph;
}
setValue(max);
}

3
src/DBAccess.cpp
View File

@@ -62,8 +62,9 @@
// 43 24 Jan 2012 Mark Liversedge TRIMP update
// 44 19 Apr 2013 Mark Liversedge Aerobic Decoupling precision reduced to 1pt
// 45 09 May 2013 Mark Liversedge Added 2,3,8 and 90m peak power for fatigue profiling
// 46 13 May 2013 Mark Liversedge Handle absence of speed in metric calculations
int DBSchemaVersion = 45;
int DBSchemaVersion = 46;
DBAccess::DBAccess(MainWindow* main, QDir home) : main(main), home(home)
{