Prepare multi-segment protocol decoding ability

[pulseview.git] / pv / views / trace / decodetrace.cpp

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index bc309a738d8d82ee6f0341c3d301ec5a0119c0e9..88fa97fbc0b6f36cee3083892be919ba24260e09 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -236,7 +236,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 
                vector<Annotation> annotations;
                decode_signal_->get_annotation_subset(annotations, row,
 
                vector<Annotation> annotations;
                decode_signal_->get_annotation_subset(annotations, row,

-                       sample_range.first, sample_range.second);
+                       current_segment_, sample_range.first, sample_range.second);

                if (!annotations.empty()) {
                        draw_annotations(annotations, p, annotation_height, pp, y,
                                base_colour, row_title_width);
                if (!annotations.empty()) {
                        draw_annotations(annotations, p, annotation_height, pp, y,
                                base_colour, row_title_width);


@@ -706,7 +706,7 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
        vector<pv::data::decode::Annotation> annotations;
 
        decode_signal_->get_annotation_subset(annotations, visible_rows_[row],
        vector<pv::data::decode::Annotation> annotations;
 
        decode_signal_->get_annotation_subset(annotations, visible_rows_[row],

-               sample_range.first, sample_range.second);
+               current_segment_, sample_range.first, sample_range.second);

 
        return (annotations.empty()) ?
                QString() : annotations[0].annotations().front();
 
        return (annotations.empty()) ?
                QString() : annotations[0].annotations().front();