X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=bf31a72ac05adaee19ee78e6d54b1c9f3bc09191;hp=7bbc5a19b526cd5afa6856a578f1d03f989533df;hb=30677c1392b54604b01558cf29b44572731659fc;hpb=873e80357d9622678069fcfe83b010717a68284c;ds=sidebyside

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 7bbc5a19..bf31a72a 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -146,6 +146,8 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 
 	connect(decode_signal_.get(), SIGNAL(new_annotations()),
 		this, SLOT(on_new_annotations()));
+	connect(decode_signal_.get(), SIGNAL(decode_reset()),
+		this, SLOT(on_decode_reset()));
 	connect(decode_signal_.get(), SIGNAL(decode_finished()),
 		this, SLOT(on_decode_finished()));
 	connect(decode_signal_.get(), SIGNAL(channels_updated()),
@@ -218,7 +220,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 		int row_title_width;
 		try {
 			row_title_width = row_title_widths_.at(row);
-		} catch (out_of_range) {
+		} catch (out_of_range&) {
 			const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
 				RowTitleMargin;
 			row_title_widths_[row] = w;
@@ -234,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);
@@ -605,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;
 
@@ -704,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();
@@ -889,6 +891,15 @@ void DecodeTrace::on_delayed_trace_update()
 		owner_->row_item_appearance_changed(false, true);
 }
 
+void DecodeTrace::on_decode_reset()
+{
+	visible_rows_.clear();
+	max_visible_rows_ = 0;
+
+	if (owner_)
+		owner_->row_item_appearance_changed(false, true);
+}
+
 void DecodeTrace::on_decode_finished()
 {
 	if (owner_)