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

Set Pace Zone Shading and Pace units according to sport in CV chart

Browse Source 
In activities it depends on selected activity, bests are automatically filtered.
In range mode it can be set by sidebar or home filters for single sport
This commit is contained in:
Alejandro Martinez
2015-01-21 10:38:04 -03:00
parent 344bcc23a9
commit 8496e66dd4
5 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/RideFileCache.cpp
View File

@@ -1419,7 +1419,7 @@ static void distAggregate(QVector<double> &into, QVector<double> &other)
}
RideFileCache::RideFileCache(Context *context, QDate start, QDate end, bool filter, QStringList files, bool onhome)
RideFileCache::RideFileCache(Context *context, QDate start, QDate end, bool filter, QStringList files, bool onhome, RideItem *rideItem)
: start(start), end(end), incomplete(false), context(context), rideFileName(""), ride(0)
{
@@ -1429,7 +1429,7 @@ RideFileCache::RideFileCache(Context *context, QDate start, QDate end, bool filt
this->onhome = onhome;
// Oh lets get from the cache if we can -- but not if filtered
if (!filter && !context->isfiltered) {
if (!filter && !context->isfiltered && !rideItem) {
// oh and not if we're onhome and homefiltered
if ((onhome && !context->ishomefiltered) || !onhome) {
@@ -1496,6 +1496,8 @@ RideFileCache::RideFileCache(Context *context, QDate start, QDate end, bool filt
// skip globally filtered values
if (context->isfiltered && !context->filters.contains(item->fileName)) continue;
if (onhome && context->ishomefiltered && !context->homeFilters.contains(item->fileName)) continue;
// skip other sports if rideItem is given
if (rideItem && ((rideItem->isRun != item->isRun) || (rideItem->isSwim != item->isSwim))) continue;
// get its cached values (will NOT! refresh if needed...)
// the true means it will check only