X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=0089b112a721f1585a9813134328cfd30c360ccb;hp=183e841e804c3c6f48d37949268ec3227a0c70be;hb=e95e8563a1de0d2045cb8f30083889896b6c94df;hpb=3045c869ada2e32bf55cbb68633b5213b9b11e28 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 183e841e..0089b112 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,11 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE #include +#endif #include #include +#include +#include + #include #include #include @@ -37,12 +42,16 @@ #include "mainwindow.h" #include "devicemanager.h" +#include "device/device.h" #include "dialogs/about.h" #include "dialogs/connect.h" -#include "dialogs/decoder.h" +#include "dialogs/storeprogress.h" #include "toolbars/samplingbar.h" #include "view/logicsignal.h" #include "view/view.h" +#ifdef ENABLE_DECODE +#include "widgets/decodermenu.h" +#endif /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ #define __STDC_FORMAT_MACROS @@ -52,8 +61,8 @@ #include #include -using namespace boost; -using namespace std; +using boost::shared_ptr; +using std::list; namespace pv { @@ -66,8 +75,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) : QMainWindow(parent), _device_manager(device_manager), - _session(device_manager), - _decoders_add_mapper(this) + _session(device_manager) { setup_ui(); if (open_file_name) { @@ -102,117 +110,154 @@ void MainWindow::setup_ui() _vertical_layout->addWidget(_view); // Setup the menu bar - _menu_bar = new QMenuBar(this); - _menu_bar->setGeometry(QRect(0, 0, 400, 25)); + QMenuBar *const 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( + QMenu *const menu_file = new QMenu; + menu_file->setTitle(QApplication::translate( "MainWindow", "&File", 0, QApplication::UnicodeUTF8)); - _action_open = new QAction(this); - _action_open->setText(QApplication::translate( + QAction *const action_open = new QAction(this); + action_open->setText(QApplication::translate( "MainWindow", "&Open...", 0, QApplication::UnicodeUTF8)); - _action_open->setIcon(QIcon::fromTheme("document-open", + action_open->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/document-open.png"))); - _action_open->setObjectName(QString::fromUtf8("actionOpen")); - _menu_file->addAction(_action_open); + action_open->setObjectName(QString::fromUtf8("actionOpen")); + menu_file->addAction(action_open); + + QAction *const action_save_as = new QAction(this); + action_save_as->setText(QApplication::translate( + "MainWindow", "&Save As...", 0, QApplication::UnicodeUTF8)); + action_save_as->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + action_save_as->setObjectName(QString::fromUtf8("actionSaveAs")); + menu_file->addAction(action_save_as); - _menu_file->addSeparator(); + menu_file->addSeparator(); - _action_connect = new QAction(this); - _action_connect->setText(QApplication::translate( + QAction *const 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); + action_connect->setObjectName(QString::fromUtf8("actionConnect")); + menu_file->addAction(action_connect); - _menu_file->addSeparator(); + menu_file->addSeparator(); - _action_quit = new QAction(this); - _action_quit->setText(QApplication::translate( + QAction *action_quit = new QAction(this); + action_quit->setText(QApplication::translate( "MainWindow", "&Quit", 0, QApplication::UnicodeUTF8)); - _action_quit->setIcon(QIcon::fromTheme("application-exit", + 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); + 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( + QMenu *menu_view = new QMenu; + menu_view->setTitle(QApplication::translate( "MainWindow", "&View", 0, QApplication::UnicodeUTF8)); - _action_view_zoom_in = new QAction(this); - _action_view_zoom_in->setText(QApplication::translate( + QAction *const 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", + action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in", QIcon(":/icons/zoom-in.png"))); - _action_view_zoom_in->setObjectName( + // simply using Qt::Key_Plus shows no + in the menu + action_view_zoom_in->setShortcut(QKeySequence::ZoomIn); + action_view_zoom_in->setObjectName( QString::fromUtf8("actionViewZoomIn")); - _menu_view->addAction(_action_view_zoom_in); + menu_view->addAction(action_view_zoom_in); - _action_view_zoom_out = new QAction(this); - _action_view_zoom_out->setText(QApplication::translate( + QAction *const 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", + action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out", QIcon(":/icons/zoom-out.png"))); - _action_view_zoom_out->setObjectName( + action_view_zoom_out->setShortcut(QKeySequence::ZoomOut); + 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->setShortcut(QKeySequence(Qt::Key_C)); - _action_view_show_cursors->setObjectName( + menu_view->addAction(action_view_zoom_out); + + QAction *const action_view_zoom_fit = new QAction(this); + action_view_zoom_fit->setText(QApplication::translate( + "MainWindow", "Zoom to &Fit", 0, QApplication::UnicodeUTF8)); + action_view_zoom_fit->setIcon(QIcon::fromTheme("zoom-fit", + QIcon(":/icons/zoom-fit.png"))); + action_view_zoom_fit->setShortcut(QKeySequence(Qt::Key_F)); + action_view_zoom_fit->setObjectName( + QString::fromUtf8("actionViewZoomFit")); + menu_view->addAction(action_view_zoom_fit); + + QAction *const action_view_zoom_one_to_one = new QAction(this); + action_view_zoom_one_to_one->setText(QApplication::translate( + "MainWindow", "Zoom to &One-to-One", 0, + QApplication::UnicodeUTF8)); + action_view_zoom_one_to_one->setIcon(QIcon::fromTheme("zoom-original", + QIcon(":/icons/zoom-original.png"))); + action_view_zoom_one_to_one->setShortcut(QKeySequence(Qt::Key_O)); + action_view_zoom_one_to_one->setObjectName( + QString::fromUtf8("actionViewZoomOneToOne")); + menu_view->addAction(action_view_zoom_one_to_one); + + menu_view->addSeparator(); + + QAction *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( + action_view_show_cursors->setText(QApplication::translate( "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8)); - _menu_view->addAction(_action_view_show_cursors); + menu_view->addAction(action_view_show_cursors); // Decoders Menu - _menu_decoders = new QMenu(_menu_bar); - _menu_decoders->setTitle(QApplication::translate( +#ifdef ENABLE_DECODE + QMenu *const menu_decoders = new QMenu; + menu_decoders->setTitle(QApplication::translate( "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8)); - _menu_decoders_add = new QMenu(_menu_decoders); - _menu_decoders_add->setTitle(QApplication::translate( + pv::widgets::DecoderMenu *const menu_decoders_add = + new pv::widgets::DecoderMenu(menu_decoders, true); + menu_decoders_add->setTitle(QApplication::translate( "MainWindow", "&Add", 0, QApplication::UnicodeUTF8)); - setup_add_decoders(_menu_decoders_add); + connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), + this, SLOT(add_decoder(srd_decoder*))); - _menu_decoders->addMenu(_menu_decoders_add); - connect(&_decoders_add_mapper, SIGNAL(mapped(QObject*)), - this, SLOT(add_decoder(QObject*))); + menu_decoders->addMenu(menu_decoders_add); +#endif // Help Menu - _menu_help = new QMenu(_menu_bar); - _menu_help->setTitle(QApplication::translate( + QMenu *const menu_help = new QMenu; + 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( + QAction *const 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_help->addAction(action_about); - _menu_bar->addAction(_menu_file->menuAction()); - _menu_bar->addAction(_menu_view->menuAction()); - _menu_bar->addAction(_menu_decoders->menuAction()); - _menu_bar->addAction(_menu_help->menuAction()); + menu_bar->addAction(menu_file->menuAction()); + menu_bar->addAction(menu_view->menuAction()); +#ifdef ENABLE_DECODE + menu_bar->addAction(menu_decoders->menuAction()); +#endif + menu_bar->addAction(menu_help->menuAction()); - setMenuBar(_menu_bar); + setMenuBar(menu_bar); QMetaObject::connectSlotsByName(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); + QToolBar *const 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); + toolbar->addAction(action_view_zoom_fit); + addToolBar(toolbar); // Setup the sampling bar _sampling_bar = new toolbars::SamplingBar(_session, this); @@ -242,28 +287,21 @@ void MainWindow::session_error( Q_ARG(QString, info_text)); } -void MainWindow::update_device_list(struct sr_dev_inst *selected_device) +void MainWindow::update_device_list() { 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(); + shared_ptr selected_device = _session.get_device(); + list< shared_ptr > devices; + std::copy(_device_manager.devices().begin(), + _device_manager.devices().end(), std::back_inserter(devices)); - // 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 (std::find(devices.begin(), devices.end(), selected_device) == + devices.end()) + devices.push_back(selected_device); + assert(selected_device); - if (selected_device) { - _sampling_bar->set_selected_device(selected_device); - _session.set_device(selected_device); - } + _sampling_bar->set_device_list(devices, selected_device); } void MainWindow::load_file(QString file_name) @@ -271,9 +309,20 @@ 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)); + + try { + _session.set_file(file_name.toStdString()); + } catch(QString e) { + show_session_error(tr("Failed to load ") + file_name, e); + _session.set_default_device(); + update_device_list(); + return; + } + + update_device_list(); + + _session.start_capture(boost::bind(&MainWindow::session_error, this, + errorMessage, infoMessage)); } void MainWindow::show_session_error( @@ -287,39 +336,33 @@ void MainWindow::show_session_error( msg.exec(); } -gint MainWindow::decoder_name_cmp(gconstpointer a, gconstpointer b) +void MainWindow::on_actionOpen_triggered() { - return strcmp(((const srd_decoder*)a)->name, - ((const srd_decoder*)b)->name); + // Show the dialog + const QString file_name = QFileDialog::getOpenFileName( + this, tr("Open File"), "", tr( + "Sigrok Sessions (*.sr);;" + "All Files (*.*)")); + if (!file_name.isEmpty()) + load_file(file_name); } -void MainWindow::setup_add_decoders(QMenu *parent) +void MainWindow::on_actionSaveAs_triggered() { - GSList *l = g_slist_sort(g_slist_copy( - (GSList*)srd_decoder_list()), decoder_name_cmp); - for(; l; l = l->next) - { - QAction *const action = parent->addAction(QString( - ((srd_decoder*)l->data)->name)); - action->setData(qVariantFromValue(l->data)); - _decoders_add_mapper.setMapping(action, action); - connect(action, SIGNAL(triggered()), - &_decoders_add_mapper, SLOT(map())); - } - g_slist_free(l); -} + using pv::dialogs::StoreProgress; -void MainWindow::on_actionOpen_triggered() -{ - // Enumerate the file formats - QString filters(tr("Sigrok Sessions (*.sr)")); - filters.append(tr(";;All Files (*.*)")); + // Stop any currently running capture session + _session.stop_capture(); // Show the dialog - const QString file_name = QFileDialog::getOpenFileName( - this, tr("Open File"), "", filters); - if (!file_name.isEmpty()) - load_file(file_name); + const QString file_name = QFileDialog::getSaveFileName( + this, tr("Save File"), "", tr("Sigrok Sessions (*.sr)")); + + if (file_name.isEmpty()) + return; + + StoreProgress *dlg = new StoreProgress(file_name, _session, this); + dlg->run(); } void MainWindow::on_actionConnect_triggered() @@ -331,10 +374,10 @@ void MainWindow::on_actionConnect_triggered() // 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(); + if (dlg.exec()) + _session.set_device(dlg.get_selected_device()); - update_device_list(sdi); + update_device_list(); } void MainWindow::on_actionQuit_triggered() @@ -352,6 +395,16 @@ void MainWindow::on_actionViewZoomOut_triggered() _view->zoom(-1); } +void MainWindow::on_actionViewZoomFit_triggered() +{ + _view->zoom_fit(); +} + +void MainWindow::on_actionViewZoomOneToOne_triggered() +{ + _view->zoom_one_to_one(); +} + void MainWindow::on_actionViewShowCursors_triggered() { assert(_view); @@ -369,42 +422,22 @@ void MainWindow::on_actionAbout_triggered() dlg.exec(); } -void MainWindow::add_decoder(QObject *action) +void MainWindow::add_decoder(srd_decoder *decoder) { - assert(action); - srd_decoder *const dec = - (srd_decoder*)((QAction*)action)->data().value(); - assert(dec); - - vector< shared_ptr > logic_sigs; - const vector< shared_ptr > &sigs = - _session.get_signals(); - BOOST_FOREACH(shared_ptr s, sigs) { - assert(s); - shared_ptr l = - dynamic_pointer_cast(s); - if (l) - logic_sigs.push_back(l); - } - - GHashTable *const options = g_hash_table_new_full(g_str_hash, - g_str_equal, g_free, (GDestroyNotify)g_variant_unref); - - dialogs::Decoder dlg(this, dec, logic_sigs, options); - if(dlg.exec() != QDialog::Accepted) { - g_hash_table_destroy(options); - return; - } - - _session.add_decoder(dec, dlg.get_probes(), options); +#ifdef ENABLE_DECODE + assert(decoder); + _session.add_decoder(decoder); +#else + (void)decoder; +#endif } void MainWindow::run_stop() { switch(_session.get_capture_state()) { case SigSession::Stopped: - _session.start_capture(_sampling_bar->get_record_length(), - boost::bind(&MainWindow::session_error, this, + _session.start_capture( + boost::bind(&MainWindow::session_error, this, QString("Capture failed"), _1)); break;