GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

TI-67: Assign ids to intervals after flattening but before filtering

Browse source
This commit is contained in:
Thomas Lauf 2017-03-22 18:37:05 +01:00
parent b509a90e8c
commit 182cd5b0b4
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/data.cpp
View file

@ -641,7 +641,7 @@ std::vector <Interval> getTracked (
const Rules& rules, const Rules& rules,
Interval& filter) Interval& filter)
{ {
auto inclusions = subset (filter, getAllInclusions (database)); auto inclusions = getAllInclusions (database);
// Exclusions are only usable within a range, so if no filter range exists, // Exclusions are only usable within a range, so if no filter range exists,
// determine the outermost range of the inclusions, ie: // determine the outermost range of the inclusions, ie:
@ -654,6 +654,13 @@ std::vector <Interval> getTracked (
auto outer = outerRange (inclusions); auto outer = outerRange (inclusions);
if (outer.total ()) if (outer.total ())
filter.range = outer; filter.range = outer;
if (inclusions.size() > 0) {
auto latest = inclusions.back();
if (latest.range.is_open()) {;
filter.range.end = 0;
}
}
} }
// Get the set of expanded exclusions that overlap the range defined by the // Get the set of expanded exclusions that overlap the range defined by the
@ -682,7 +689,7 @@ std::vector <Interval> getTracked (
intervals[i].id = intervals.size () - i; intervals[i].id = intervals.size () - i;
debug (format ("Loaded {1} tracked intervals", intervals.size ())); debug (format ("Loaded {1} tracked intervals", intervals.size ()));
return intervals; return subset (filter, intervals);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////