View: Fully integrate the "zero trigger time" setting

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

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 509e77f6224b5dacbd9514d47f48b245f47a6c08..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,
-                       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);
@@ -607,11 +607,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
 
        double samples_per_pixel, pixels_offset;
 
-       const int64_t sample_count = decode_signal_->get_working_sample_count();
+       const int64_t sample_count = decode_signal_->get_working_sample_count(current_segment_);
        if (sample_count == 0)
                return;
 
-       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count();
+       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count(current_segment_);
        if (sample_count == samples_decoded)
                return;
 
@@ -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],
-               sample_range.first, sample_range.second);
+               current_segment_, sample_range.first, sample_range.second);
 
        return (annotations.empty()) ?
                QString() : annotations[0].annotations().front();