X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=0b5c37729ea0908c4e6a3a2b39a727088de014a9;hp=217cdfd742b3e4c84557f87178aee195ba82d5f4;hb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index 217cdfd7..0b5c3772 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -31,13 +31,16 @@ 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); + + connect(segment.get(), SIGNAL(completed()), this, SLOT(on_segment_completed())); } const deque< shared_ptr >& Analog::analog_segments() const @@ -51,20 +54,53 @@ 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(); + + 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 std::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(shared_ptr segment, uint64_t start_sample, + uint64_t end_sample) +{ + samples_added(segment, start_sample, end_sample); +} + +void Analog::notify_min_max_changed(float min, float max) +{ + min_max_changed(min, max); +} + +void Analog::on_segment_completed() +{ + segment_completed(); +} + } // namespace data } // namespace pv