X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=fe29aea4f0175ba1f9878560ebb3ef4cad66eb8c;hp=b7b6cace08287eff88be95d951cdfbe16823f4c2;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5 diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index b7b6cace..fe29aea4 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -20,12 +20,13 @@ #include -#include "logic.h" -#include "logicsnapshot.h" +#include "logic.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()); }