X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=02cb83e40c7e474729c7c6d82035f673138f6d36;hp=ed15867c2734d071ab843737284fc41f63aab208;hb=1f3033cb3e63de7cfe98dab537460443917fece3;hpb=bc93f1ef2f89b6309b23b4984c237dcc458f1446 diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index ed15867c..02cb83e4 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -31,7 +31,8 @@ namespace pv { namespace data { Analog::Analog() : - SignalData() + SignalData(), + samplerate_(1) // Default is 1 Hz to prevent division-by-zero errors { } @@ -51,9 +52,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,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);