nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search/Filter on toolbar applies to Charts

Browse Source 
When the user free text searches or applies a data filter in
the top right toolbar search box it gets applied to any charts
that plot data from many rides, including;

- CP curve
- Calendar
- Histogram
- LTM
- TreeMap
- Summary

I need to update on a Mac to no longer use a Mac text search box
but now use a search filter box on the top right.
This commit is contained in:
Mark Liversedge
2013-04-05 16:23:16 +01:00
parent d656981d5e
commit 31ced60209
20 changed files with 176 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/RideFileCache.cpp
View File

@@ -892,11 +892,13 @@ RideFileCache::RideFileCache(MainWindow *main, QDate start, QDate end, bool filt
: start(start), end(end), main(main), rideFileName(""), ride(0)
{
// Oh lets get from the cache if we can
foreach(RideFileCache *p, main->cpxCache) {
if (p->start == start && p->end == end) {
*this = *p;
return;
// Oh lets get from the cache if we can -- but not if filtered
if (!filter && !main->isfiltered) {
foreach(RideFileCache *p, main->cpxCache) {
if (p->start == start && p->end == end) {
*this = *p;
return;
}
}
}
@@ -936,6 +938,9 @@ RideFileCache::RideFileCache(MainWindow *main, QDate start, QDate end, bool filt
if (((filter == true && files.contains(rideFileName)) || filter == false) &&
rideDate >= start && rideDate <= end) {
// skip globally filtered values
if (main->isfiltered && !main->filters.contains(rideFileName)) continue;
// get its cached values (will refresh if needed...)
RideFileCache rideCache(main, main->home.absolutePath() + "/" + rideFileName);
@@ -970,12 +975,14 @@ RideFileCache::RideFileCache(MainWindow *main, QDate start, QDate end, bool filt
// set the cursor back to normal
main->setCursor(Qt::ArrowCursor);
// lets add to the cache for others to re-use
if (main->cpxCache.count() > maxcache) {
delete(main->cpxCache.at(0));
main->cpxCache.removeAt(0);
// lets add to the cache for others to re-use -- but not if filtered
if (!main->isfiltered && !filter) {
if (main->cpxCache.count() > maxcache) {
delete(main->cpxCache.at(0));
main->cpxCache.removeAt(0);
}
main->cpxCache.append(new RideFileCache(this));
}
main->cpxCache.append(new RideFileCache(this));
}