X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=038da649896a0f915883403fb420a37d9d36db0d;hb=69e950969e45ddbf516069c28f72f5696c53af5d;hp=e78c28468d71ef42da07e7e0eb102076889cfd38;hpb=9009d9b5ca2e2039725040060c0fec19e7bc3caa;p=pulseview.git diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index e78c2846..038da649 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -32,6 +32,7 @@ namespace data { Logic::Logic(unsigned int num_channels) : SignalData(), + samplerate_(1), // Default is 1 Hz to prevent division-by-zero errors num_channels_(num_channels) { assert(num_channels_ > 0); @@ -52,6 +53,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()); @@ -69,17 +75,27 @@ void Logic::clear() samples_cleared(); } +void Logic::set_samplerate(double value) +{ + samplerate_ = value; +} + +double Logic::get_samplerate() const +{ + return samplerate_; +} + uint64_t Logic::max_sample_count() const { uint64_t l = 0; - for (shared_ptr s : segments_) { + for (const shared_ptr& s : segments_) { assert(s); l = max(l, s->get_sample_count()); } 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);