X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=f8fe473d3681ebc31f0850d052af2d952d8fbae4;hp=c8bafc0fab292cf0982adc8b502739232ba11a56;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=7f9654641c096b303fc30b710335e235b9738ce9 diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index c8bafc0f..f8fe473d 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -37,7 +37,7 @@ Analog::Analog() : void Analog::push_segment(shared_ptr &segment) { - segments_.push_front(segment); + segments_.push_back(segment); } const deque< shared_ptr >& Analog::analog_segments() const @@ -51,9 +51,9 @@ vector< shared_ptr > Analog::segments() const segments_.begin(), segments_.end()); } -int Analog::get_segment_count() const +uint32_t Analog::get_segment_count() const { - return segments_.size(); + return (uint32_t)segments_.size(); } void Analog::clear() @@ -63,10 +63,18 @@ void Analog::clear() samples_cleared(); } +double Analog::get_samplerate() const +{ + if (segments_.empty()) + return 1.0; + + return segments_.front()->samplerate(); +} + uint64_t Analog::max_sample_count() const { uint64_t l = 0; - for (const shared_ptr s : segments_) { + for (const shared_ptr& s : segments_) { assert(s); l = max(l, s->get_sample_count()); }