From: Soeren Apel <redacted>
Date: Mon, 9 Jul 2018 19:41:30 +0000 (+0200)
Subject: Properly handle decoder errors
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=1ae18301848d741a7a17888af9e1b10171a6ccc4;ds=sidebyside

Properly handle decoder errors
---

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 0e813d38..65436002 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -906,6 +906,7 @@ void DecodeSignal::logic_mux_proc()
 				logic_mux_cond_.wait(logic_mux_lock);
 			}
 		}
+
 	} while (!logic_mux_interrupt_);
 }
 
@@ -917,7 +918,8 @@ void DecodeSignal::decode_data(
 	const int64_t chunk_sample_count = DecodeChunkLength / unit_size;
 
 	for (int64_t i = abs_start_samplenum;
-		!decode_interrupt_ && (i < (abs_start_samplenum + sample_count));
+		error_message_.isEmpty() && !decode_interrupt_ &&
+			(i < (abs_start_samplenum + sample_count));
 		i += chunk_sample_count) {
 
 		const int64_t chunk_end = min(i + chunk_sample_count,
@@ -934,11 +936,8 @@ void DecodeSignal::decode_data(
 		input_segment->get_samples(i, chunk_end, chunk);
 
 		if (srd_session_send(srd_session_, i, chunk_end, chunk,
-				data_size, unit_size) != SRD_OK) {
+				data_size, unit_size) != SRD_OK)
 			set_error_message(tr("Decoder reported an error"));
-			delete[] chunk;
-			break;
-		}
 
 		delete[] chunk;
 
diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index a65b4d97..211d46e4 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -163,14 +163,6 @@ 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);
 
@@ -207,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_) {
@@ -222,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)
@@ -558,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);