X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=37b7bfcd3854792a40e639e8b5c8ab9a05baa05e;hp=150c2fccfa348d9ba9aac48f73016abe2b4c5d96;hb=0bce86095e332bedff9643e3dfbe409259e2df5f;hpb=4166ed6c6648d1ed82cc48787aa717772a1e103f diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 150c2fcc..37b7bfcd 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,11 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef ENABLE_SIGROKDECODE -#include -#endif +#include #include +#include #include #include @@ -36,10 +35,14 @@ #include #include "mainwindow.h" + +#include "devicemanager.h" #include "dialogs/about.h" #include "dialogs/connect.h" #include "toolbars/samplingbar.h" +#include "view/logicsignal.h" #include "view/view.h" +#include "widgets/decodermenu.h" /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ #define __STDC_FORMAT_MACROS @@ -49,12 +52,21 @@ #include #include +using namespace boost; +using namespace std; namespace pv { -MainWindow::MainWindow(const char *open_file_name, +namespace view { +class SelectableItem; +} + +MainWindow::MainWindow(DeviceManager &device_manager, + const char *open_file_name, QWidget *parent) : - QMainWindow(parent) + QMainWindow(parent), + _device_manager(device_manager), + _session(device_manager) { setup_ui(); if (open_file_name) { @@ -85,6 +97,7 @@ void MainWindow::setup_ui() setCentralWidget(_central_widget); _view = new pv::view::View(_session, this); + _vertical_layout->addWidget(_view); // Setup the menu bar @@ -159,6 +172,19 @@ void MainWindow::setup_ui() "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8)); _menu_view->addAction(_action_view_show_cursors); + // Decoders Menu + _menu_decoders = new QMenu(_menu_bar); + _menu_decoders->setTitle(QApplication::translate( + "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8)); + + _menu_decoders_add = new pv::widgets::DecoderMenu(_menu_decoders); + _menu_decoders_add->setTitle(QApplication::translate( + "MainWindow", "&Add", 0, QApplication::UnicodeUTF8)); + connect(_menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), + this, SLOT(add_decoder(srd_decoder*))); + + _menu_decoders->addMenu(_menu_decoders_add); + // Help Menu _menu_help = new QMenu(_menu_bar); _menu_help->setTitle(QApplication::translate( @@ -172,25 +198,31 @@ void MainWindow::setup_ui() _menu_bar->addAction(_menu_file->menuAction()); _menu_bar->addAction(_menu_view->menuAction()); + _menu_bar->addAction(_menu_decoders->menuAction()); _menu_bar->addAction(_menu_help->menuAction()); 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 toolbars::SamplingBar(this); - scan_devices(); + // Setup the sampling bar + _sampling_bar = new toolbars::SamplingBar(_session, this); + + // Populate the device list and select the initially selected device + update_device_list(); + connect(_sampling_bar, SIGNAL(run_stop()), this, SLOT(run_stop())); addToolBar(_sampling_bar); + // Set the title setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0, QApplication::UnicodeUTF8)); @@ -200,23 +232,6 @@ 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) { @@ -225,6 +240,30 @@ void MainWindow::session_error( Q_ARG(QString, info_text)); } +void MainWindow::update_device_list(struct sr_dev_inst *selected_device) +{ + assert(_sampling_bar); + + 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) { const QString errorMessage( @@ -248,26 +287,30 @@ void MainWindow::show_session_error( void MainWindow::on_actionOpen_triggered() { + // Enumerate the file formats + QString filters(tr("Sigrok Sessions (*.sr)")); + filters.append(tr(";;All Files (*.*)")); + + // Show the dialog const QString file_name = QFileDialog::getOpenFileName( - this, tr("Open File"), "", - tr("Sigrok Sessions (*.sr)")); - load_file(file_name); + this, tr("Open File"), "", filters); + if (!file_name.isEmpty()) + load_file(file_name); } void MainWindow::on_actionConnect_triggered() { - dialogs::Connect dlg(this); - if (!dlg.exec()) - return; + // Stop any currently running capture session + _session.stop_capture(); - struct sr_dev_inst *const sdi = dlg.get_selected_device(); - if (sdi) { - assert(_sampling_bar); + dialogs::Connect dlg(this, _device_manager); - _devices.push_back(sdi); - _sampling_bar->set_device_list(_devices); - _sampling_bar->set_selected_device(sdi); - } + // If the user selected a device, select it in the device list. Select the + // current device otherwise. + struct sr_dev_inst *const sdi = dlg.exec() ? + dlg.get_selected_device() : _session.get_device(); + + update_device_list(sdi); } void MainWindow::on_actionQuit_triggered() @@ -302,17 +345,22 @@ void MainWindow::on_actionAbout_triggered() dlg.exec(); } +void MainWindow::add_decoder(srd_decoder *decoder) +{ + assert(decoder); + _session.add_decoder(decoder); +} + 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::AwaitingTrigger: case SigSession::Running: _session.stop_capture(); break; @@ -321,7 +369,7 @@ void MainWindow::run_stop() void MainWindow::capture_state_changed(int state) { - _sampling_bar->set_sampling(state != SigSession::Stopped); + _sampling_bar->set_capture_state((pv::SigSession::capture_state)state); } } // namespace pv