Added missing virtual destructors

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index c9fa4c1a25fc749a9d47804ea369b8c9ff3e1ad1..bd2f5fea99a112fcfa94e848b39cbe5e12d5a73a 100644 (file)
--- 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(
@@ -170,7 +177,7 @@ void MainWindow::setup_ui()
        setMenuBar(_menu_bar);
        QMetaObject::connectSlotsByName(this);
 
-       // Setup the toolbars
+       // Setup the toolbar
        _toolbar = new QToolBar(this);
        _toolbar->addAction(_action_open);
        _toolbar->addSeparator();
@@ -178,12 +185,24 @@ void MainWindow::setup_ui()
        _toolbar->addAction(_action_view_zoom_out);
        addToolBar(_toolbar);
 
-       _sampling_bar = new SamplingBar(this);
+       // Setup the sampling bar
+       _sampling_bar = new toolbars::SamplingBar(this);
+
+       // Populate the device list and select the initially selected device
        scan_devices();
+       if(!_devices.empty()) {
+               struct sr_dev_inst *const initial_sdi = _devices.front();
+               _sampling_bar->set_selected_device(initial_sdi);
+               _session.set_device(initial_sdi);
+       }
+
+       connect(_sampling_bar, SIGNAL(device_selected()), this,
+               SLOT(device_selected()));
        connect(_sampling_bar, SIGNAL(run_stop()), this,
                SLOT(run_stop()));
        addToolBar(_sampling_bar);
 
+       // Set the title
        setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
                QApplication::UnicodeUTF8));
 
@@ -210,9 +229,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 +263,26 @@ 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);
+
+               _session.set_device(sdi);
+       }
 }
 
 void MainWindow::on_actionQuit_triggered()
@@ -247,7 +303,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()
@@ -256,13 +317,18 @@ void MainWindow::on_actionAbout_triggered()
        dlg.exec();
 }
 
+void MainWindow::device_selected()
+{
+       _session.set_device(_sampling_bar->get_selected_device());
+}
+
 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.start_capture(_sampling_bar->get_record_length(),
+                       boost::bind(&MainWindow::session_error, this,
+                               QString("Capture failed"), _1));
                break;
 
        case SigSession::Running: