diff --git a/src/data.cpp b/src/data.cpp index 0b185737..6b31beee 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -577,6 +577,25 @@ std::vector getTrackedIntervals ( return intervals; } +//////////////////////////////////////////////////////////////////////////////// +// Untracked time is that which is not excluded, and not filled. Gaps. +std::vector getUntrackedRanges ( + const Rules& rules) +{ + std::vector gaps; + + // 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 = getExcludedRanges (rules); +*/ + + // TODO subtract all exclusions + // TODO subtract all inclusions + + return gaps; +} + //////////////////////////////////////////////////////////////////////////////// Interval getLatestInterval (Database& database) { diff --git a/src/helper.cpp b/src/helper.cpp index 38e0e039..c5adfe55 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -133,24 +133,6 @@ std::vector getExcludedRanges (Rules& rules, Range& range) return getAllExclusions (rules, overallRange); } */ -//////////////////////////////////////////////////////////////////////////////// -// Untracked time is that which is not excluded, and not filled. Gaps. -std::vector getUntrackedRanges (Rules& rules) -{ - std::vector gaps; - - // 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 = getExcludedRanges (rules); -*/ - - // TODO subtract all exclusions - // TODO subtract all inclusions - - return gaps; -} - //////////////////////////////////////////////////////////////////////////////// // Compose a JSON document of intervals. In the trivial case: // [ diff --git a/src/timew.h b/src/timew.h index de7632a9..930cab1f 100644 --- a/src/timew.h +++ b/src/timew.h @@ -52,6 +52,7 @@ Range outerRange (const std::vector &); bool matchesFilter (const Interval&, const Interval&); Interval clip (const Interval&, const Range&); std::vector getTrackedIntervals (Database&, const Rules&, Interval&); +std::vector getUntrackedRanges (const Rules&); Interval getLatestInterval (Database&); // init.cpp @@ -66,7 +67,6 @@ Color tagColor (const Rules&, const std::string&); std::string intervalSummarize (const Rules&, const Interval&); bool expandIntervalHint (const std::string&, std::string&, std::string&); std::vector getExcludedRanges (Rules&, Range&); -std::vector getUntrackedRanges (Rules&); std::string jsonFromIntervals (const std::vector &); Palette createPalette (const Rules&); std::map createTagColorMap (const Rules&, Palette&, const std::vector &);