X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=ca514bf97a703eba3e7a8bc56dbebd23467c439a;hp=da01858748a74704888a9d851b8fb270b0c9d5df;hb=363107a8c9f33d8aeebd9ee8d56f90af87c73ea2;hpb=793f8096c486d0fba871227d9772a510f7496c08 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index da018587..ca514bf9 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,12 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_SIGROKDECODE #include +#endif + +#include +#include #include #include #include #include +#include #include #include #include @@ -31,9 +37,11 @@ #include #include "mainwindow.h" -#include "samplingbar.h" + +#include "devicemanager.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++). */ @@ -44,12 +52,15 @@ #include #include +using namespace std; namespace pv { -MainWindow::MainWindow(const char *open_file_name, +MainWindow::MainWindow(DeviceManager &device_manager, + const char *open_file_name, QWidget *parent) : - QMainWindow(parent) + QMainWindow(parent), + _device_manager(device_manager) { setup_ui(); if (open_file_name) { @@ -115,6 +126,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 +158,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,20 +183,27 @@ void MainWindow::setup_ui() setMenuBar(_menu_bar); QMetaObject::connectSlotsByName(this); - // Setup the toolbars - _toolbar = new QToolBar(this); + // Setup the toolbar + _toolbar = new QToolBar(tr("Main Toolbar"), this); _toolbar->addAction(_action_open); _toolbar->addSeparator(); _toolbar->addAction(_action_view_zoom_in); _toolbar->addAction(_action_view_zoom_out); addToolBar(_toolbar); - _sampling_bar = new SamplingBar(this); - scan_devices(); + // Setup the sampling bar + _sampling_bar = new toolbars::SamplingBar(this); + + // Populate the device list and select the initially selected device + update_device_list(); + + 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)); @@ -193,26 +213,57 @@ void MainWindow::setup_ui() } -void MainWindow::scan_devices() +void MainWindow::session_error( + const QString text, const QString info_text) { - _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); - } + QMetaObject::invokeMethod(this, "show_session_error", + Qt::QueuedConnection, Q_ARG(QString, text), + Q_ARG(QString, info_text)); +} +void MainWindow::update_device_list(struct sr_dev_inst *selected_device) +{ assert(_sampling_bar); - _sampling_bar->set_device_list(_devices); + + const list &devices = _device_manager.devices(); + _sampling_bar->set_device_list(devices); + + if (!selected_device && !devices.empty()) { + // Fall back to the first device in the list. + selected_device = devices.front(); + + // Try and find the demo device and select that by default + BOOST_FOREACH (struct sr_dev_inst *sdi, devices) + if (strcmp(sdi->driver->name, "demo") == 0) { + selected_device = sdi; + } + } + + if (selected_device) { + _sampling_bar->set_selected_device(selected_device); + _session.set_device(selected_device); + } } 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,23 +271,18 @@ 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); + dialogs::Connect dlg(this, _device_manager); 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); - } + update_device_list(sdi); } void MainWindow::on_actionQuit_triggered() @@ -257,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() @@ -266,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: