X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=d2f89e856cd4ae58a9e682341670b88a8d003c3f;hb=9431e2d3d256f3602c3637847a8ec3ad3fdcd590;hp=7aefbf5f20f46af4c38736e2e4888f476396eaf1;hpb=464f05d59f205225eff1cb435f9ae11716dbe9de;p=pulseview.git diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 7aefbf5f..d2f89e85 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -46,6 +46,9 @@ unsigned int Logic::num_channels() const void Logic::push_segment(shared_ptr &segment) { segments_.push_back(segment); + + if ((samplerate_ == 1) && (segment->samplerate() > 1)) + samplerate_ = segment->samplerate(); } const deque< shared_ptr >& Logic::logic_segments() const @@ -53,6 +56,11 @@ const deque< shared_ptr >& Logic::logic_segments() const return segments_; } +deque< shared_ptr >& Logic::logic_segments() +{ + return segments_; +} + vector< shared_ptr > Logic::segments() const { return vector< shared_ptr >(segments_.begin(), segments_.end()); @@ -90,7 +98,7 @@ uint64_t Logic::max_sample_count() const return l; } -void Logic::notify_samples_added(QObject* segment, uint64_t start_sample, +void Logic::notify_samples_added(shared_ptr segment, uint64_t start_sample, uint64_t end_sample) { samples_added(segment, start_sample, end_sample);