X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=516060a0aec9013c139f8597dc0bf9bfd70de6aa;hp=084e8efd7f231fd920a0da8dfad18cfd9e4ac66e;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=7f9654641c096b303fc30b710335e235b9738ce9 diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 084e8ef..516060a 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -44,7 +44,7 @@ unsigned int Logic::num_channels() const void Logic::push_segment(shared_ptr &segment) { - segments_.push_front(segment); + segments_.push_back(segment); } const deque< shared_ptr >& Logic::logic_segments() const @@ -57,9 +57,9 @@ vector< shared_ptr > Logic::segments() const return vector< shared_ptr >(segments_.begin(), segments_.end()); } -int Logic::get_segment_count() const +uint32_t Logic::get_segment_count() const { - return segments_.size(); + return (uint32_t)segments_.size(); } void Logic::clear() @@ -69,10 +69,18 @@ void Logic::clear() samples_cleared(); } +double Logic::get_samplerate() const +{ + if (segments_.empty()) + return 1.0; + + return segments_.front()->samplerate(); +} + uint64_t Logic::max_sample_count() const { uint64_t l = 0; - for (shared_ptr s : segments_) { + for (const shared_ptr& s : segments_) { assert(s); l = max(l, s->get_sample_count()); }