From 6e93538b4868d4b33a1b4e0d7d2d769854a354ee Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 23 Apr 2016 10:40:37 -0400 Subject: [PATCH] Timeline: Now has a public ::range --- src/Timeline.cpp | 10 ++-------- src/Timeline.h | 7 +++---- src/helper.cpp | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Timeline.cpp b/src/Timeline.cpp index 9c6c7fa3..ff442473 100644 --- a/src/Timeline.cpp +++ b/src/Timeline.cpp @@ -49,12 +49,6 @@ // //////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////// -void Timeline::range (const Range& range) -{ - _range = range; -} - //////////////////////////////////////////////////////////////////////////////// void Timeline::include (const Interval& interval) { @@ -72,7 +66,7 @@ std::vector Timeline::tracked (Rules& rules) const { // Create a range representing the whole timeline. // If no range is defined, then assume the full range of all the inclusions. - Range overallRange {_range}; + Range overallRange {range}; if (! overallRange.started () && ! overallRange.ended ()) overallRange = overallRangeFromIntervals (_inclusions); @@ -123,7 +117,7 @@ std::string Timeline::dump () const { std::stringstream out; - out << "Timeline _range " << _range.dump () << "\n"; + out << "Timeline range " << range.dump () << "\n"; for (auto& i : _inclusions) out << " " << i.json (); for (auto& e : _exclusions) diff --git a/src/Timeline.h b/src/Timeline.h index f4332c9a..179558f3 100644 --- a/src/Timeline.h +++ b/src/Timeline.h @@ -37,17 +37,16 @@ class Timeline { public: Timeline () = default; - void range (const Range&); void include (const Interval&); void exclude (const Exclusion&); - std::vector tracked (Rules&) const; std::vector untracked (Rules&) const; - std::string dump () const; +public: + Range range {}; + private: - Range _range {}; std::vector _inclusions {}; std::vector _exclusions {}; }; diff --git a/src/helper.cpp b/src/helper.cpp index 906a4d57..f537c51d 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -296,7 +296,7 @@ Timeline createTimelineFromData ( const Interval& filter) { Timeline t; - t.range (filter.range); + t.range = filter.range; // Add filtered intervals. for (auto& line : database.allLines ())