X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=b34635319c934c1618a81bfd0bf961c82044df8b;hp=96f0d1fe7e63afe40bd8a23f8124eae698ab413d;hb=da50281d69f15d125b56971a3009fd31cbbab58b;hpb=99503171d4f32570829df171521b4b9cbccb0503 diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 96f0d1fe..b3463531 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -21,7 +21,7 @@ #include #include "logic.hpp" -#include "logicsnapshot.hpp" +#include "logicsegment.hpp" using std::deque; using std::max; @@ -38,37 +38,37 @@ Logic::Logic(unsigned int num_channels) : assert(num_channels_ > 0); } -int Logic::get_num_channels() const +unsigned int Logic::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); } -const deque< shared_ptr >& Logic::logic_snapshots() const +const deque< shared_ptr >& Logic::logic_segments() const { - return snapshots_; + return segments_; } -vector< shared_ptr > Logic::snapshots() const +vector< shared_ptr > Logic::segments() const { - return vector< shared_ptr >( - snapshots_.begin(), snapshots_.end()); + 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 Logic::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()); }