From: Joel Holdsworth Date: Fri, 27 Dec 2013 14:00:41 +0000 (+0000) Subject: Extract only the subset of annotations that are in view. X-Git-Tag: pulseview-0.2.0~95 X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=9242129958c996f9ff71da7c7b74d7983b5c59f6;hp=bc870bcf81b99afcaf4c358f4e68643d1bf4efaf Extract only the subset of annotations that are in view. To achieve this lists of annotations have been added sorted by start sample and end sample --- diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 645b92f3..1c6b3c6b 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -20,6 +20,7 @@ #include +#include #include #include @@ -99,10 +100,27 @@ int64_t DecoderStack::samples_decoded() const return _samples_decoded; } -const vector DecoderStack::annotations() const +void DecoderStack::get_annotation_subset( + std::vector &dest, + uint64_t start_sample, uint64_t end_sample) const { lock_guard lock(_mutex); - return _annotations; + + const vector::const_iterator start_iter = + lower_bound(_ann_end_index.begin(), + _ann_end_index.end(), start_sample, + bind(&DecoderStack::index_entry_end_sample_lt, + this, _1, _2)); + + const vector::const_iterator end_iter = + upper_bound(_ann_start_index.begin(), + _ann_start_index.end(), end_sample, + bind(&DecoderStack::index_entry_start_sample_gt, + this, _1, _2)); + + for (vector::const_iterator i = start_iter; + i != _ann_end_index.end() && *i != *end_iter; i++) + dest.push_back(_annotations[*i]); } QString DecoderStack::error_message() @@ -121,7 +139,7 @@ void DecoderStack::begin_decode() _samples_decoded = 0; - _annotations.clear(); + clear(); // We get the logic data of the first probe in the list. // This works because we are currently assuming all @@ -148,6 +166,8 @@ void DecoderStack::begin_decode() void DecoderStack::clear() { _annotations.clear(); + _ann_start_index.clear(); + _ann_end_index.clear(); } uint64_t DecoderStack::get_max_sample_count() const @@ -237,6 +257,57 @@ void DecoderStack::decode_proc(shared_ptr data) srd_session_destroy(session); } +bool DecoderStack::index_entry_start_sample_gt( + const uint64_t sample, const size_t index) const +{ + assert(index < _annotations.size()); + return _annotations[index].start_sample() > sample; +} + +bool DecoderStack::index_entry_end_sample_lt( + const size_t index, const uint64_t sample) const +{ + assert(index < _annotations.size()); + return _annotations[index].end_sample() < sample; +} + +bool DecoderStack::index_entry_end_sample_gt( + const uint64_t sample, const size_t index) const +{ + assert(index < _annotations.size()); + return _annotations[index].end_sample() > sample; +} + +void DecoderStack::insert_annotation_into_start_index( + const pv::data::decode::Annotation &a, const size_t storage_offset) +{ + vector::iterator i = _ann_start_index.end(); + if (!_ann_start_index.empty() && + _annotations[_ann_start_index.back()].start_sample() > + a.start_sample()) + i = upper_bound(_ann_start_index.begin(), + _ann_start_index.end(), a.start_sample(), + bind(&DecoderStack::index_entry_start_sample_gt, + this, _1, _2)); + + _ann_start_index.insert(i, storage_offset); +} + +void DecoderStack::insert_annotation_into_end_index( + const pv::data::decode::Annotation &a, const size_t storage_offset) +{ + vector::iterator i = _ann_end_index.end(); + if (!_ann_end_index.empty() && + _annotations[_ann_end_index.back()].end_sample() < + a.end_sample()) + i = upper_bound(_ann_end_index.begin(), + _ann_end_index.end(), a.end_sample(), + bind(&DecoderStack::index_entry_end_sample_gt, + this, _1, _2)); + + _ann_end_index.insert(i, storage_offset); +} + void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) { using pv::data::decode::Annotation; @@ -275,8 +346,12 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) } } + const size_t offset = d->_annotations.size(); d->_annotations.push_back(a); + d->insert_annotation_into_start_index(a, offset); + d->insert_annotation_into_end_index(a, offset); + d->new_decode_data(); } diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h index e2139f5b..9d032ad9 100644 --- a/pv/data/decoderstack.h +++ b/pv/data/decoderstack.h @@ -74,7 +74,12 @@ public: int64_t samples_decoded() const; - const std::vector annotations() const; + /** + * Extracts sorted annotations between two period into a vector. + */ + void get_annotation_subset( + std::vector &dest, + uint64_t start_sample, uint64_t end_sample) const; QString error_message(); @@ -87,6 +92,20 @@ public: private: void decode_proc(boost::shared_ptr data); + bool index_entry_start_sample_gt( + const uint64_t sample, const size_t index) const; + bool index_entry_end_sample_lt( + const size_t index, const uint64_t sample) const; + bool index_entry_end_sample_gt( + const uint64_t sample, const size_t index) const; + + void insert_annotation_into_start_index( + const pv::data::decode::Annotation &a, + const size_t storage_offset); + void insert_annotation_into_end_index( + const pv::data::decode::Annotation &a, + const size_t storage_offset); + static void annotation_callback(srd_proto_data *pdata, void *decoder); @@ -108,6 +127,14 @@ private: mutable boost::mutex _mutex; int64_t _samples_decoded; std::vector _annotations; + + /** + * _ann_start_index and _ann_end_index contain lists of annotions + * (represented by offsets in the _annotations vector), sorted in + * ascending ordered by the start_sample and end_sample respectively. + */ + std::vector _ann_start_index, _ann_end_index; + QString _error_message; boost::thread _decode_thread; diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index c3ac3dab..ce62ab6f 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -137,6 +137,11 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) _decoder_stack->get_start_time()) / scale; const double samples_per_pixel = samplerate * scale; + const uint64_t start_sample = (uint64_t)max((left + pixels_offset) * + samples_per_pixel, 0.0); + const uint64_t end_sample = (uint64_t)max((right + pixels_offset) * + samples_per_pixel, 0.0); + QFontMetrics m(QApplication::font()); const int h = (m.boundingRect(QRect(), 0, "Tg").height() * 5) / 4; @@ -154,9 +159,12 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) const int y = get_y(); assert(_decoder_stack); - vector annotations(_decoder_stack->annotations()); + vector annotations; + _decoder_stack->get_annotation_subset(annotations, + start_sample, end_sample); - BOOST_FOREACH(const Annotation &a, annotations) { + BOOST_FOREACH(const Annotation &a, annotations) + { // Every stacked PD is 60 pixels further down. int y_stack_offset = a.pd_index() * 60;