X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=02cb83e40c7e474729c7c6d82035f673138f6d36;hb=5eb9d1c43e387cb399b3582388cff1ab38973c70;hp=51e7f4953b78370af21b5b8401bf01adf682fad6;hpb=8e15445ccd6994348eb74b24b5324d26c9be0cce;p=pulseview.git diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index 51e7f495..02cb83e4 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -31,13 +31,14 @@ namespace pv { namespace data { Analog::Analog() : - SignalData() + SignalData(), + samplerate_(1) // Default is 1 Hz to prevent division-by-zero errors { } void Analog::push_segment(shared_ptr &segment) { - segments_.push_front(segment); + segments_.push_back(segment); } const deque< shared_ptr >& Analog::analog_segments() const @@ -51,6 +52,11 @@ vector< shared_ptr > Analog::segments() const segments_.begin(), segments_.end()); } +uint32_t Analog::get_segment_count() const +{ + return (uint32_t)segments_.size(); +} + void Analog::clear() { segments_.clear(); @@ -58,17 +64,27 @@ void Analog::clear() samples_cleared(); } +void Analog::set_samplerate(double value) +{ + samplerate_ = value; +} + +double Analog::get_samplerate() const +{ + return 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()); } return l; } -void Analog::notify_samples_added(QObject* segment, uint64_t start_sample, +void Analog::notify_samples_added(shared_ptr segment, uint64_t start_sample, uint64_t end_sample) { samples_added(segment, start_sample, end_sample);