From ad309b51e29b1d49886c9775b567b95308d06b05 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 26 Mar 2016 23:56:45 -0400 Subject: [PATCH] Timeline: Stubbed ::tracked and ::untracked --- ChangeLog | 2 -- src/Timeline.cpp | 24 ++++++++++++++++++++++++ src/Timeline.h | 12 ++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 794f4520..f1463ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ 1.0.0 () - -0.1.0 () - - - TD-49 Log when file management fails (thanks to Ben Boeckel). - TD-115 Throw error when config file is missing or not readable diff --git a/src/Timeline.cpp b/src/Timeline.cpp index 3f717cd5..de7823b4 100644 --- a/src/Timeline.cpp +++ b/src/Timeline.cpp @@ -62,11 +62,35 @@ void Timeline::end (const Datetime& when) //////////////////////////////////////////////////////////////////////////////// void Timeline::include (const Interval& interval) { + _inclusions.push_back (interval); } //////////////////////////////////////////////////////////////////////////////// void Timeline::exclude (const Exclusion& exclusion) { + _exclusions.push_back (exclusion); +} + +//////////////////////////////////////////////////////////////////////////////// +std::vector Timeline::tracked () const +{ + std::vector combined; + + // TODO Combine _inclusions and _exclusions to yield a set of collapsed + // intervals. + + return combined; +} + +//////////////////////////////////////////////////////////////////////////////// +std::vector Timeline::untracked () const +{ + std::vector combined; + + // TODO Combine _inclusions and _exclusions to yield a set of collapsed + // unracked intervals. + + return combined; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/Timeline.h b/src/Timeline.h index 1588b38f..632518b7 100644 --- a/src/Timeline.h +++ b/src/Timeline.h @@ -30,6 +30,7 @@ #include #include #include +#include class Timeline { @@ -40,11 +41,14 @@ public: void include (const Interval&); void exclude (const Exclusion&); + std::vector tracked () const; + std::vector untracked () const; + private: - // TODO List of inclusions. - // TODO List of exclusions. - Datetime _start {0}; - Datetime _end {0}; + Datetime _start {0}; + Datetime _end {0}; + std::vector _inclusions {}; + std::vector _exclusions {}; }; #endif