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

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 865c4926..1f9e4c4e 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>
 
@@ -60,6 +60,7 @@ using std::abs;
 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;
@@ -172,7 +173,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 
 	// 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
@@ -327,34 +328,106 @@ QMenu* DecodeTrace::create_header_context_menu(QWidget *parent)
 
 QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos)
 {
+	// 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()) {
+			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();
+	}
+
 	try {
 		selected_row_ = &visible_rows_[get_row_at_point(click_pos)];
 	} catch (out_of_range&) {
 		selected_row_ = nullptr;
 	}
 
+	// Default sample range is "from here"
 	const pair<uint64_t, uint64_t> sample_range =
-		get_sample_range(click_pos.x(), click_pos.x() + 1);
-	selected_samplepos_ = sample_range.first;
+		get_view_sample_range(click_pos.x(), click_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);
+	}
 
-	QMenu *const menu = new QMenu(parent);
+	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);
+
+	const View *view = owner_->view();
+	assert(view);
+
+	if (!view->cursors()->enabled()) {
+		export_all_rows_with_cursor->setEnabled(false);
+		export_row_with_cursor->setEnabled(false);
+	}
+
 	return menu;
 }
 
@@ -661,7 +734,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;
@@ -731,7 +804,7 @@ 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);
+		get_view_sample_range(point.x(), point.x() + 1);
 	const int row = get_row_at_point(point);
 	if (row < 0)
 		return QString();
@@ -914,6 +987,62 @@ 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"));
+	msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name));
+	msg.setStandardButtons(QMessageBox::Ok);
+	msg.setIcon(QMessageBox::Warning);
+	msg.exec();
+}
+
 void DecodeTrace::on_new_annotations()
 {
 	if (!delayed_trace_updater_.isActive())
@@ -941,6 +1070,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();
@@ -1022,72 +1159,100 @@ void DecodeTrace::on_show_hide_decoder(int index)
 
 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