X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=fe29aea4f0175ba1f9878560ebb3ef4cad66eb8c;hb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;hp=8f1d294d5c7e9c27f10de34e960d1c9ee6f5570f;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 8f1d294..fe29aea 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -21,11 +21,12 @@ #include #include "logic.hpp" -#include "logicsnapshot.hpp" +#include "logicsegment.hpp" using std::deque; using std::max; using std::shared_ptr; +using std::vector; namespace pv { namespace data { @@ -42,26 +43,32 @@ int Logic::get_num_channels() const return num_channels_; } -void Logic::push_snapshot( - shared_ptr &snapshot) +void Logic::push_segment( + shared_ptr &segment) { - snapshots_.push_front(snapshot); + segments_.push_front(segment); } -deque< shared_ptr >& Logic::get_snapshots() +const deque< shared_ptr >& Logic::logic_segments() const { - return snapshots_; + return segments_; +} + +vector< shared_ptr > Logic::segments() const +{ + return vector< shared_ptr >( + segments_.begin(), segments_.end()); } void Logic::clear() { - snapshots_.clear(); + segments_.clear(); } uint64_t Logic::get_max_sample_count() const { uint64_t l = 0; - for (std::shared_ptr s : snapshots_) { + for (std::shared_ptr s : segments_) { assert(s); l = max(l, s->get_sample_count()); }