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

data: Improved range subtraction in getTrackedIntervals

Browse source
This commit is contained in:
Paul Beckingham 2016-05-11 00:03:19 -04:00
parent 7f4a70d29e
commit 23e9492d16
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/data.cpp
View file

@ -624,11 +624,28 @@ std::vector <Interval> getTrackedIntervals (
// Get the set of expanded exclusions that overlap the range defined by the
// timeline. If no range is defined, derive it from the set of all data.
auto exclusions = getAllExclusions (rules, filter.range);
Datetime now;
std::vector <Interval> intervals;
for (auto& inclusion : subset (filter, inclusions))
for (auto& interval : flatten (clip (inclusion, filter.range), exclusions))
intervals.push_back (interval);
for (auto& e : exclusions)
if (e.start < now)
{
if (inclusion.range.encloses (e))
{
// Subtract any enclosed exclusion.
for (auto& result : subtractRanges (filter.range, {inclusion.range}, {e}))
{
Interval chunk {inclusion};
chunk.range = result;
intervals.push_back (chunk);
}
}
else
{
intervals.push_back (inclusion);
}
}
return intervals;
}