X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=f95cd45123eb1345f56a65160ed7b6268d3b7d18;hb=92b139d0889951e1bb90ee0803bdc6999fdf48b0;hp=c9fa4c1a25fc749a9d47804ea369b8c9ff3e1ad1;hpb=18203d86e200131f50e9830c4f16a9edba96d669;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index c9fa4c1..f95cd45 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);
 
@@ -146,6 +152,7 @@ void MainWindow::setup_ui()
 	_action_view_show_cursors = new QAction(this);
 	_action_view_show_cursors->setCheckable(true);
 	_action_view_show_cursors->setChecked(_view->cursors_shown());
+	_action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C));
 	_action_view_show_cursors->setObjectName(
 		QString::fromUtf8("actionViewShowCursors"));
 	_action_view_show_cursors->setText(QApplication::translate(
@@ -178,7 +185,7 @@ 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()));
@@ -210,9 +217,33 @@ void MainWindow::scan_devices()
 	_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()
@@ -220,13 +251,24 @@ void MainWindow::on_actionOpen_triggered()
 	const QString file_name = QFileDialog::getOpenFileName(
 		this, tr("Open File"), "",
 		tr("Sigrok Sessions (*.sr)"));
-	load_file(file_name);
+	if (!file_name.isEmpty())
+		load_file(file_name);
 }
 
 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()
@@ -247,7 +289,12 @@ void MainWindow::on_actionViewZoomOut_triggered()
 void MainWindow::on_actionViewShowCursors_triggered()
 {
 	assert(_view);
-	_view->show_cursors(_action_view_show_cursors->isChecked());
+
+	const bool show = !_view->cursors_shown();
+	if(show)
+		_view->centre_cursors();
+
+	_view->show_cursors(show);
 }
 
 void MainWindow::on_actionAbout_triggered()
@@ -260,9 +307,10 @@ void MainWindow::run_stop()
 {
 	switch(_session.get_capture_state()) {
 	case SigSession::Stopped:
-		_session.start_capture(
-			_sampling_bar->get_selected_device(),
-			_sampling_bar->get_record_length());
+		_session.set_device(_sampling_bar->get_selected_device());
+		_session.start_capture(_sampling_bar->get_record_length(),
+			boost::bind(&MainWindow::session_error, this,
+				QString("Capture failed"), _1));
 		break;
 
 	case SigSession::Running: