Ported pv::prop::binding::DeviceOptions to GVariants

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 35b0da57b3c9d87c14396d50bff73c495976162f..3aeb1227edcc1fb00247767002ee3087bb78494a 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,14 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h>
-}
+
+#include <boost/bind.hpp>
 
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QMenu>
 #include <QMenuBar>
 #include <QStatusBar>
@@ -33,11 +34,11 @@ extern "C" {
 #include <QWidget>
 
 #include "mainwindow.h"
-#include "samplingbar.h"
 #include "dialogs/about.h"
+#include "dialogs/connect.h"
+#include "toolbars/samplingbar.h"
 #include "view/view.h"
 
-extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
@@ -45,14 +46,21 @@ extern "C" {
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
-}
+
 
 namespace pv {
 
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const char *open_file_name,
+       QWidget *parent) :
        QMainWindow(parent)
 {
        setup_ui();
+       if (open_file_name) {
+               const QString s(QString::fromUtf8(open_file_name));
+               QMetaObject::invokeMethod(this, "load_file",
+                       Qt::QueuedConnection,
+                       Q_ARG(QString, s));
+       }
 }
 
 void MainWindow::setup_ui()
@@ -96,11 +104,21 @@ void MainWindow::setup_ui()
 
        _menu_file->addSeparator();
 
+       _action_connect = new QAction(this);
+       _action_connect->setText(QApplication::translate(
+               "MainWindow", "&Connect to Device...", 0,
+               QApplication::UnicodeUTF8));
+       _action_connect->setObjectName(QString::fromUtf8("actionConnect"));
+       _menu_file->addAction(_action_connect);
+
+       _menu_file->addSeparator();
+
        _action_quit = new QAction(this);
        _action_quit->setText(QApplication::translate(
                "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);
 
@@ -164,7 +182,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);
@@ -178,12 +197,74 @@ 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)
+{
+       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()
 {
-       QString file_name = QFileDialog::getOpenFileName(
+       const QString file_name = QFileDialog::getOpenFileName(
                this, tr("Open File"), "",
                tr("Sigrok Sessions (*.sr)"));
-       _session.load_file(file_name.toStdString());
+       load_file(file_name);
+}
+
+void MainWindow::on_actionConnect_triggered()
+{
+       dialogs::Connect dlg(this);
+       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()
@@ -220,7 +301,8 @@ void MainWindow::run_stop()
                _session.start_capture(
                        _sampling_bar->get_selected_device(),
                        _sampling_bar->get_record_length(),
-                       _sampling_bar->get_sample_rate());
+                       boost::bind(&MainWindow::session_error, this,
+                               QString("Capture failed"), _1));
                break;
 
        case SigSession::Running: