X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=4a7d6ed8c60a7593773d50bf17026176f018678b;hb=0822e33a2eb713815ae2cd5d6fcca0865643bb00;hp=ec2b6a23f6e1aac6487ef0629d28e77b45a6218f;hpb=722c76245c024d06812d132eb355e738b2436bff;p=pulseview.git diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index ec2b6a23..4a7d6ed8 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -449,7 +449,7 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id, return result; } -vector DecodeSignal::visible_rows() const +vector DecodeSignal::get_rows(bool visible_only) const { lock_guard lock(output_mutex_); @@ -457,7 +457,7 @@ vector DecodeSignal::visible_rows() const for (const shared_ptr& dec : stack_) { assert(dec); - if (!dec->shown()) + if (visible_only && !dec->shown()) continue; const srd_decoder *const decc = dec->decoder(); @@ -507,7 +507,7 @@ void DecodeSignal::get_annotation_subset( { // Note: We put all vectors and lists on the heap, not the stack - const vector rows = visible_rows(); + const vector rows = get_rows(true); // Use forward_lists for faster merging forward_list *all_ann_list = new forward_list();