nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 16:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't skip user intervals for peaks etc

Browse Source 
.. when the autodiscovery has been switched off.
This commit is contained in:
Mark Liversedge
2015-06-27 12:45:14 +01:00
parent 8a09fe0ca2
commit 0d025afd8e
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/RideItem.cpp
View File

@@ -657,7 +657,7 @@ RideItem::updateIntervals()
intervals_.clear();
// no ride data available ?
if (!samples || !discovery) {
if (!samples) {
context->notifyIntervalsUpdate(this);
return;
}
@@ -719,21 +719,20 @@ RideItem::updateIntervals()
int count = 0;
foreach(RideFileInterval *interval, f->intervals()) {
// skip peaks, they're autodiscovered now
if (interval->isPeak()) continue;
// skip peaks when autodiscovered
if (discovery & RideFileInterval::intervalTypeBits(RideFileInterval::PEAKPOWER) && interval->isPeak()) continue;
// skip climbs, they're autodiscovered now
if (interval->isClimb()) continue;
// skip climbs when autodiscovered
if (discovery & RideFileInterval::intervalTypeBits(RideFileInterval::CLIMB) && interval->isClimb()) continue;
// skip matches, they're autodiscovered now
if (interval->isMatch()) continue;
// skip matches when autodiscovered
if (discovery & RideFileInterval::intervalTypeBits(RideFileInterval::EFFORT) && interval->isMatch()) continue;
// skip entire ride, they're autodiscovered too
if (interval->start <= begin->secs && interval->stop >= end->secs) continue;
// same as ride but offset by recintsecs
if (((interval->start - f->recIntSecs()) <= begin->secs && (interval->stop-f->recIntSecs()) >= end->secs) ||
(interval->start <= begin->secs && (interval->stop+f->recIntSecs()) >= end->secs))
// skip entire ride when autodiscovered
if (discovery & RideFileInterval::intervalTypeBits(RideFileInterval::ALL) &&
((interval->start <= begin->secs && interval->stop >= end->secs) ||
(((interval->start - f->recIntSecs()) <= begin->secs && (interval->stop-f->recIntSecs()) >= end->secs) ||
(interval->start <= begin->secs && (interval->stop+f->recIntSecs()) >= end->secs))))
continue;
// skip empty backward intervals