X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=88fa97fbc0b6f36cee3083892be919ba24260e09;hb=72435789a077273d96260f0225f79171e679359e;hp=b4857336f9e6e1e350bc73e91ef6409bcc3f7e2e;hpb=ded43869b4d6169b7f269af0623ef0a682e5b910;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index b485733..88fa97f 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()),
@@ -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,21 +706,19 @@ 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();
 }
 
-void DecodeTrace::hover_point_changed()
+void DecodeTrace::hover_point_changed(const QPoint &hp)
 {
 	assert(owner_);
 
 	const View *const view = owner_->view();
 	assert(view);
 
-	QPoint hp = view->hover_point();
-
 	if (hp.x() == 0) {
 		QToolTip::hideText();
 		return;
@@ -746,13 +746,14 @@ void DecodeTrace::hover_point_changed()
 	// If it did, the tool tip would constantly hide and re-appear.
 	// We also push it up by one row so that it appears above the
 	// decode trace, not below.
-	hp.setX(hp.x() - (text_size.width() / 2) - padding);
+	QPoint p = hp;
+	p.setX(hp.x() - (text_size.width() / 2) - padding);
 
-	hp.setY(get_visual_y() - (row_height_ / 2) +
+	p.setY(get_visual_y() - (row_height_ / 2) +
 		(hover_row * row_height_) -
 		row_height_ - text_size.height() - padding);
 
-	QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
+	QToolTip::showText(view->viewport()->mapToGlobal(p), ann);
 }
 
 void DecodeTrace::create_decoder_form(int index,
@@ -890,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_)