X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=767ab6f31149bd4881b0db163635c86025c08818;hp=a7dd773666fba9aec90f861dacc2f4935499859b;hb=951b5ae77957c8086f05fcd2b26beaf32f3e8e3e;hpb=0f90452b8aff5c54096c23cadbbb549d25f1f88d diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index a7dd7736..767ab6f3 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -27,6 +27,8 @@ #include #include +#include + #include #include #include @@ -43,30 +45,40 @@ #include "mainwindow.hpp" #include "devicemanager.hpp" +#include "devices/hardwaredevice.hpp" +#include "devices/inputfile.hpp" +#include "devices/sessionfile.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" +#include "widgets/importmenu.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; +using sigrok::InputFormat; namespace pv { @@ -92,8 +104,10 @@ MainWindow::MainWindow(DeviceManager &device_manager, action_view_zoom_fit_(new QAction(this)), action_view_zoom_one_to_one_(new QAction(this)), action_view_show_cursors_(new QAction(this)), - action_about_(new QAction(this)), - menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) + action_about_(new QAction(this)) +#ifdef ENABLE_DECODE + , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) +#endif { setup_ui(); restore_ui_settings(); @@ -155,10 +169,12 @@ 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() { @@ -175,7 +191,7 @@ void MainWindow::run_stop() } } -void MainWindow::select_device(shared_ptr device) +void MainWindow::select_device(shared_ptr device) { try { session_.set_device(device); @@ -189,14 +205,103 @@ 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::import_file(shared_ptr format) +{ + assert(format); + + QSettings settings; + const QString dir = settings.value(SettingOpenDirectory).toString(); + + // Construct the filter + const vector exts = format->extensions(); + const QString filter = exts.empty() ? "" : + tr("%1 files (*.%2)").arg( + QString::fromStdString(format->description())).arg( + QString::fromStdString(join(exts, ", *."))); + + // Show the file dialog + const QString file_name = QFileDialog::getOpenFileName( + this, tr("Import File"), dir, tr( + "%1 files (*.*);;All Files (*.*)").arg( + QString::fromStdString(format->description()))); + + if (file_name.isEmpty()) + return; + + // Show the options dialog + map options; + if (!format->options().empty()) { + dialogs::InputOutputOptions dlg( + tr("Import %1").arg(QString::fromStdString( + format->description())), + format->options(), this); + if (!dlg.exec()) + return; + options = dlg.options(); + } + + load_file(file_name, format, options); + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingOpenDirectory, abs_path); +} + 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 @@ -211,8 +316,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; @@ -234,6 +339,24 @@ 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()); + + widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this, + device_manager_.context()); + menu_file_import->setTitle(tr("&Import")); + connect(menu_file_import, + SIGNAL(format_selected(std::shared_ptr)), + this, SLOT(import_file(std::shared_ptr))); + menu_file->addAction(menu_file_import->menuAction()); + + menu_file->addSeparator(); + action_connect_->setText(tr("&Connect to Device...")); action_connect_->setObjectName(QString::fromUtf8("actionConnect")); menu_file->addAction(action_connect_); @@ -276,7 +399,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)); @@ -326,7 +449,7 @@ void MainWindow::setup_ui() setMenuBar(menu_bar); QMetaObject::connectSlotsByName(this); - // Setup the sampling bar + // Setup the toolbar main_bar_ = new toolbars::MainBar(session_, *this); // Populate the device list and select the initially selected device @@ -384,11 +507,8 @@ void MainWindow::restore_ui_settings() { QSettings settings; - shared_ptr device; - map dev_info; list key_list; - string value; settings.beginGroup("MainWindow"); @@ -409,17 +529,17 @@ void MainWindow::restore_ui_settings() key_list.push_back("connection_id"); for (string key : key_list) { - if (!settings.contains(QString::fromUtf8(key.c_str()))) + const QString k = QString::fromStdString(key); + if (!settings.contains(k)) continue; - value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString(); - - if (value.size() > 0) + const string value = settings.value(k).toString().toStdString(); + if (!value.empty()) dev_info.insert(std::make_pair(key, value)); } - device = device_manager_.find_device_from_info(dev_info); - + const shared_ptr device = + device_manager_.find_device_from_info(dev_info); if (device) { select_device(device); update_device_list(); @@ -438,23 +558,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) @@ -463,14 +567,35 @@ void MainWindow::closeEvent(QCloseEvent *event) event->accept(); } -void MainWindow::load_file(QString file_name) +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, + std::shared_ptr format, + const std::map &options) { const QString errorMessage( QString("Failed to load file %1").arg(file_name)); const QString infoMessage; try { - session_.set_file(file_name.toStdString()); + if (format) + session_.set_device(shared_ptr( + new devices::InputFile( + device_manager_.context(), + file_name.toStdString(), + format, options))); + else + session_.set_device(shared_ptr( + new devices::SessionFile( + device_manager_.context(), + file_name.toStdString()))); } catch(Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device(); @@ -516,26 +641,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() @@ -613,11 +719,11 @@ void MainWindow::capture_state_changed(int state) void MainWindow::device_selected() { // Set the title to include the device/file name - const shared_ptr device = session_.device(); + const shared_ptr device = session_.device(); if (!device) return; - const string display_name = device_manager_.get_display_name(device); + const string display_name = device->display_name(device_manager_); setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str())); }