X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=f907f09cce33f118b0c830dbc0ee564f50a76501;hp=1d2b49fff4772ae364e57ab5eb9c438995d5bc76;hb=19be0af16af83ca10f7ce69cb64f0b0c6f6a0d81;hpb=696546819ac7b120ac2f8a8b004e62a1f213cbae diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 1d2b49ff..f907f09c 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -27,6 +27,8 @@ #include #include +#include + #include #include #include @@ -45,28 +47,35 @@ #include "devicemanager.hpp" #include "dialogs/about.hpp" #include "dialogs/connect.hpp" +#include "dialogs/inputoutputoptions.hpp" #include "dialogs/storeprogress.hpp" #include "toolbars/mainbar.hpp" #include "view/logicsignal.hpp" #include "view/view.hpp" +#include "widgets/exportmenu.hpp" #ifdef ENABLE_DECODE #include "widgets/decodermenu.hpp" #endif +#include "widgets/hidingmenubar.hpp" #include #include #include #include -#include +#include using std::list; using std::map; using std::shared_ptr; using std::string; +using std::vector; + +using boost::algorithm::join; using sigrok::Device; using sigrok::Error; using sigrok::HardwareDevice; +using sigrok::OutputFormat; namespace pv { @@ -93,6 +102,9 @@ MainWindow::MainWindow(DeviceManager &device_manager, action_view_zoom_one_to_one_(new QAction(this)), action_view_show_cursors_(new QAction(this)), action_about_(new QAction(this)) +#ifdef ENABLE_DECODE + , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) +#endif { setup_ui(); restore_ui_settings(); @@ -154,6 +166,13 @@ QAction* MainWindow::action_about() const return action_about_; } +#ifdef ENABLE_DECODE +QMenu* MainWindow::menu_decoder_add() const +{ + return menu_decoders_add_; +} +#endif + void MainWindow::run_stop() { switch(session_.get_capture_state()) { @@ -183,14 +202,62 @@ void MainWindow::select_device(shared_ptr device) } } +void MainWindow::export_file(shared_ptr format) +{ + using pv::dialogs::StoreProgress; + + // Stop any currently running capture session + session_.stop_capture(); + + QSettings settings; + const QString dir = settings.value(SettingSaveDirectory).toString(); + + // Construct the filter + const vector exts = format->extensions(); + QString filter = tr("%1 files ").arg( + QString::fromStdString(format->description())); + + if (exts.empty()) + filter += "(*.*)"; + else + filter += QString("(*.%1);;%2 (*.*)").arg( + QString::fromStdString(join(exts, ", *."))).arg( + tr("All Files")); + + // Show the file dialog + const QString file_name = QFileDialog::getSaveFileName( + this, tr("Save File"), dir, filter); + + if (file_name.isEmpty()) + return; + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingSaveDirectory, abs_path); + + // Show the options dialog + map options; + if (!format->options().empty()) { + dialogs::InputOutputOptions dlg( + tr("Export %1").arg(QString::fromStdString( + format->description())), + format->options(), this); + if (!dlg.exec()) + return; + options = dlg.options(); + } + + StoreProgress *dlg = new StoreProgress(file_name, format, options, + session_, this); + dlg->run(); +} + void MainWindow::setup_ui() { setObjectName(QString::fromUtf8("MainWindow")); // Set the window icon QIcon icon; - icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"), - QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QString(":/icons/sigrok-logo-notext.svg")); setWindowIcon(icon); // Setup the central widget @@ -205,8 +272,8 @@ void MainWindow::setup_ui() vertical_layout_->addWidget(view_); // Setup the menu bar - QMenuBar *const menu_bar = new QMenuBar(this); - menu_bar->setGeometry(QRect(0, 0, 400, 25)); + pv::widgets::HidingMenuBar *const menu_bar = + new pv::widgets::HidingMenuBar(this); // File Menu QMenu *const menu_file = new QMenu; @@ -228,6 +295,16 @@ void MainWindow::setup_ui() menu_file->addSeparator(); + widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this, + device_manager_.context()); + menu_file_export->setTitle(tr("&Export")); + connect(menu_file_export, + SIGNAL(format_selected(std::shared_ptr)), + this, SLOT(export_file(std::shared_ptr))); + menu_file->addAction(menu_file_export->menuAction()); + + menu_file->addSeparator(); + action_connect_->setText(tr("&Connect to Device...")); action_connect_->setObjectName(QString::fromUtf8("actionConnect")); menu_file->addAction(action_connect_); @@ -270,7 +347,7 @@ void MainWindow::setup_ui() QString::fromUtf8("actionViewZoomFit")); menu_view->addAction(action_view_zoom_fit_); - action_view_zoom_one_to_one_->setText(tr("Zoom to &One-to-One")); + action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One")); 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)); @@ -282,6 +359,8 @@ void MainWindow::setup_ui() action_view_show_cursors_->setCheckable(true); action_view_show_cursors_->setChecked(view_->cursors_shown()); + action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", + QIcon(":/icons/show-cursors.svg"))); action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C)); action_view_show_cursors_->setObjectName( QString::fromUtf8("actionViewShowCursors")); @@ -293,13 +372,11 @@ void MainWindow::setup_ui() QMenu *const menu_decoders = new QMenu; menu_decoders->setTitle(tr("&Decoders")); - pv::widgets::DecoderMenu *const menu_decoders_add = - new pv::widgets::DecoderMenu(menu_decoders, true); - menu_decoders_add->setTitle(tr("&Add")); - connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), + menu_decoders_add_->setTitle(tr("&Add")); + connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), this, SLOT(add_decoder(srd_decoder*))); - menu_decoders->addMenu(menu_decoders_add); + menu_decoders->addMenu(menu_decoders_add_); #endif // Help Menu @@ -321,18 +398,6 @@ void MainWindow::setup_ui() QMetaObject::connectSlotsByName(this); // Setup the toolbar - QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this); - toolbar->setObjectName(QString::fromUtf8("MainToolbar")); - toolbar->addAction(action_open_); - toolbar->addAction(action_save_as_); - toolbar->addSeparator(); - toolbar->addAction(action_view_zoom_in_); - toolbar->addAction(action_view_zoom_out_); - toolbar->addAction(action_view_zoom_fit_); - toolbar->addAction(action_view_zoom_one_to_one_); - addToolBar(toolbar); - - // Setup the sampling bar main_bar_ = new toolbars::MainBar(session_, *this); // Populate the device list and select the initially selected device @@ -444,23 +509,7 @@ void MainWindow::session_error( void MainWindow::update_device_list() { - assert(main_bar_); - - shared_ptr selected_device = session_.device(); - list< shared_ptr > devices; - - if (device_manager_.devices().size() == 0) - return; - - std::copy(device_manager_.devices().begin(), - device_manager_.devices().end(), std::back_inserter(devices)); - - if (std::find(devices.begin(), devices.end(), selected_device) == - devices.end()) - devices.push_back(selected_device); - assert(selected_device); - - main_bar_->set_device_list(devices, selected_device); + main_bar_->update_device_list(); } void MainWindow::closeEvent(QCloseEvent *event) @@ -469,6 +518,15 @@ void MainWindow::closeEvent(QCloseEvent *event) event->accept(); } +void MainWindow::keyReleaseEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Alt) { + menuBar()->setHidden(!menuBar()->isHidden()); + menuBar()->setFocus(); + } + QMainWindow::keyReleaseEvent(event); +} + void MainWindow::load_file(QString file_name) { const QString errorMessage( @@ -476,7 +534,7 @@ void MainWindow::load_file(QString file_name) const QString infoMessage; try { - session_.set_file(file_name.toStdString()); + session_.set_session_file(file_name.toStdString()); } catch(Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device(); @@ -522,26 +580,7 @@ void MainWindow::on_actionOpen_triggered() void MainWindow::on_actionSaveAs_triggered() { - using pv::dialogs::StoreProgress; - - // Stop any currently running capture session - session_.stop_capture(); - - QSettings settings; - const QString dir = settings.value(SettingSaveDirectory).toString(); - - // Show the dialog - const QString file_name = QFileDialog::getSaveFileName( - this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)")); - - if (file_name.isEmpty()) - return; - - const QString abs_path = QFileInfo(file_name).absolutePath(); - settings.setValue(SettingSaveDirectory, abs_path); - - StoreProgress *dlg = new StoreProgress(file_name, session_, this); - dlg->run(); + export_file(device_manager_.context()->output_formats()["srzip"]); } void MainWindow::on_actionConnect_triggered()