X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=30f333ddc7c4fe033ed439653f57354ab6fd68fd;hb=8b787f41b6d33dafeb045a09c7690bbf895d483b;hp=865c492604fea09e0647defbb6bd5fb95f123d5c;hpb=1ed996b433f3391f54846784d76da4fe6b07500f;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 865c4926..30f333dd 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -21,7 +21,7 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
-#include <climits>
+#include <limits>
 #include <mutex>
 #include <tuple>
 
@@ -31,6 +31,7 @@ extern "C" {
 
 #include <QAction>
 #include <QApplication>
+#include <QClipboard>
 #include <QComboBox>
 #include <QFileDialog>
 #include <QFormLayout>
@@ -57,9 +58,12 @@ extern "C" {
 #include <pv/widgets/decodermenu.hpp>
 
 using std::abs;
+using std::find_if;
+using std::lock_guard;
 using std::make_pair;
 using std::max;
 using std::min;
+using std::numeric_limits;
 using std::out_of_range;
 using std::pair;
 using std::shared_ptr;
@@ -68,7 +72,7 @@ using std::vector;
 
 using pv::data::decode::Annotation;
 using pv::data::decode::Row;
-using pv::data::DecodeChannel;
+using pv::data::decode::DecodeChannel;
 using pv::data::DecodeSignal;
 
 namespace pv {
@@ -82,7 +86,7 @@ namespace trace {
 const QColor DecodeTrace::ErrorBgColor = QColor(0xEF, 0x29, 0x29);
 const QColor DecodeTrace::NoDecodeColor = QColor(0x88, 0x8A, 0x85);
 
-const int DecodeTrace::ArrowSize = 4;
+const int DecodeTrace::ArrowSize = 7;
 const double DecodeTrace::EndCapWidth = 5;
 const int DecodeTrace::RowTitleMargin = 10;
 const int DecodeTrace::DrawPadding = 100;
@@ -93,17 +97,23 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 	shared_ptr<data::SignalBase> signalbase, int index) :
 	Trace(signalbase),
 	session_(session),
-	row_height_(0),
 	max_visible_rows_(0),
 	delete_mapper_(this),
 	show_hide_mapper_(this)
 {
 	decode_signal_ = dynamic_pointer_cast<data::DecodeSignal>(base_);
 
+	GlobalSettings settings;
+	always_show_all_rows_ = settings.value(GlobalSettings::Key_Dec_AlwaysShowAllRows).toBool();
+
+	GlobalSettings::add_change_handler(this);
+
 	// Determine shortest string we want to see displayed in full
 	QFontMetrics m(QApplication::font());
 	min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
 
+	default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4;
+
 	// For the base color, we want to start at a very different color for
 	// every decoder stack, so multiply the index with a number that is
 	// rather close to 180 degrees of the color circle but not a dividend of 360
@@ -135,6 +145,11 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 	delayed_trace_updater_.setInterval(1000 / MaxTraceUpdateRate);
 }
 
+DecodeTrace::~DecodeTrace()
+{
+	GlobalSettings::remove_change_handler(this);
+}
+
 bool DecodeTrace::enabled() const
 {
 	return true;
@@ -147,12 +162,16 @@ shared_ptr<data::SignalBase> DecodeTrace::base() const
 
 pair<int, int> DecodeTrace::v_extents() const
 {
-	const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
-
 	// Make an empty decode trace appear symmetrical
-	const int row_count = max(1, max_visible_rows_);
+	if (max_visible_rows_ == 0)
+		return make_pair(-default_row_height_, default_row_height_);
 
-	return make_pair(-row_height, row_height * row_count);
+	unsigned int height = 0;
+	for (const RowData& r : rows_)
+		if (r.currently_visible)
+			height += r.height;
+
+	return make_pair(-default_row_height_, height);
 }
 
 void DecodeTrace::paint_back(QPainter &p, ViewItemPaintParams &pp)
@@ -163,16 +182,15 @@ void DecodeTrace::paint_back(QPainter &p, ViewItemPaintParams &pp)
 
 void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 {
+	lock_guard<mutex> lock(row_modification_mutex_);
+
 	const int text_height = ViewItemPaintParams::text_height();
-	row_height_ = (text_height * 6) / 4;
 	const int annotation_height = (text_height * 5) / 4;
 
 	// 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_view_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
@@ -180,36 +198,34 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 	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();
-
-	visible_rows_.clear();
-	for (const Row& row : rows) {
-		// Cache the row title widths
-		int row_title_width;
-		try {
-			row_title_width = row_title_widths_.at(row);
-		} catch (out_of_range&) {
-			const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
-				RowTitleMargin;
-			row_title_widths_[row] = w;
-			row_title_width = w;
-		}
+	for (RowData& r : rows_)
+		r.currently_visible = false;
+	visible_rows_ = 0;
+	int y = get_visual_y();
 
+	for (RowData& r : rows_) {
 		vector<Annotation> annotations;
-		decode_signal_->get_annotation_subset(annotations, row,
+		decode_signal_->get_annotation_subset(annotations, r.decode_row,
 			current_segment_, sample_range.first, sample_range.second);
-		if (!annotations.empty()) {
+
+		// Show row if there are visible annotations or when user wants to see
+		// all rows that have annotations somewhere and this one is one of them
+		size_t ann_count = decode_signal_->get_annotation_count(r.decode_row, current_segment_);
+		r.currently_visible = (!annotations.empty() || (always_show_all_rows_ && (ann_count > 0)))
+			&& (r.decode_row.decoder()->shown());
+
+		if (r.currently_visible) {
 			draw_annotations(annotations, p, annotation_height, pp, y,
-				get_row_color(row.index()), row_title_width);
-			y += row_height_;
-			visible_rows_.push_back(row);
+				get_row_color(r.decode_row.index()), r.title_width);
+			y += r.height;
+			visible_rows_++;
 		}
 	}
 
 	draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
 
-	if ((int)visible_rows_.size() > max_visible_rows_) {
-		max_visible_rows_ = (int)visible_rows_.size();
+	if (visible_rows_ > max_visible_rows_) {
+		max_visible_rows_ = visible_rows_;
 
 		// Call order is important, otherwise the lazy event handler won't work
 		owner_->extents_changed(false, true);
@@ -223,26 +239,32 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 
 void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 {
-	assert(row_height_);
+	unsigned int y = get_visual_y();
 
-	for (size_t i = 0; i < visible_rows_.size(); i++) {
-		const int y = i * row_height_ + get_visual_y();
+	for (const RowData& r : rows_) {
+		if (!r.currently_visible)
+			continue;
 
 		p.setPen(QPen(Qt::NoPen));
-		p.setBrush(QApplication::palette().brush(QPalette::WindowText));
 
-		if (i != 0) {
-			const QPointF points[] = {
-				QPointF(pp.left(), y - ArrowSize),
-				QPointF(pp.left() + ArrowSize, y),
-				QPointF(pp.left(), y + ArrowSize)
-			};
-			p.drawPolygon(points, countof(points));
-		}
+		if (r.expand_marker_highlighted)
+			p.setBrush(QApplication::palette().brush(QPalette::HighlightedText));
+		else
+			p.setBrush(QApplication::palette().brush(QPalette::WindowText));
+
+		// Draw expansion marker
+		const QPointF points[] = {
+			QPointF(pp.left(), y - ArrowSize),
+			QPointF(pp.left() + ArrowSize, y),
+			QPointF(pp.left(), y + ArrowSize)
+		};
+		p.drawPolygon(points, countof(points));
 
-		const QRect r(pp.left() + ArrowSize * 2, y - row_height_ / 2,
-			pp.right() - pp.left(), row_height_);
-		const QString h(visible_rows_[i].title());
+		p.setBrush(QApplication::palette().brush(QPalette::WindowText));
+
+		const QRect text_rect(pp.left() + ArrowSize * 2, y - r.height / 2,
+			pp.right() - pp.left(), r.height);
+		const QString h(r.decode_row.title());
 		const int f = Qt::AlignLeft | Qt::AlignVCenter |
 			Qt::TextDontClip;
 
@@ -251,17 +273,46 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 		for (int dx = -1; dx <= 1; dx++)
 			for (int dy = -1; dy <= 1; dy++)
 				if (dx != 0 && dy != 0)
-					p.drawText(r.translated(dx, dy), f, h);
+					p.drawText(text_rect.translated(dx, dy), f, h);
 
 		// Draw the text
 		p.setPen(QApplication::palette().color(QPalette::WindowText));
-		p.drawText(r, f, h);
+		p.drawText(text_rect, f, h);
+
+		y += r.height;
 	}
 
 	if (show_hover_marker_)
 		paint_hover_marker(p);
 }
 
+void DecodeTrace::update_stack_button()
+{
+	const vector< shared_ptr<data::decode::Decoder> > &stack = decode_signal_->decoder_stack();
+
+	// Only show decoders in the menu that can be stacked onto the last one in the stack
+	if (!stack.empty()) {
+		const srd_decoder* d = stack.back()->decoder();
+
+		if (d->outputs) {
+			pv::widgets::DecoderMenu *const decoder_menu =
+				new pv::widgets::DecoderMenu(stack_button_, (const char*)(d->outputs->data));
+			connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)),
+				this, SLOT(on_stack_decoder(srd_decoder*)));
+
+			decoder_menu->setStyleSheet("QMenu { menu-scrollable: 1; }");
+
+			stack_button_->setMenu(decoder_menu);
+			stack_button_->show();
+			return;
+		}
+	}
+
+	// No decoders available for stacking
+	stack_button_->setMenu(nullptr);
+	stack_button_->hide();
+}
+
 void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	using pv::data::decode::Decoder;
@@ -296,18 +347,12 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	}
 
 	// Add stacking button
-	pv::widgets::DecoderMenu *const decoder_menu =
-		new pv::widgets::DecoderMenu(parent);
-	connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)),
-		this, SLOT(on_stack_decoder(srd_decoder*)));
-
-	QPushButton *const stack_button =
-		new QPushButton(tr("Stack Decoder"), parent);
-	stack_button->setMenu(decoder_menu);
-	stack_button->setToolTip(tr("Stack a higher-level decoder on top of this one"));
+	stack_button_ = new QPushButton(tr("Stack Decoder"), parent);
+	stack_button_->setToolTip(tr("Stack a higher-level decoder on top of this one"));
+	update_stack_button();
 
 	QHBoxLayout *stack_button_box = new QHBoxLayout;
-	stack_button_box->addWidget(stack_button, 0, Qt::AlignRight);
+	stack_button_box->addWidget(stack_button_, 0, Qt::AlignRight);
 	form->addRow(stack_button_box);
 }
 
@@ -327,34 +372,112 @@ QMenu* DecodeTrace::create_header_context_menu(QWidget *parent)
 
 QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos)
 {
-	try {
-		selected_row_ = &visible_rows_[get_row_at_point(click_pos)];
-	} catch (out_of_range&) {
-		selected_row_ = nullptr;
+	// Get entries from default menu before adding our own
+	QMenu *const menu = new QMenu(parent);
+
+	QMenu* default_menu = Trace::create_view_context_menu(parent, click_pos);
+	if (default_menu) {
+		for (QAction *action : default_menu->actions()) {  // clazy:exclude=range-loop
+			menu->addAction(action);
+			if (action->parent() == default_menu)
+				action->setParent(menu);
+		}
+		delete default_menu;
+
+		// Add separator if needed
+		if (menu->actions().length() > 0)
+			menu->addSeparator();
 	}
 
-	const pair<uint64_t, uint64_t> sample_range =
-		get_sample_range(click_pos.x(), click_pos.x() + 1);
-	selected_samplepos_ = sample_range.first;
+	selected_row_ = nullptr;
+	const RowData* r = get_row_at_point(click_pos);
+	if (r)
+		selected_row_ = &(r->decode_row);
 
-	QMenu *const menu = new QMenu(parent);
+	const View *const view = owner_->view();
+	assert(view);
+	QPoint pos = view->viewport()->mapFrom(parent, click_pos);
+
+	// Default sample range is "from here"
+	const pair<uint64_t, uint64_t> sample_range = get_view_sample_range(pos.x(), pos.x() + 1);
+	selected_sample_range_ = make_pair(sample_range.first, numeric_limits<uint64_t>::max());
+
+	if (decode_signal_->is_paused()) {
+		QAction *const resume =
+			new QAction(tr("Resume decoding"), this);
+		resume->setIcon(QIcon::fromTheme("media-playback-start",
+			QIcon(":/icons/media-playback-start.png")));
+		connect(resume, SIGNAL(triggered()), this, SLOT(on_pause_decode()));
+		menu->addAction(resume);
+	} else {
+		QAction *const pause =
+			new QAction(tr("Pause decoding"), this);
+		pause->setIcon(QIcon::fromTheme("media-playback-pause",
+			QIcon(":/icons/media-playback-pause.png")));
+		connect(pause, SIGNAL(triggered()), this, SLOT(on_pause_decode()));
+		menu->addAction(pause);
+	}
+
+	QAction *const copy_annotation_to_clipboard =
+		new QAction(tr("Copy annotation text to clipboard"), this);
+	copy_annotation_to_clipboard->setIcon(QIcon::fromTheme("edit-paste",
+		QIcon(":/icons/edit-paste.svg")));
+	connect(copy_annotation_to_clipboard, SIGNAL(triggered()), this, SLOT(on_copy_annotation_to_clipboard()));
+	menu->addAction(copy_annotation_to_clipboard);
+
+	menu->addSeparator();
+
+	QAction *const export_all_rows =
+		new QAction(tr("Export all annotations"), this);
+	export_all_rows->setIcon(QIcon::fromTheme("document-save-as",
+		QIcon(":/icons/document-save-as.png")));
+	connect(export_all_rows, SIGNAL(triggered()), this, SLOT(on_export_all_rows()));
+	menu->addAction(export_all_rows);
 
 	QAction *const export_row =
-			new QAction(tr("Export all annotations for this row"), this);
+		new QAction(tr("Export all annotations for this row"), this);
 	export_row->setIcon(QIcon::fromTheme("document-save-as",
 		QIcon(":/icons/document-save-as.png")));
-	connect(export_row, SIGNAL(triggered()),
-		this, SLOT(on_export_row()));
+	connect(export_row, SIGNAL(triggered()), this, SLOT(on_export_row()));
 	menu->addAction(export_row);
 
+	menu->addSeparator();
+
+	QAction *const export_all_rows_from_here =
+		new QAction(tr("Export all annotations, starting here"), this);
+	export_all_rows_from_here->setIcon(QIcon::fromTheme("document-save-as",
+		QIcon(":/icons/document-save-as.png")));
+	connect(export_all_rows_from_here, SIGNAL(triggered()), this, SLOT(on_export_all_rows_from_here()));
+	menu->addAction(export_all_rows_from_here);
+
 	QAction *const export_row_from_here =
 		new QAction(tr("Export annotations for this row, starting here"), this);
 	export_row_from_here->setIcon(QIcon::fromTheme("document-save-as",
 		QIcon(":/icons/document-save-as.png")));
-	connect(export_row_from_here, SIGNAL(triggered()),
-		this, SLOT(on_export_row_from_here()));
+	connect(export_row_from_here, SIGNAL(triggered()), this, SLOT(on_export_row_from_here()));
 	menu->addAction(export_row_from_here);
 
+	menu->addSeparator();
+
+	QAction *const export_all_rows_with_cursor =
+		new QAction(tr("Export all annotations within cursor range"), this);
+	export_all_rows_with_cursor->setIcon(QIcon::fromTheme("document-save-as",
+		QIcon(":/icons/document-save-as.png")));
+	connect(export_all_rows_with_cursor, SIGNAL(triggered()), this, SLOT(on_export_all_rows_with_cursor()));
+	menu->addAction(export_all_rows_with_cursor);
+
+	QAction *const export_row_with_cursor =
+		new QAction(tr("Export annotations for this row within cursor range"), this);
+	export_row_with_cursor->setIcon(QIcon::fromTheme("document-save-as",
+		QIcon(":/icons/document-save-as.png")));
+	connect(export_row_with_cursor, SIGNAL(triggered()), this, SLOT(on_export_row_with_cursor()));
+	menu->addAction(export_row_with_cursor);
+
+	if (!view->cursors()->enabled()) {
+		export_all_rows_with_cursor->setEnabled(false);
+		export_row_with_cursor->setEnabled(false);
+	}
+
 	return menu;
 }
 
@@ -661,7 +784,7 @@ pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
 	return make_pair(pixels_offset, samplerate * scale);
 }
 
-pair<uint64_t, uint64_t> DecodeTrace::get_sample_range(
+pair<uint64_t, uint64_t> DecodeTrace::get_view_sample_range(
 	int x_start, int x_end) const
 {
 	double samples_per_pixel, pixels_offset;
@@ -704,23 +827,36 @@ QColor DecodeTrace::get_annotation_color(QColor row_color, int annotation_index)
 	return color;
 }
 
-int DecodeTrace::get_row_at_point(const QPoint &point)
+unsigned int DecodeTrace::get_row_y(const RowData* row) const
 {
-	if (!row_height_)
-		return -1;
+	assert(row);
+
+	unsigned int y = get_visual_y();
+
+	for (const RowData& r : rows_)
+		if (row != &r)
+			y += r.height;
+		else
+			break;
+
+	return y;
+}
 
-	const int y = (point.y() - get_visual_y() + row_height_ / 2);
+RowData* DecodeTrace::get_row_at_point(const QPoint &point)
+{
+	int y = get_visual_y();
 
-	/* Integer divison of (x-1)/x would yield 0, so we check for this. */
-	if (y < 0)
-		return -1;
+	for (RowData& r : rows_) {
+		if (!r.currently_visible)
+			continue;
 
-	const int row = y / row_height_;
+		if ((point.y() >= y) && (point.y() < (int)(y + r.height)))
+			return &r;
 
-	if (row >= (int)visible_rows_.size())
-		return -1;
+		y += r.height;
+	}
 
-	return row;
+	return nullptr;
 }
 
 const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
@@ -731,14 +867,15 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
 		return QString();
 
 	const pair<uint64_t, uint64_t> sample_range =
-		get_sample_range(point.x(), point.x() + 1);
-	const int row = get_row_at_point(point);
-	if (row < 0)
+		get_view_sample_range(point.x(), point.x() + 1);
+	const RowData* r = get_row_at_point(point);
+
+	if (!r)
 		return QString();
 
 	vector<Annotation> annotations;
 
-	decode_signal_->get_annotation_subset(annotations, visible_rows_[row],
+	decode_signal_->get_annotation_subset(annotations, r->decode_row,
 		current_segment_, sample_range.first, sample_range.second);
 
 	return (annotations.empty()) ?
@@ -751,44 +888,51 @@ void DecodeTrace::hover_point_changed(const QPoint &hp)
 
 	assert(owner_);
 
-	const View *const view = owner_->view();
-	assert(view);
+	RowData* hover_row = get_row_at_point(hp);
 
-	if (hp.x() == 0) {
-		QToolTip::hideText();
-		return;
-	}
+	// Row/class visibility button handling
+	for (RowData& r : rows_)
+		r.expand_marker_highlighted = false;
 
-	QString ann = get_annotation_at_point(hp);
+	if (hover_row) {
+		int row_y = get_row_y(hover_row);
+		if ((hp.x() > 0) && (hp.x() < ArrowSize) &&
+			(hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize)))
+			hover_row->expand_marker_highlighted = true;
+	}
 
-	assert(view);
+	// Tooltip handling
+	if (hp.x() > 0) {
+		QString ann = get_annotation_at_point(hp);
 
-	if (!row_height_ || ann.isEmpty()) {
-		QToolTip::hideText();
-		return;
-	}
+		if (ann.isEmpty()) {
+			QToolTip::hideText();
+			return;
+		}
 
-	const int hover_row = get_row_at_point(hp);
+		QFontMetrics m(QToolTip::font());
+		const QRect text_size = m.boundingRect(QRect(), 0, ann);
 
-	QFontMetrics m(QToolTip::font());
-	const QRect text_size = m.boundingRect(QRect(), 0, ann);
+		// This is OS-specific and unfortunately we can't query it, so
+		// use an approximation to at least try to minimize the error.
+		const int padding = 8;
 
-	// This is OS-specific and unfortunately we can't query it, so
-	// use an approximation to at least try to minimize the error.
-	const int padding = 8;
+		// Make sure the tool tip doesn't overlap with the mouse cursor.
+		// 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.
+		QPoint p = hp;
+		p.setX(hp.x() - (text_size.width() / 2) - padding);
 
-	// Make sure the tool tip doesn't overlap with the mouse cursor.
-	// 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.
-	QPoint p = hp;
-	p.setX(hp.x() - (text_size.width() / 2) - padding);
+		p.setY(get_row_y(hover_row) - hover_row->height - default_row_height_ -
+			text_size.height() - padding);
 
-	p.setY(get_visual_y() - (row_height_ / 2) +
-		(hover_row * row_height_) -
-		row_height_ - text_size.height() - padding);
+		const View *const view = owner_->view();
+		assert(view);
+		QToolTip::showText(view->viewport()->mapToGlobal(p), ann);
 
-	QToolTip::showText(view->viewport()->mapToGlobal(p), ann);
+	} else
+		QToolTip::hideText();
 }
 
 void DecodeTrace::create_decoder_form(int index,
@@ -826,7 +970,7 @@ void DecodeTrace::create_decoder_form(int index,
 	const vector<DecodeChannel> channels = decode_signal_->get_channels();
 
 	// Add the channels
-	for (DecodeChannel ch : channels) {
+	for (const DecodeChannel& ch : channels) {
 		// Ignore channels not part of the decoder we create the form for
 		if (ch.decoder_ != dec)
 			continue;
@@ -914,6 +1058,120 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent,
 	return selector;
 }
 
+void DecodeTrace::export_annotations(vector<Annotation> *annotations) const
+{
+	using namespace pv::data::decode;
+
+	GlobalSettings settings;
+	const QString dir = settings.value("MainWindow/SaveDirectory").toString();
+
+	const QString file_name = QFileDialog::getSaveFileName(
+		owner_->view(), tr("Export annotations"), dir, tr("Text Files (*.txt);;All Files (*)"));
+
+	if (file_name.isEmpty())
+		return;
+
+	QString format = settings.value(GlobalSettings::Key_Dec_ExportFormat).toString();
+	const QString quote = format.contains("%q") ? "\"" : "";
+	format = format.remove("%q");
+
+	QFile file(file_name);
+	if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
+		QTextStream out_stream(&file);
+
+		for (Annotation &ann : *annotations) {
+			const QString sample_range = QString("%1-%2") \
+				.arg(QString::number(ann.start_sample()), QString::number(ann.end_sample()));
+
+			const QString class_name = quote + ann.row()->class_name() + quote;
+
+			QString all_ann_text;
+			for (const QString &s : ann.annotations())
+				all_ann_text = all_ann_text + quote + s + quote + ",";
+			all_ann_text.chop(1);
+
+			const QString first_ann_text = quote + ann.annotations().front() + quote;
+
+			QString out_text = format;
+			out_text = out_text.replace("%s", sample_range);
+			out_text = out_text.replace("%d",
+				quote + QString::fromUtf8(ann.row()->decoder()->name()) + quote);
+			out_text = out_text.replace("%c", class_name);
+			out_text = out_text.replace("%1", first_ann_text);
+			out_text = out_text.replace("%a", all_ann_text);
+			out_stream << out_text << '\n';
+		}
+
+		if (out_stream.status() == QTextStream::Ok)
+			return;
+	}
+
+	QMessageBox msg(owner_->view());
+	msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name));
+	msg.setStandardButtons(QMessageBox::Ok);
+	msg.setIcon(QMessageBox::Warning);
+	msg.exec();
+}
+
+void DecodeTrace::update_rows()
+{
+	lock_guard<mutex> lock(row_modification_mutex_);
+
+	QFontMetrics m(QApplication::font());
+
+	for (RowData& r : rows_)
+		r.exists = false;
+
+	for (const Row& decode_row : decode_signal_->get_rows()) {
+		// Find row in our list
+		auto r_it = find_if(rows_.begin(), rows_.end(),
+			[&](RowData& r){ return r.decode_row == decode_row; });
+
+		RowData* r = nullptr;
+		if (r_it == rows_.end()) {
+			// Row doesn't exist yet, create and append it
+			RowData nr;
+			nr.decode_row = decode_row;
+			nr.height = default_row_height_;
+			nr.currently_visible = false;
+			nr.expand_marker_highlighted = false;
+			nr.expanded = false;
+
+			rows_.push_back(nr);
+			r = &rows_.back();
+		} else
+			r = &(*r_it);
+
+		r->exists = true;
+
+		const int w = m.boundingRect(r->decode_row.title()).width() + RowTitleMargin;
+		r->title_width = w;
+	}
+
+	// Remove any rows that no longer exist, obeying that iterators are invalidated
+	bool any_exists;
+	do {
+		any_exists = false;
+
+		for (unsigned int i = 0; i < rows_.size(); i++)
+			if (!rows_[i].exists) {
+				rows_.erase(rows_.begin() + i);
+				any_exists = true;
+				break;
+			}
+	} while (any_exists);
+}
+
+void DecodeTrace::on_setting_changed(const QString &key, const QVariant &value)
+{
+	Trace::on_setting_changed(key, value);
+
+	if (key == GlobalSettings::Key_Dec_AlwaysShowAllRows) {
+		max_visible_rows_ = 0;
+		always_show_all_rows_ = value.toBool();
+	}
+}
+
 void DecodeTrace::on_new_annotations()
 {
 	if (!delayed_trace_updater_.isActive())
@@ -928,8 +1186,8 @@ void DecodeTrace::on_delayed_trace_update()
 
 void DecodeTrace::on_decode_reset()
 {
-	visible_rows_.clear();
 	max_visible_rows_ = 0;
+	update_rows();
 
 	if (owner_)
 		owner_->row_item_appearance_changed(false, true);
@@ -941,6 +1199,14 @@ void DecodeTrace::on_decode_finished()
 		owner_->row_item_appearance_changed(false, true);
 }
 
+void DecodeTrace::on_pause_decode()
+{
+	if (decode_signal_->is_paused())
+		decode_signal_->resume_decode();
+	else
+		decode_signal_->pause_decode();
+}
+
 void DecodeTrace::delete_pressed()
 {
 	on_delete();
@@ -987,6 +1253,7 @@ void DecodeTrace::on_init_state_changed(int)
 void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
 {
 	decode_signal_->stack_decoder(decoder);
+	update_rows();
 
 	create_popup_form();
 }
@@ -994,12 +1261,12 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
 void DecodeTrace::on_delete_decoder(int index)
 {
 	decode_signal_->remove_decoder(index);
+	update_rows();
 
-	// Force re-calculation of the trace height, see paint_mid()
+	// Force re-calculation of the trace height
 	max_visible_rows_ = 0;
 	owner_->extents_changed(false, true);
 
-	// Update the popup
 	create_popup_form();
 }
 
@@ -1020,74 +1287,126 @@ void DecodeTrace::on_show_hide_decoder(int index)
 		owner_->row_item_appearance_changed(false, true);
 }
 
+void DecodeTrace::on_copy_annotation_to_clipboard()
+{
+	using namespace pv::data::decode;
+
+	if (!selected_row_)
+		return;
+
+	vector<Annotation> *annotations = new vector<Annotation>();
+
+	decode_signal_->get_annotation_subset(*annotations, *selected_row_,
+		current_segment_, selected_sample_range_.first, selected_sample_range_.first);
+
+	if (annotations->empty())
+		return;
+
+	QClipboard *clipboard = QApplication::clipboard();
+	clipboard->setText(annotations->front().annotations().front(), QClipboard::Clipboard);
+
+	if (clipboard->supportsSelection())
+		clipboard->setText(annotations->front().annotations().front(), QClipboard::Selection);
+
+	delete annotations;
+}
+
 void DecodeTrace::on_export_row()
 {
-	selected_samplepos_ = 0;
+	selected_sample_range_ = make_pair(0, numeric_limits<uint64_t>::max());
 	on_export_row_from_here();
 }
 
-void DecodeTrace::on_export_row_from_here()
+void DecodeTrace::on_export_all_rows()
 {
-	using namespace pv::data::decode;
+	selected_sample_range_ = make_pair(0, numeric_limits<uint64_t>::max());
+	on_export_all_rows_from_here();
+}
 
-	if (!selected_row_)
+void DecodeTrace::on_export_row_with_cursor()
+{
+	const View *view = owner_->view();
+	assert(view);
+
+	if (!view->cursors()->enabled())
 		return;
 
-	vector<Annotation> annotations;
+	const double samplerate = session_.get_samplerate();
 
-	decode_signal_->get_annotation_subset(annotations, *selected_row_,
-		current_segment_, selected_samplepos_, ULLONG_MAX);
+	const pv::util::Timestamp& start_time = view->cursors()->first()->time();
+	const pv::util::Timestamp& end_time = view->cursors()->second()->time();
 
-	if (annotations.empty())
+	const uint64_t start_sample = (uint64_t)max(
+		0.0, start_time.convert_to<double>() * samplerate);
+	const uint64_t end_sample = (uint64_t)max(
+		0.0, end_time.convert_to<double>() * samplerate);
+
+	// Are both cursors negative and thus were clamped to 0?
+	if ((start_sample == 0) && (end_sample == 0))
 		return;
 
-	GlobalSettings settings;
-	const QString dir = settings.value("MainWindow/SaveDirectory").toString();
+	selected_sample_range_ = make_pair(start_sample, end_sample);
+	on_export_row_from_here();
+}
 
-	const QString file_name = QFileDialog::getSaveFileName(
-		owner_->view(), tr("Export annotations"), dir, tr("Text Files (*.txt);;All Files (*)"));
+void DecodeTrace::on_export_all_rows_with_cursor()
+{
+	const View *view = owner_->view();
+	assert(view);
 
-	if (file_name.isEmpty())
+	if (!view->cursors()->enabled())
 		return;
 
-	const QString format = settings.value(GlobalSettings::Key_Dec_ExportFormat).toString();
-	const QString quote = format.contains("%q") ? "\"" : "";
-	const QString class_name = selected_row_->class_name();
+	const double samplerate = session_.get_samplerate();
 
-	QFile file(file_name);
-	if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
-		QTextStream out_stream(&file);
+	const pv::util::Timestamp& start_time = view->cursors()->first()->time();
+	const pv::util::Timestamp& end_time = view->cursors()->second()->time();
 
-		for (Annotation &ann : annotations) {
-			const QString sample_range = QString("%1-%2").arg(ann.start_sample()).arg(
-				ann.end_sample());
+	const uint64_t start_sample = (uint64_t)max(
+		0.0, start_time.convert_to<double>() * samplerate);
+	const uint64_t end_sample = (uint64_t)max(
+		0.0, end_time.convert_to<double>() * samplerate);
 
-			QString all_ann_text;
-			for (const QString &s : ann.annotations())
-				all_ann_text = all_ann_text + quote + s + quote + ",";
-			all_ann_text.chop(1);
+	// Are both cursors negative and thus were clamped to 0?
+	if ((start_sample == 0) && (end_sample == 0))
+		return;
 
-			const QString first_ann_text = quote + ann.annotations().front() + quote;
+	selected_sample_range_ = make_pair(start_sample, end_sample);
+	on_export_all_rows_from_here();
+}
 
-			QString out_text = format;
-			out_text = out_text.replace("%s", sample_range);
-			out_text = out_text.replace("%d", decode_signal_->name());
-			out_text = out_text.replace("%c", class_name);
-			out_text = out_text.replace("%1", first_ann_text);
-			out_text = out_text.replace("%a", all_ann_text);
-			out_stream << out_text << '\n';
-		}
+void DecodeTrace::on_export_row_from_here()
+{
+	using namespace pv::data::decode;
 
-		if (out_stream.status() == QTextStream::Ok)
-			return;
-	}
+	if (!selected_row_)
+		return;
 
-	QMessageBox msg(owner_->view());
-	msg.setText(tr("Error"));
-	msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name));
-	msg.setStandardButtons(QMessageBox::Ok);
-	msg.setIcon(QMessageBox::Warning);
-	msg.exec();
+	vector<Annotation> *annotations = new vector<Annotation>();
+
+	decode_signal_->get_annotation_subset(*annotations, *selected_row_,
+		current_segment_, selected_sample_range_.first, selected_sample_range_.second);
+
+	if (annotations->empty())
+		return;
+
+	export_annotations(annotations);
+	delete annotations;
+}
+
+void DecodeTrace::on_export_all_rows_from_here()
+{
+	using namespace pv::data::decode;
+
+	vector<Annotation> *annotations = new vector<Annotation>();
+
+	decode_signal_->get_annotation_subset(*annotations, current_segment_,
+			selected_sample_range_.first, selected_sample_range_.second);
+
+	if (!annotations->empty())
+		export_annotations(annotations);
+
+	delete annotations;
 }
 
 } // namespace trace