X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=e48df546613a308b9e1374df3ea197be56fc71c5;hb=ed43ef2e59baab85aa0381b08db101b7800e5c64;hp=b7a0818b62ab5c7a28e88fecdfc0b1938133d73a;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index b7a0818..e48df54 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -46,6 +46,7 @@
 
 #include "devicemanager.hpp"
 #include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
 #include "devices/sessionfile.hpp"
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
@@ -55,6 +56,7 @@
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #include "widgets/exportmenu.hpp"
+#include "widgets/importmenu.hpp"
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
@@ -76,6 +78,7 @@ using boost::algorithm::join;
 
 using sigrok::Error;
 using sigrok::OutputFormat;
+using sigrok::InputFormat;
 
 namespace pv {
 
@@ -251,6 +254,34 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
 	dlg->run();
 }
 
+void MainWindow::import_file(shared_ptr<InputFormat> format)
+{
+	assert(format);
+
+	QSettings settings;
+	const QString dir = settings.value(SettingOpenDirectory).toString();
+
+	// Construct the filter
+	const vector<string> exts = format->extensions();
+	const QString filter = exts.empty() ? "" :
+		tr("%1 files (*.%2)").arg(
+			QString::fromStdString(format->description())).arg(
+			QString::fromStdString(join(exts, ", *.")));
+
+	// Show the file dialog
+	const QString file_name = QFileDialog::getOpenFileName(
+		this, tr("Import File"), dir, tr(
+			"%1 files (*.*);;All Files (*.*)").arg(
+			QString::fromStdString(format->description())));
+
+	if (!file_name.isEmpty()) {
+		load_file(file_name, format);
+
+		const QString abs_path = QFileInfo(file_name).absolutePath();
+		settings.setValue(SettingOpenDirectory, abs_path);
+	}
+}
+
 void MainWindow::setup_ui()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
@@ -303,6 +334,14 @@ void MainWindow::setup_ui()
 		this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
 	menu_file->addAction(menu_file_export->menuAction());
 
+	widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this,
+		device_manager_.context());
+	menu_file_import->setTitle(tr("&Import"));
+	connect(menu_file_import,
+		SIGNAL(format_selected(std::shared_ptr<sigrok::InputFormat>)),
+		this, SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
+	menu_file->addAction(menu_file_import->menuAction());
+
 	menu_file->addSeparator();
 
 	action_connect_->setText(tr("&Connect to Device..."));
@@ -525,17 +564,26 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
 	QMainWindow::keyReleaseEvent(event);
 }
 
-void MainWindow::load_file(QString file_name)
+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 {
-		session_.set_device(
-			shared_ptr<devices::Device>(new devices::SessionFile(
-				device_manager_.context(),
-				file_name.toStdString())));
+		if (format)
+			session_.set_device(shared_ptr<devices::Device>(
+				new devices::InputFile(
+					device_manager_.context(),
+					file_name.toStdString(),
+					format, options)));
+		else
+			session_.set_device(shared_ptr<devices::Device>(
+				new devices::SessionFile(
+					device_manager_.context(),
+					file_name.toStdString())));
 	} catch(Error e) {
 		show_session_error(tr("Failed to load ") + file_name, e.what());
 		session_.set_default_device();
@@ -663,7 +711,7 @@ void MainWindow::device_selected()
 	if (!device)
 		return;
 
-	const string display_name = device_manager_.get_display_name(device);
+	const string display_name = device->display_name(device_manager_);
 	setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
 }