X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=eb567af8dfe077d4954ffe6613333e7bb2f61da2;hb=859ca3070b30afde85ac345e8761ebf3b10017b1;hp=f907f09cce33f118b0c830dbc0ee564f50a76501;hpb=19be0af16af83ca10f7ce69cb64f0b0c6f6a0d81;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index f907f09..eb567af 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -45,6 +45,9 @@
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
+#include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
+#include "devices/sessionfile.hpp"
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
 #include "dialogs/inputoutputoptions.hpp"
@@ -53,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
@@ -72,10 +76,9 @@ using std::vector;
 
 using boost::algorithm::join;
 
-using sigrok::Device;
 using sigrok::Error;
-using sigrok::HardwareDevice;
 using sigrok::OutputFormat;
+using sigrok::InputFormat;
 
 namespace pv {
 
@@ -188,10 +191,13 @@ void MainWindow::run_stop()
 	}
 }
 
-void MainWindow::select_device(shared_ptr<Device> device)
+void MainWindow::select_device(shared_ptr<devices::Device> device)
 {
 	try {
-		session_.set_device(device);
+		if (device)
+			session_.set_device(device);
+		else
+			session_.set_default_device();
 	} catch(const QString &e) {
 		QMessageBox msg(this);
 		msg.setText(e);
@@ -251,6 +257,47 @@ 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())
+		return;
+
+	// 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()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
@@ -303,6 +350,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..."));
@@ -455,11 +510,8 @@ void MainWindow::restore_ui_settings()
 {
 	QSettings settings;
 
-	shared_ptr<HardwareDevice> device;
-
 	map<string, string> dev_info;
 	list<string> key_list;
-	string value;
 
 	settings.beginGroup("MainWindow");
 
@@ -480,21 +532,19 @@ void MainWindow::restore_ui_settings()
 	key_list.push_back("connection_id");
 
 	for (string key : key_list) {
-		if (!settings.contains(QString::fromUtf8(key.c_str())))
+		const QString k = QString::fromStdString(key);
+		if (!settings.contains(k))
 			continue;
 
-		value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-		if (value.size() > 0)
+		const string value = settings.value(k).toString().toStdString();
+		if (!value.empty())
 			dev_info.insert(std::make_pair(key, value));
 	}
 
-	device = device_manager_.find_device_from_info(dev_info);
-
-	if (device) {
-		select_device(device);
-		update_device_list();
-	}
+	const shared_ptr<devices::HardwareDevice> device =
+		device_manager_.find_device_from_info(dev_info);
+	select_device(device);
+	update_device_list();
 
 	settings.endGroup();
 }
@@ -527,14 +577,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_session_file(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();
@@ -658,11 +720,11 @@ void MainWindow::capture_state_changed(int state)
 void MainWindow::device_selected()
 {
 	// Set the title to include the device/file name
-	const shared_ptr<sigrok::Device> device = session_.device();
+	const shared_ptr<devices::Device> device = session_.device();
 	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()));
 }