Properly handle decoder errors

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

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index d2b7463612b6514bbbc31b8837bcdc6bb3d5cedb..211d46e448a531d3313c205745ff4aaf015a1133 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -163,21 +163,18 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
        row_height_ = (text_height * 6) / 4;
        const int annotation_height = (text_height * 5) / 4;
 
-       const QString err = decode_signal_->error_message();
-       if (!err.isEmpty()) {
-               draw_unresolved_period(
-                       p, annotation_height, pp.left(), pp.right());
-               draw_error(p, err, pp);
-               return;
-       }
-
        // Set default pen to allow for text width calculation
        p.setPen(Qt::black);
 
        // Iterate through the rows
        int y = get_visual_y();
-       pair<uint64_t, uint64_t> sample_range = get_sample_range(
-               pp.left(), pp.right());
+       pair<uint64_t, uint64_t> sample_range = get_sample_range(pp.left(), pp.right());
+
+       // Just because the view says we see a certain sample range it
+       // doesn't mean we have this many decoded samples, too, so crop
+       // the range to what has been decoded already
+       sample_range.second = min((int64_t)sample_range.second,
+               decode_signal_->get_decoded_sample_count(current_segment_, false));
 
        const vector<Row> rows = decode_signal_->visible_rows();
 
@@ -202,12 +199,10 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
                                get_row_color(visible_rows_.size()), row_title_width);
 
                        y += row_height_;
-
                        visible_rows_.push_back(row);
                }
        }
 
-       // Draw the hatching
        draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
 
        if ((int)visible_rows_.size() > max_visible_rows_) {
@@ -217,6 +212,10 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
                owner_->extents_changed(false, true);
                owner_->row_item_appearance_changed(false, true);
        }
+
+       const QString err = decode_signal_->error_message();
+       if (!err.isEmpty())
+               draw_error(p, err, pp);
 }
 
 void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp)
@@ -553,17 +552,18 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message,
 {
        const int y = get_visual_y();
 
+       double samples_per_pixel, pixels_offset;
+       tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel();
+
        p.setPen(ErrorBgColor.darker());
        p.setBrush(ErrorBgColor);
 
-       const QRectF bounding_rect =
-               QRectF(pp.left(), INT_MIN / 2 + y, pp.right(), INT_MAX);
-       const QRectF text_rect = p.boundingRect(bounding_rect,
-               Qt::AlignCenter, message);
+       const QRectF bounding_rect = QRectF(pp.left(), INT_MIN / 2 + y, pp.right(), INT_MAX);
+
+       const QRectF text_rect = p.boundingRect(bounding_rect, Qt::AlignCenter, message);
        const qreal r = text_rect.height() / 4;
 
-       p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
-               Qt::AbsoluteSize);
+       p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r, Qt::AbsoluteSize);
 
        p.setPen(Qt::black);
        p.drawText(text_rect, message);
@@ -580,7 +580,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
        if (sample_count == 0)
                return;
 
-       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count(current_segment_);
+       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count(current_segment_, true);
        if (sample_count == samples_decoded)
                return;
 
@@ -711,6 +711,8 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
 
 void DecodeTrace::hover_point_changed(const QPoint &hp)
 {
+       Trace::hover_point_changed(hp);
+
        assert(owner_);
 
        const View *const view = owner_->view();