X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=c9fa4c1a25fc749a9d47804ea369b8c9ff3e1ad1;hp=d8083b5f636ce14ce9d90a7ebfcc5aeb718ec9b6;hb=18203d86e200131f50e9830c4f16a9edba96d669;hpb=acda14b82957d9a848a5083df6f9b98d05c29fba diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index d8083b5f..c9fa4c1a 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern "C" { #include -} #include #include @@ -35,9 +33,9 @@ extern "C" { #include "mainwindow.h" #include "samplingbar.h" #include "dialogs/about.h" -#include "pv/view/view.h" +#include "dialogs/connect.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 +43,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,41 +82,85 @@ 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")); - _action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn")); - - _action_view_zoom_out = new QAction(this); - _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out")); - _action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut")); - - _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_open = new QAction(this); - _action_open->setIcon(QIcon::fromTheme("document-open")); - _action_open->setObjectName(QString::fromUtf8("actionOpen")); - // Setup the menu bar _menu_bar = new QMenuBar(this); _menu_bar->setGeometry(QRect(0, 0, 400, 25)); + // 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); + _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->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()); @@ -130,39 +179,59 @@ void MainWindow::setup_ui() addToolBar(_toolbar); _sampling_bar = new SamplingBar(this); + scan_devices(); connect(_sampling_bar, SIGNAL(run_stop()), this, SLOT(run_stop())); addToolBar(_sampling_bar); - // Setup the status bar - _status_bar = new QStatusBar(this); - setStatusBar(_status_bar); - 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::load_file(QString file_name) +{ + _session.load_file(file_name.toStdString()); +} + 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); + dlg.exec(); +} + +void MainWindow::on_actionQuit_triggered() +{ + close(); } void MainWindow::on_actionViewZoomIn_triggered() @@ -193,8 +262,7 @@ void MainWindow::run_stop() case SigSession::Stopped: _session.start_capture( _sampling_bar->get_selected_device(), - _sampling_bar->get_record_length(), - _sampling_bar->get_sample_rate()); + _sampling_bar->get_record_length()); break; case SigSession::Running: