X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=272dac234374c9f4e69e825100520e81010644d4;hp=e48df546613a308b9e1374df3ea197be56fc71c5;hb=0fb9d6454c286869d71621b69515802903735057;hpb=ed43ef2e59baab85aa0381b08db101b7800e5c64

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index e48df546..272dac23 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -45,6 +45,8 @@
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
+#include "util.hpp"
+#include "data/segment.hpp"
 #include "devices/hardwaredevice.hpp"
 #include "devices/inputfile.hpp"
 #include "devices/sessionfile.hpp"
@@ -68,8 +70,11 @@
 #include <glib.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::cerr;
+using std::endl;
 using std::list;
 using std::map;
+using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -90,33 +95,36 @@ const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
 const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainWindow::MainWindow(DeviceManager &device_manager,
-	const char *open_file_name,
+	string open_file_name, string open_file_format,
 	QWidget *parent) :
 	QMainWindow(parent),
 	device_manager_(device_manager),
 	session_(device_manager),
 	action_open_(new QAction(this)),
 	action_save_as_(new QAction(this)),
+	action_save_selection_as_(new QAction(this)),
 	action_connect_(new QAction(this)),
 	action_quit_(new QAction(this)),
 	action_view_zoom_in_(new QAction(this)),
 	action_view_zoom_out_(new QAction(this)),
 	action_view_zoom_fit_(new QAction(this)),
 	action_view_zoom_one_to_one_(new QAction(this)),
+	action_view_sticky_scrolling_(new QAction(this)),
+	action_view_coloured_bg_(new QAction(this)),
 	action_view_show_cursors_(new QAction(this)),
 	action_about_(new QAction(this))
 #ifdef ENABLE_DECODE
 	, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
 {
+	qRegisterMetaType<util::Timestamp>("util::Timestamp");
+
 	setup_ui();
 	restore_ui_settings();
-	if (open_file_name) {
-		const QString s(QString::fromUtf8(open_file_name));
-		QMetaObject::invokeMethod(this, "load_file",
-			Qt::QueuedConnection,
-			Q_ARG(QString, s));
-	}
+	if (open_file_name.empty())
+		select_init_device();
+	else
+		load_init_file(open_file_name, open_file_format);
 }
 
 QAction* MainWindow::action_open() const
@@ -129,6 +137,11 @@ QAction* MainWindow::action_save_as() const
 	return action_save_as_;
 }
 
+QAction* MainWindow::action_save_selection_as() const
+{
+	return action_save_selection_as_;
+}
+
 QAction* MainWindow::action_connect() const
 {
 	return action_connect_;
@@ -159,6 +172,11 @@ QAction* MainWindow::action_view_zoom_one_to_one() const
 	return action_view_zoom_one_to_one_;
 }
 
+QAction* MainWindow::action_view_sticky_scrolling() const
+{
+	return action_view_sticky_scrolling_;
+}
+
 QAction* MainWindow::action_view_show_cursors() const
 {
 	return action_view_show_cursors_;
@@ -178,12 +196,11 @@ QMenu* MainWindow::menu_decoder_add() const
 
 void MainWindow::run_stop()
 {
-	switch(session_.get_capture_state()) {
+	switch (session_.get_capture_state()) {
 	case Session::Stopped:
 		session_.start_capture([&](QString message) {
 			session_error("Capture failed", message); });
 		break;
-
 	case Session::AwaitingTrigger:
 	case Session::Running:
 		session_.stop_capture();
@@ -194,8 +211,11 @@ void MainWindow::run_stop()
 void MainWindow::select_device(shared_ptr<devices::Device> device)
 {
 	try {
-		session_.set_device(device);
-	} catch(const QString &e) {
+		if (device)
+			session_.set_device(device);
+		else
+			session_.set_default_device();
+	} catch (const QString &e) {
 		QMessageBox msg(this);
 		msg.setText(e);
 		msg.setInformativeText(tr("Failed to Select Device"));
@@ -205,7 +225,8 @@ void MainWindow::select_device(shared_ptr<devices::Device> device)
 	}
 }
 
-void MainWindow::export_file(shared_ptr<OutputFormat> format)
+void MainWindow::export_file(shared_ptr<OutputFormat> format,
+	bool selection_only)
 {
 	using pv::dialogs::StoreProgress;
 
@@ -215,6 +236,30 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
 	QSettings settings;
 	const QString dir = settings.value(SettingSaveDirectory).toString();
 
+	std::pair<uint64_t, uint64_t> sample_range;
+
+	// Selection only? Verify that the cursors are active and fetch their values
+	if (selection_only) {
+		if (!view_->cursors()->enabled()) {
+			show_session_error(tr("Missing Cursors"), tr("You need to set the " \
+					"cursors before you can save the data enclosed by them " \
+					"to a session file (e.g. using ALT-V - Show Cursors)."));
+			return;
+		}
+
+		const double samplerate = session_.get_samplerate();
+
+		const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
+		const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
+
+		const uint64_t start_sample = start_time.convert_to<double>() * samplerate;
+		const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+
+		sample_range = std::make_pair(start_sample, end_sample);
+	} else {
+		sample_range = std::make_pair(0, 0);
+	}
+
 	// Construct the filter
 	const vector<string> exts = format->extensions();
 	QString filter = tr("%1 files ").arg(
@@ -250,7 +295,7 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
 	}
 
 	StoreProgress *dlg = new StoreProgress(file_name, format, options,
-		session_, this);
+		sample_range, session_, this);
 	dlg->run();
 }
 
@@ -274,12 +319,25 @@ void MainWindow::import_file(shared_ptr<InputFormat> format)
 			"%1 files (*.*);;All Files (*.*)").arg(
 			QString::fromStdString(format->description())));
 
-	if (!file_name.isEmpty()) {
-		load_file(file_name, format);
+	if (file_name.isEmpty())
+		return;
 
-		const QString abs_path = QFileInfo(file_name).absolutePath();
-		settings.setValue(SettingOpenDirectory, abs_path);
+	// Show the options dialog
+	map<string, Glib::VariantBase> options;
+	if (!format->options().empty()) {
+		dialogs::InputOutputOptions dlg(
+			tr("Import %1").arg(QString::fromStdString(
+				format->description())),
+			format->options(), this);
+		if (!dlg.exec())
+			return;
+		options = dlg.options();
 	}
+
+	load_file(file_name, format, options);
+
+	const QString abs_path = QFileInfo(file_name).absolutePath();
+	settings.setValue(SettingOpenDirectory, abs_path);
 }
 
 void MainWindow::setup_ui()
@@ -324,6 +382,13 @@ void MainWindow::setup_ui()
 	action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs"));
 	menu_file->addAction(action_save_as_);
 
+	action_save_selection_as_->setText(tr("Save Selected &Range As..."));
+	action_save_selection_as_->setIcon(QIcon::fromTheme("document-save-as",
+		QIcon(":/icons/document-save-as.png")));
+	action_save_selection_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+	action_save_selection_as_->setObjectName(QString::fromUtf8("actionSaveSelectionAs"));
+	menu_file->addAction(action_save_selection_as_);
+
 	menu_file->addSeparator();
 
 	widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this,
@@ -378,6 +443,7 @@ void MainWindow::setup_ui()
 		QString::fromUtf8("actionViewZoomOut"));
 	menu_view->addAction(action_view_zoom_out_);
 
+	action_view_zoom_fit_->setCheckable(true);
 	action_view_zoom_fit_->setText(tr("Zoom to &Fit"));
 	action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit",
 		QIcon(":/icons/zoom-fit.png")));
@@ -396,6 +462,28 @@ void MainWindow::setup_ui()
 
 	menu_view->addSeparator();
 
+	action_view_sticky_scrolling_->setCheckable(true);
+	action_view_sticky_scrolling_->setChecked(true);
+	action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
+	action_view_sticky_scrolling_->setObjectName(
+		QString::fromUtf8("actionViewStickyScrolling"));
+	action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling"));
+	menu_view->addAction(action_view_sticky_scrolling_);
+
+	view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+
+	menu_view->addSeparator();
+
+	action_view_coloured_bg_->setCheckable(true);
+	action_view_coloured_bg_->setChecked(true);
+	action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_S));
+	action_view_coloured_bg_->setObjectName(
+		QString::fromUtf8("actionViewColouredBg"));
+	action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+	menu_view->addAction(action_view_coloured_bg_);
+
+	menu_view->addSeparator();
+
 	action_view_show_cursors_->setCheckable(true);
 	action_view_show_cursors_->setChecked(view_->cursors_shown());
 	action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
@@ -436,6 +524,10 @@ void MainWindow::setup_ui()
 	setMenuBar(menu_bar);
 	QMetaObject::connectSlotsByName(this);
 
+	// Also add all actions to the main window for always-enabled hotkeys
+	for (QAction* action : menu_bar->actions())
+		this->addAction(action);
+
 	// Setup the toolbar
 	main_bar_ = new toolbars::MainBar(session_, *this);
 
@@ -452,8 +544,72 @@ void MainWindow::setup_ui()
 		SLOT(capture_state_changed(int)));
 	connect(&session_, SIGNAL(device_selected()), this,
 		SLOT(device_selected()));
+	connect(&session_, SIGNAL(trigger_event(util::Timestamp)), view_,
+		SLOT(trigger_event(util::Timestamp)));
+
+	// Setup view_ events
+	connect(view_, SIGNAL(sticky_scrolling_changed(bool)), this,
+		SLOT(sticky_scrolling_changed(bool)));
+	connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)), this,
+		SLOT(always_zoom_to_fit_changed(bool)));
+
+}
+
+void MainWindow::select_init_device()
+{
+	QSettings settings;
+	map<string, string> dev_info;
+	list<string> key_list;
+
+	// Re-select last used device if possible.
+	settings.beginGroup("Device");
+	key_list.push_back("vendor");
+	key_list.push_back("model");
+	key_list.push_back("version");
+	key_list.push_back("serial_num");
+	key_list.push_back("connection_id");
+
+	for (string key : key_list) {
+		const QString k = QString::fromStdString(key);
+		if (!settings.contains(k))
+			continue;
+
+		const string value = settings.value(k).toString().toStdString();
+		if (!value.empty())
+			dev_info.insert(std::make_pair(key, value));
+	}
+
+	const shared_ptr<devices::HardwareDevice> device =
+		device_manager_.find_device_from_info(dev_info);
+	select_device(device);
+	update_device_list();
+
+	settings.endGroup();
+}
+
+void MainWindow::load_init_file(const std::string &file_name,
+	const std::string &format)
+{
+	shared_ptr<InputFormat> input_format;
+
+	if (!format.empty()) {
+		const map<string, shared_ptr<InputFormat> > formats =
+			device_manager_.context()->input_formats();
+		const auto iter = find_if(formats.begin(), formats.end(),
+			[&](const pair<string, shared_ptr<InputFormat> > f) {
+				return f.first == format; });
+		if (iter == formats.end()) {
+			cerr << "Unexpected input format: " << format << endl;
+			return;
+		}
+
+		input_format = (*iter).second;
+	}
+
+	load_file(QString::fromStdString(file_name), input_format);
 }
 
+
 void MainWindow::save_ui_settings()
 {
 	QSettings settings;
@@ -478,7 +634,6 @@ void MainWindow::save_ui_settings()
 			session_.device());
 
 		for (string key : key_list) {
-
 			if (dev_info.count(key))
 				settings.setValue(QString::fromUtf8(key.c_str()),
 						QString::fromUtf8(dev_info.at(key).c_str()));
@@ -494,10 +649,6 @@ void MainWindow::restore_ui_settings()
 {
 	QSettings settings;
 
-	map<string, string> dev_info;
-	list<string> key_list;
-	string value;
-
 	settings.beginGroup("MainWindow");
 
 	if (settings.contains("geometry")) {
@@ -507,33 +658,6 @@ void MainWindow::restore_ui_settings()
 		resize(1000, 720);
 
 	settings.endGroup();
-
-	// Re-select last used device if possible.
-	settings.beginGroup("Device");
-	key_list.push_back("vendor");
-	key_list.push_back("model");
-	key_list.push_back("version");
-	key_list.push_back("serial_num");
-	key_list.push_back("connection_id");
-
-	for (string key : key_list) {
-		if (!settings.contains(QString::fromUtf8(key.c_str())))
-			continue;
-
-		value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-		if (value.size() > 0)
-			dev_info.insert(std::make_pair(key, value));
-	}
-
-	const shared_ptr<devices::HardwareDevice> device =
-		device_manager_.find_device_from_info(dev_info);
-	if (device) {
-		select_device(device);
-		update_device_list();
-	}
-
-	settings.endGroup();
 }
 
 void MainWindow::session_error(
@@ -549,28 +673,12 @@ void MainWindow::update_device_list()
 	main_bar_->update_device_list();
 }
 
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-	save_ui_settings();
-	event->accept();
-}
-
-void MainWindow::keyReleaseEvent(QKeyEvent *event)
-{
-	if (event->key() == Qt::Key_Alt) {
-		menuBar()->setHidden(!menuBar()->isHidden());
-		menuBar()->setFocus();
-	}
-	QMainWindow::keyReleaseEvent(event);
-}
-
 void MainWindow::load_file(QString file_name,
 	std::shared_ptr<sigrok::InputFormat> format,
 	const std::map<std::string, Glib::VariantBase> &options)
 {
 	const QString errorMessage(
 		QString("Failed to load file %1").arg(file_name));
-	const QString infoMessage;
 
 	try {
 		if (format)
@@ -584,7 +692,7 @@ void MainWindow::load_file(QString file_name,
 				new devices::SessionFile(
 					device_manager_.context(),
 					file_name.toStdString())));
-	} catch(Error e) {
+	} catch (Error e) {
 		show_session_error(tr("Failed to load ") + file_name, e.what());
 		session_.set_default_device();
 		update_device_list();
@@ -593,10 +701,25 @@ void MainWindow::load_file(QString file_name,
 
 	update_device_list();
 
-	session_.start_capture([&, errorMessage, infoMessage](QString) {
+	session_.start_capture([&, errorMessage](QString infoMessage) {
 		session_error(errorMessage, infoMessage); });
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+	save_ui_settings();
+	event->accept();
+}
+
+void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
+	if (event->key() == Qt::Key_Alt) {
+		menuBar()->setHidden(!menuBar()->isHidden());
+		menuBar()->setFocus();
+	}
+	QMainWindow::keyReleaseEvent(event);
+}
+
 void MainWindow::show_session_error(
 	const QString text, const QString info_text)
 {
@@ -632,6 +755,11 @@ void MainWindow::on_actionSaveAs_triggered()
 	export_file(device_manager_.context()->output_formats()["srzip"]);
 }
 
+void MainWindow::on_actionSaveSelectionAs_triggered()
+{
+	export_file(device_manager_.context()->output_formats()["srzip"], true);
+}
+
 void MainWindow::on_actionConnect_triggered()
 {
 	// Stop any currently running capture session
@@ -664,7 +792,7 @@ void MainWindow::on_actionViewZoomOut_triggered()
 
 void MainWindow::on_actionViewZoomFit_triggered()
 {
-	view_->zoom_fit();
+	view_->zoom_fit(action_view_zoom_fit_->isChecked());
 }
 
 void MainWindow::on_actionViewZoomOneToOne_triggered()
@@ -672,12 +800,21 @@ void MainWindow::on_actionViewZoomOneToOne_triggered()
 	view_->zoom_one_to_one();
 }
 
+void MainWindow::on_actionViewStickyScrolling_triggered()
+{
+	view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+}
+
+void MainWindow::on_actionViewColouredBg_triggered()
+{
+}
+
 void MainWindow::on_actionViewShowCursors_triggered()
 {
 	assert(view_);
 
 	const bool show = !view_->cursors_shown();
-	if(show)
+	if (show)
 		view_->centre_cursors();
 
 	view_->show_cursors(show);
@@ -689,6 +826,16 @@ void MainWindow::on_actionAbout_triggered()
 	dlg.exec();
 }
 
+void MainWindow::sticky_scrolling_changed(bool state)
+{
+	action_view_sticky_scrolling_->setChecked(state);
+}
+
+void MainWindow::always_zoom_to_fit_changed(bool state)
+{
+	action_view_zoom_fit_->setChecked(state);
+}
+
 void MainWindow::add_decoder(srd_decoder *decoder)
 {
 #ifdef ENABLE_DECODE