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: Replaced getTrackedIntervals with getTracked - build broken

Browse source
This commit is contained in:
Paul Beckingham 2016-05-13 17:21:55 -04:00
parent 3e97944850
commit 7a9cc4d50f
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/data.cpp
View file

@ -574,11 +574,12 @@ Interval clip (const Interval& interval, const Range& range)
}
////////////////////////////////////////////////////////////////////////////////
std::vector <Interval> getTrackedIntervals (
std::vector <Interval> getTracked (
Database& database,
const Rules& rules,
Interval& filter)
{
// std::cout << "# getTracked\n";
auto inclusions = getAllInclusions (database);
// Exclusions are only usable within a range, so if no filter range exists,
@ -595,30 +596,21 @@ 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.
// timeline.
auto exclusions = getAllExclusions (rules, filter.range);
Datetime now;
if (! exclusions.size ())
return inclusions;
std::vector <Interval> intervals;
for (auto& inclusion : subset (filter, inclusions))
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);
}
}
for (auto& inclusion : inclusions)
{
for (auto& piece : subtractRanges (filter.range, {inclusion.range}, exclusions))
{
Interval chunk {inclusion};
chunk.range = piece;
intervals.push_back (chunk);
}
}
return intervals;
}