X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=c3f8fdb8bad914e19fd010a153fb1294c6b67df0;hp=d7b1aa4411597145fb2c0cb794bb37a5d151297b;hb=61501398c32a261d87430337536f04dea174698a;hpb=69282fae92bb22fd72e1b401b5bcf6ad0784d8e7

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index d7b1aa44..c3f8fdb8 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"
@@ -100,6 +102,7 @@ MainWindow::MainWindow(DeviceManager &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)),
@@ -131,6 +134,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_;
@@ -259,8 +267,10 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
 		options = dlg.options();
 	}
 
+	const std::pair<uint64_t, uint64_t> sample_range = std::make_pair(0, 0);
+
 	StoreProgress *dlg = new StoreProgress(file_name, format, options,
-		session_, this);
+		sample_range, session_, this);
 	dlg->run();
 }
 
@@ -347,6 +357,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,
@@ -623,7 +640,6 @@ void MainWindow::load_file(QString file_name,
 {
 	const QString errorMessage(
 		QString("Failed to load file %1").arg(file_name));
-	const QString infoMessage;
 
 	try {
 		if (format)
@@ -646,10 +662,79 @@ 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::save_selection_to_file()
+{
+	// Stop any currently running capture session
+	session_.stop_capture();
+
+	// Verify that the cursors are active and fetch their values
+	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;
+
+	const std::pair<uint64_t, uint64_t> sample_range =
+			std::make_pair(start_sample, end_sample);
+
+	// Ask for output file name
+	QSettings settings;
+	const QString dir = settings.value(SettingSaveDirectory).toString();
+
+	shared_ptr<OutputFormat> format =
+			device_manager_.context()->output_formats()["srzip"];
+
+	const vector<string> exts = format->extensions();
+	QString filter = tr("%1 files ").arg(
+		QString::fromStdString(format->description()));
+
+	if (exts.empty())
+		filter += "(*.*)";
+	else
+		filter += QString("(*.%1);;%2 (*.*)").arg(
+			QString::fromStdString(join(exts, ", *."))).arg(
+			tr("All Files"));
+
+	const QString file_name = QFileDialog::getSaveFileName(
+		this, tr("Save File"), dir, filter);
+
+	if (file_name.isEmpty())
+		return;
+
+	const QString abs_path = QFileInfo(file_name).absolutePath();
+	settings.setValue(SettingSaveDirectory, abs_path);
+
+	// Show the options dialog
+	map<string, Glib::VariantBase> options;
+	if (!format->options().empty()) {
+		dialogs::InputOutputOptions dlg(
+			tr("Export %1").arg(QString::fromStdString(
+				format->description())),
+			format->options(), this);
+		if (!dlg.exec())
+			return;
+		options = dlg.options();
+	}
+
+	// Save
+	pv::dialogs::StoreProgress *dlg = new pv::dialogs::StoreProgress(file_name,
+		format,	options, sample_range, session_, this);
+	dlg->run();
+}
+
 void MainWindow::closeEvent(QCloseEvent *event)
 {
 	save_ui_settings();
@@ -700,6 +785,11 @@ void MainWindow::on_actionSaveAs_triggered()
 	export_file(device_manager_.context()->output_formats()["srzip"]);
 }
 
+void MainWindow::on_actionSaveSelectionAs_triggered()
+{
+	save_selection_to_file();
+}
+
 void MainWindow::on_actionConnect_triggered()
 {
 	// Stop any currently running capture session