X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=516060a0aec9013c139f8597dc0bf9bfd70de6aa;hp=9ba8f2c3d6e1a70ed761f88ea57d27dfff9d38a8;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index 9ba8f2c..516060a 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -42,10 +42,9 @@ unsigned int Logic::num_channels() const return num_channels_; } -void Logic::push_segment( - shared_ptr &segment) +void Logic::push_segment(shared_ptr &segment) { - segments_.push_front(segment); + segments_.push_back(segment); } const deque< shared_ptr >& Logic::logic_segments() const @@ -55,24 +54,44 @@ const deque< shared_ptr >& Logic::logic_segments() const vector< shared_ptr > Logic::segments() const { - return vector< shared_ptr >( - segments_.begin(), segments_.end()); + return vector< shared_ptr >(segments_.begin(), segments_.end()); +} + +uint32_t Logic::get_segment_count() const +{ + return (uint32_t)segments_.size(); } void Logic::clear() { segments_.clear(); + + samples_cleared(); +} + +double Logic::get_samplerate() const +{ + if (segments_.empty()) + return 1.0; + + return segments_.front()->samplerate(); } uint64_t Logic::max_sample_count() const { uint64_t l = 0; - for (std::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, + uint64_t end_sample) +{ + samples_added(segment, start_sample, end_sample); +} + } // namespace data } // namespace pv