X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=66bed74896ae4f8edf7e3327999dd6b0f6de97bb;hp=062f4bd767d595f37b1da95486df7b67452aa531;hb=d52d8455db515a779b4451c223ba7aaded70951a;hpb=4f04b82aaa829fca0198380bb430f7b906f5c9f4 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 062f4bd7..66bed748 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,14 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern "C" { +#ifdef ENABLE_SIGROKDECODE #include -} +#endif + +#include #include #include #include #include +#include #include #include #include @@ -33,11 +36,11 @@ extern "C" { #include #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 @@ -45,14 +48,21 @@ extern "C" { #include #include #include -} + 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() @@ -77,44 +87,86 @@ void MainWindow::setup_ui() _view = new pv::view::View(_session, this); _vertical_layout->addWidget(_view); - // Setup the UI actions - _action_about = new QAction(this); - _action_about->setObjectName(QString::fromUtf8("actionAbout")); - - _action_view_zoom_in = new QAction(this); - _action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in", - QIcon(":/icons/zoom-in.png"))); - _action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn")); - - _action_view_zoom_out = new QAction(this); - _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out", - QIcon(":/icons/zoom-out.png"))); - _action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut")); + // Setup the menu bar + _menu_bar = new QMenuBar(this); + _menu_bar->setGeometry(QRect(0, 0, 400, 25)); - _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->setObjectName(QString::fromUtf8("actionViewShowCursors")); + // File Menu + _menu_file = new QMenu(_menu_bar); + _menu_file->setTitle(QApplication::translate( + "MainWindow", "&File", 0, QApplication::UnicodeUTF8)); _action_open = new QAction(this); + _action_open->setText(QApplication::translate( + "MainWindow", "&Open...", 0, QApplication::UnicodeUTF8)); _action_open->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/document-open.png"))); _action_open->setObjectName(QString::fromUtf8("actionOpen")); + _menu_file->addAction(_action_open); - // Setup the menu bar - _menu_bar = new QMenuBar(this); - _menu_bar->setGeometry(QRect(0, 0, 400, 25)); + _menu_file->addSeparator(); - _menu_file = new QMenu(_menu_bar); - _menu_file->addAction(_action_open); + _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); + + // View Menu _menu_view = new QMenu(_menu_bar); + _menu_view->setTitle(QApplication::translate( + "MainWindow", "&View", 0, QApplication::UnicodeUTF8)); + + _action_view_zoom_in = new QAction(this); + _action_view_zoom_in->setText(QApplication::translate( + "MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8)); + _action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in", + QIcon(":/icons/zoom-in.png"))); + _action_view_zoom_in->setObjectName( + QString::fromUtf8("actionViewZoomIn")); _menu_view->addAction(_action_view_zoom_in); + + _action_view_zoom_out = new QAction(this); + _action_view_zoom_out->setText(QApplication::translate( + "MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8)); + _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out", + QIcon(":/icons/zoom-out.png"))); + _action_view_zoom_out->setObjectName( + QString::fromUtf8("actionViewZoomOut")); _menu_view->addAction(_action_view_zoom_out); + _menu_view->addSeparator(); + + _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->setObjectName( + QString::fromUtf8("actionViewShowCursors")); + _action_view_show_cursors->setText(QApplication::translate( + "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8)); _menu_view->addAction(_action_view_show_cursors); + // Help Menu _menu_help = new QMenu(_menu_bar); + _menu_help->setTitle(QApplication::translate( + "MainWindow", "&Help", 0, QApplication::UnicodeUTF8)); + + _action_about = new QAction(this); + _action_about->setObjectName(QString::fromUtf8("actionAbout")); + _action_about->setText(QApplication::translate( + "MainWindow", "&About...", 0, QApplication::UnicodeUTF8)); _menu_help->addAction(_action_about); _menu_bar->addAction(_menu_file->menuAction()); @@ -132,7 +184,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); @@ -140,28 +193,85 @@ void MainWindow::setup_ui() setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0, QApplication::UnicodeUTF8)); - _action_open->setText(QApplication::translate("MainWindow", "&Open...", 0, QApplication::UnicodeUTF8)); - _action_view_zoom_in->setText(QApplication::translate("MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8)); - _action_view_zoom_out->setText(QApplication::translate("MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8)); - _action_view_show_cursors->setText(QApplication::translate("MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8)); - _action_about->setText(QApplication::translate("MainWindow", "&About...", 0, QApplication::UnicodeUTF8)); - - _menu_file->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8)); - _menu_view->setTitle(QApplication::translate("MainWindow", "&View", 0, QApplication::UnicodeUTF8)); - _menu_help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8)); - // Setup _session events connect(&_session, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int))); } +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() +{ + close(); } void MainWindow::on_actionViewZoomIn_triggered() @@ -193,7 +303,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: