X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=66bed74896ae4f8edf7e3327999dd6b0f6de97bb;hp=82087ee080164f28cdfc9b3273ba2049d11dfe95;hb=140181a46034cf65739ba4bf0bf1260ab94ac736;hpb=9663c82b7fa8ec54ece3045b41bbc4a53db8bb0b

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 82087ee0..66bed748 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,12 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_SIGROKDECODE
 #include <sigrokdecode.h>
+#endif
+
+#include <boost/bind.hpp>
 
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QMenu>
 #include <QMenuBar>
 #include <QStatusBar>
@@ -31,9 +36,9 @@
 #include <QWidget>
 
 #include "mainwindow.h"
-#include "samplingbar.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "toolbars/samplingbar.h"
 #include "view/view.h"
 
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@ -115,6 +120,7 @@ void MainWindow::setup_ui()
 		"MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
 	_action_quit->setIcon(QIcon::fromTheme("application-exit",
 		QIcon(":/icons/application-exit.png")));
+	_action_quit->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
 	_action_quit->setObjectName(QString::fromUtf8("actionQuit"));
 	_menu_file->addAction(_action_quit);
 
@@ -178,7 +184,8 @@ void MainWindow::setup_ui()
 	_toolbar->addAction(_action_view_zoom_out);
 	addToolBar(_toolbar);
 
-	_sampling_bar = new SamplingBar(this);
+	_sampling_bar = new toolbars::SamplingBar(this);
+	scan_devices();
 	connect(_sampling_bar, SIGNAL(run_stop()), this,
 		SLOT(run_stop()));
 	addToolBar(_sampling_bar);
@@ -192,9 +199,50 @@ void MainWindow::setup_ui()
 
 }
 
+void MainWindow::scan_devices()
+{
+	_devices.clear();
+
+	/* Scan all drivers for all devices. */
+	struct sr_dev_driver **const drivers = sr_driver_list();
+	for (struct sr_dev_driver **driver = drivers; *driver; driver++) {
+		GSList *const devices = sr_driver_scan(*driver, NULL);
+		for (GSList *l = devices; l; l = l->next)
+			_devices.push_back((sr_dev_inst*)l->data);
+		g_slist_free(devices);
+	}
+
+	assert(_sampling_bar);
+	_sampling_bar->set_device_list(_devices);
+}
+
+void MainWindow::session_error(
+	const QString text, const QString info_text)
+{
+	QMetaObject::invokeMethod(this, "show_session_error",
+		Qt::QueuedConnection, Q_ARG(QString, text),
+		Q_ARG(QString, info_text));
+}
+
 void MainWindow::load_file(QString file_name)
 {
-	_session.load_file(file_name.toStdString());
+	const QString errorMessage(
+		QString("Failed to load file %1").arg(file_name));
+	const QString infoMessage;
+	_session.load_file(file_name.toStdString(),
+		boost::bind(&MainWindow::session_error, this,
+			errorMessage, infoMessage));
+}
+
+void MainWindow::show_session_error(
+	const QString text, const QString info_text)
+{
+	QMessageBox msg(this);
+	msg.setText(text);
+	msg.setInformativeText(info_text);
+	msg.setStandardButtons(QMessageBox::Ok);
+	msg.setIcon(QMessageBox::Warning);
+	msg.exec();
 }
 
 void MainWindow::on_actionOpen_triggered()
@@ -208,7 +256,17 @@ void MainWindow::on_actionOpen_triggered()
 void MainWindow::on_actionConnect_triggered()
 {
 	dialogs::Connect dlg(this);
-	dlg.exec();
+	if (!dlg.exec())
+		return;
+
+	struct sr_dev_inst *const sdi = dlg.get_selected_device();
+	if (sdi) {
+		assert(_sampling_bar);
+
+		_devices.push_back(sdi);
+		_sampling_bar->set_device_list(_devices);
+		_sampling_bar->set_selected_device(sdi);
+	}
 }
 
 void MainWindow::on_actionQuit_triggered()
@@ -244,7 +302,9 @@ void MainWindow::run_stop()
 	case SigSession::Stopped:
 		_session.start_capture(
 			_sampling_bar->get_selected_device(),
-			_sampling_bar->get_record_length());
+			_sampling_bar->get_record_length(),
+			boost::bind(&MainWindow::session_error, this,
+				QString("Capture failed"), _1));
 		break;
 
 	case SigSession::Running: