X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fdata%2Flogic.cpp;h=8b864f7672fb352f65a8cf1ffd59693f4cf210cf;hb=1df18f6b6d20abd3f1ede94325b6781bf5038ea9;hp=6addea3b10a4440ec84357dd2d3fe47bc5ff1590;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;p=pulseview.git diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 6addea3..8b864f7 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -20,8 +20,8 @@ #include -#include "logic.h" -#include "logicsnapshot.h" +#include "logic.hpp" +#include "logicsnapshot.hpp" using std::deque; using std::max; @@ -30,38 +30,38 @@ using std::shared_ptr; namespace pv { namespace data { -Logic::Logic(unsigned int num_probes) : +Logic::Logic(unsigned int num_channels) : SignalData(), - _num_probes(num_probes) + num_channels_(num_channels) { - assert(_num_probes > 0); + assert(num_channels_ > 0); } -int Logic::get_num_probes() const +int Logic::get_num_channels() const { - return _num_probes; + return num_channels_; } void Logic::push_snapshot( shared_ptr &snapshot) { - _snapshots.push_front(snapshot); + snapshots_.push_front(snapshot); } -deque< shared_ptr >& Logic::get_snapshots() +const deque< shared_ptr >& Logic::logic_snapshots() const { - return _snapshots; + return snapshots_; } void Logic::clear() { - _snapshots.clear(); + snapshots_.clear(); } uint64_t Logic::get_max_sample_count() const { uint64_t l = 0; - for (std::shared_ptr s : _snapshots) { + for (std::shared_ptr s : snapshots_) { assert(s); l = max(l, s->get_sample_count()); }