X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=65db28b72dd8e509725a644818839ea6d57a9f99;hp=b437b4d1152618b01d6c8defc04f834617e9daa5;hb=5f66b56eb6616c9c626d6f48abf1da0d8a652444;hpb=7bb0fbf4d3809dbbd0fe5b35fc7e475b1065ae20 diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index b437b4d1..65db28b7 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -25,25 +25,41 @@ #include #include +#include #include #include +#include +#include #include #include "mainbar.hpp" +#include + #include #include +#include +#include +#include +#include +#include #include #include #include #include +#include #include #include +#ifdef ENABLE_DECODE +#include +#endif #include using std::back_inserter; +using std::cerr; using std::copy; +using std::endl; using std::list; using std::map; using std::max; @@ -56,6 +72,9 @@ using sigrok::Capability; using sigrok::ConfigKey; using sigrok::Error; using sigrok::InputFormat; +using sigrok::OutputFormat; + +using boost::algorithm::join; namespace pv { namespace toolbars { @@ -64,12 +83,21 @@ const uint64_t MainBar::MinSampleCount = 100ULL; const uint64_t MainBar::MaxSampleCount = 1000000000000ULL; const uint64_t MainBar::DefaultSampleCount = 1000000; -MainBar::MainBar(Session &session, MainWindow &main_window) : - QToolBar("Sampling Bar", &main_window), - session_(session), - main_window_(main_window), - device_selector_(this, session.device_manager(), - main_window.action_connect()), +const char *MainBar::SettingOpenDirectory = "MainWindow/OpenDirectory"; +const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory"; + +MainBar::MainBar(Session &session, QWidget *parent, + pv::views::TraceView::View *view) : + StandardBar(session, parent, view, false), + action_new_view_(new QAction(this)), + action_open_(new QAction(this)), + action_save_as_(new QAction(this)), + action_save_selection_as_(new QAction(this)), + action_connect_(new QAction(this)), + open_button_(new QToolButton()), + save_button_(new QToolButton()), + device_selector_(parent, session.device_manager(), + action_connect_), configure_button_(this), configure_button_action_(nullptr), channels_button_(this), @@ -78,53 +106,88 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : sample_rate_("Hz", this), updating_sample_rate_(false), updating_sample_count_(false), - sample_count_supported_(false), - icon_red_(":/icons/status-red.svg"), - icon_green_(":/icons/status-green.svg"), - icon_grey_(":/icons/status-grey.svg"), - run_stop_button_(this), - run_stop_button_action_(nullptr), - menu_button_(this) + sample_count_supported_(false) +#ifdef ENABLE_DECODE + , add_decoder_button_(new QToolButton()), + menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) +#endif { setObjectName(QString::fromUtf8("MainBar")); - setMovable(false); - setFloatable(false); - setContextMenuPolicy(Qt::PreventContextMenu); + // Actions + action_new_view_->setText(tr("New &View")); + action_new_view_->setIcon(QIcon::fromTheme("window-new", + QIcon(":/icons/window-new.png"))); + connect(action_new_view_, SIGNAL(triggered(bool)), + this, SLOT(on_actionNewView_triggered())); + + action_open_->setText(tr("&Open...")); + action_open_->setIcon(QIcon::fromTheme("document-open", + QIcon(":/icons/document-open.png"))); + action_open_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O)); + connect(action_open_, SIGNAL(triggered(bool)), + this, SLOT(on_actionOpen_triggered())); + + action_save_as_->setText(tr("&Save As...")); + action_save_as_->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + action_save_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); + connect(action_save_as_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSaveAs_triggered())); + + action_save_selection_as_->setText(tr("Save Selected &Range As...")); + action_save_selection_as_->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + action_save_selection_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + connect(action_save_selection_as_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSaveSelectionAs_triggered())); + + widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this, + session.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))); - // Open button - QToolButton *const open_button = new QToolButton(this); + widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this, + session.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))); + action_connect_->setText(tr("&Connect to Device...")); + connect(action_connect_, SIGNAL(triggered(bool)), + this, SLOT(on_actionConnect_triggered())); + + // Open button widgets::ImportMenu *import_menu = new widgets::ImportMenu(this, - session.device_manager().context(), - main_window.action_open()); + session.device_manager().context(), action_open_); connect(import_menu, SIGNAL(format_selected(std::shared_ptr)), - &main_window_, + this, SLOT(import_file(std::shared_ptr))); - open_button->setMenu(import_menu); - open_button->setDefaultAction(main_window.action_open()); - open_button->setPopupMode(QToolButton::MenuButtonPopup); + open_button_->setMenu(import_menu); + open_button_->setDefaultAction(action_open_); + open_button_->setPopupMode(QToolButton::MenuButtonPopup); // Save button - QToolButton *const save_button = new QToolButton(this); - vector open_actions; - open_actions.push_back(main_window.action_save_as()); - open_actions.push_back(main_window.action_save_selection_as()); + open_actions.push_back(action_save_as_); + open_actions.push_back(action_save_selection_as_); widgets::ExportMenu *export_menu = new widgets::ExportMenu(this, session.device_manager().context(), open_actions); connect(export_menu, SIGNAL(format_selected(std::shared_ptr)), - &main_window_, + this, SLOT(export_file(std::shared_ptr))); - save_button->setMenu(export_menu); - save_button->setDefaultAction(main_window.action_save_as()); - save_button->setPopupMode(QToolButton::MenuButtonPopup); + save_button_->setMenu(export_menu); + save_button_->setDefaultAction(action_save_as_); + save_button_->setPopupMode(QToolButton::MenuButtonPopup); // Device selector menu connect(&device_selector_, SIGNAL(device_selected()), @@ -132,49 +195,16 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : // Setup the decoder button #ifdef ENABLE_DECODE - QToolButton *add_decoder_button = new QToolButton(this); - add_decoder_button->setIcon(QIcon::fromTheme("add-decoder", + menu_decoders_add_->setTitle(tr("&Add")); + connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), + this, SLOT(add_decoder(srd_decoder*))); + + add_decoder_button_->setIcon(QIcon::fromTheme("add-decoder", QIcon(":/icons/add-decoder.svg"))); - add_decoder_button->setPopupMode(QToolButton::InstantPopup); - add_decoder_button->setMenu(main_window_.menu_decoder_add()); + add_decoder_button_->setPopupMode(QToolButton::InstantPopup); + add_decoder_button_->setMenu(menu_decoders_add_); #endif - // Setup the burger menu - QMenu *const menu = new QMenu(this); - - QMenu *const menu_view = new QMenu; - menu_view->setTitle(tr("&View")); - menu_view->addAction(main_window.action_view_sticky_scrolling()); - - QMenu *const menu_help = new QMenu; - menu_help->setTitle(tr("&Help")); - menu_help->addAction(main_window.action_about()); - - menu->addAction(menu_view->menuAction()); - menu->addSeparator(); - menu->addAction(menu_help->menuAction()); - menu->addSeparator(); - menu->addAction(main_window.action_quit()); - - menu_button_.setMenu(menu); - menu_button_.setPopupMode(QToolButton::InstantPopup); - menu_button_.setIcon(QIcon::fromTheme("menu", - QIcon(":/icons/menu.svg"))); - - // Setup the toolbar - addWidget(open_button); - addWidget(save_button); - addSeparator(); - addAction(main_window.action_view_zoom_in()); - addAction(main_window.action_view_zoom_out()); - addAction(main_window.action_view_zoom_fit()); - addAction(main_window.action_view_zoom_one_to_one()); - addSeparator(); - addAction(main_window.action_view_show_cursors()); - addSeparator(); - - connect(&run_stop_button_, SIGNAL(clicked()), - this, SLOT(on_run_stop())); connect(&sample_count_, SIGNAL(value_changed()), this, SLOT(on_sample_count_changed())); connect(&sample_rate_, SIGNAL(value_changed()), @@ -184,33 +214,26 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : set_capture_state(pv::Session::Stopped); + configure_button_.setToolTip(tr("Configure Device")); configure_button_.setIcon(QIcon::fromTheme("configure", QIcon(":/icons/configure.png"))); + channels_button_.setToolTip(tr("Configure Channels")); channels_button_.setIcon(QIcon::fromTheme("channels", QIcon(":/icons/channels.svg"))); - run_stop_button_.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - - addWidget(&device_selector_); - configure_button_action_ = addWidget(&configure_button_); - channels_button_action_ = addWidget(&channels_button_); - addWidget(&sample_count_); - addWidget(&sample_rate_); - run_stop_button_action_ = addWidget(&run_stop_button_); -#ifdef ENABLE_DECODE - addSeparator(); - addWidget(add_decoder_button); -#endif - - QWidget *const spacer = new QWidget(); - spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - addWidget(spacer); - - addWidget(&menu_button_); + add_toolbar_widgets(); sample_count_.installEventFilter(this); sample_rate_.installEventFilter(this); + + // Setup session_ events + connect(&session_, SIGNAL(capture_state_changed(int)), + this, SLOT(on_capture_state_changed(int))); + connect(&session, SIGNAL(device_changed()), + this, SLOT(on_device_changed())); + + update_device_list(); } void MainBar::update_device_list() @@ -231,12 +254,6 @@ void MainBar::update_device_list() void MainBar::set_capture_state(pv::Session::capture_state state) { - const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_}; - run_stop_button_.setIcon(*icons[state]); - run_stop_button_.setText((state == pv::Session::Stopped) ? - tr("Run") : tr("Stop")); - run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space)); - bool ui_enabled = (state == pv::Session::Stopped) ? true : false; device_selector_.setEnabled(ui_enabled); @@ -246,6 +263,31 @@ void MainBar::set_capture_state(pv::Session::capture_state state) sample_rate_.setEnabled(ui_enabled); } +void MainBar::reset_device_selector() +{ + device_selector_.reset(); +} + +QAction* MainBar::action_open() const +{ + return action_open_; +} + +QAction* MainBar::action_save_as() const +{ + return action_save_as_; +} + +QAction* MainBar::action_save_selection_as() const +{ + return action_save_selection_as_; +} + +QAction* MainBar::action_connect() const +{ + return action_connect_; +} + void MainBar::update_sample_rate_selector() { Glib::VariantContainerBase gvar_dict; @@ -402,7 +444,6 @@ void MainBar::update_device_config_widgets() // Hide the widgets if no device is selected channels_button_action_->setVisible(!!device); - run_stop_button_action_->setVisible(!!device); if (!device) { configure_button_action_->setVisible(false); sample_count_.show_none(); @@ -446,6 +487,36 @@ void MainBar::update_device_config_widgets() update_sample_rate_selector(); } +void MainBar::commit_sample_rate() +{ + uint64_t sample_rate = 0; + + const shared_ptr device = + device_selector_.selected_device(); + if (!device) + return; + + const shared_ptr sr_dev = device->device(); + + sample_rate = sample_rate_.value(); + if (sample_rate == 0) + return; + + try { + sr_dev->config_set(ConfigKey::SAMPLERATE, + Glib::Variant::create(sample_rate)); + update_sample_rate_selector(); + } catch (Error error) { + qDebug() << "Failed to configure samplerate."; + return; + } + + // Devices with built-in memory might impose limits on certain + // configurations, so let's check what sample count the driver + // lets us use now. + update_sample_count_selector(); +} + void MainBar::commit_sample_count() { uint64_t sample_count = 0; @@ -475,47 +546,177 @@ void MainBar::commit_sample_count() update_sample_rate_selector(); } -void MainBar::commit_sample_rate() +void MainBar::session_error(const QString text, const QString info_text) { - uint64_t sample_rate = 0; + QMetaObject::invokeMethod(this, "show_session_error", + Qt::QueuedConnection, Q_ARG(QString, text), + Q_ARG(QString, info_text)); +} - const shared_ptr device = - device_selector_.selected_device(); - if (!device) - return; +void MainBar::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(); +} - const shared_ptr sr_dev = device->device(); +void MainBar::add_decoder(srd_decoder *decoder) +{ +#ifdef ENABLE_DECODE + assert(decoder); + session_.add_decoder(decoder); +#else + (void)decoder; +#endif +} - sample_rate = sample_rate_.value(); - if (sample_rate == 0) +void MainBar::export_file(shared_ptr format, + bool selection_only) +{ + using pv::dialogs::StoreProgress; + + // Stop any currently running capture session + session_.stop_capture(); + + QSettings settings; + const QString dir = settings.value(SettingSaveDirectory).toString(); + + std::pair sample_range; + + // Selection only? Verify that the cursors are active and fetch their values + if (selection_only) { + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + if (!trace_view->cursors()->enabled()) { + show_session_error(tr("Missing Cursors"), tr("You need to set the " \ + "cursors before you can save the data enclosed by them " \ + "to a session file (e.g. using ALT-V - Show Cursors).")); + return; + } + + const double samplerate = session_.get_samplerate(); + + const pv::util::Timestamp& start_time = trace_view->cursors()->first()->time(); + const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time(); + + const uint64_t start_sample = + std::max((double)0, start_time.convert_to() * samplerate); + const uint64_t end_sample = end_time.convert_to() * samplerate; + + sample_range = std::make_pair(start_sample, end_sample); + } else { + sample_range = std::make_pair(0, 0); + } + + // 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, ", *.")), + tr("All Files")); + + // Show the file dialog + const QString file_name = QFileDialog::getSaveFileName( + this, tr("Save File"), dir, filter); + + if (file_name.isEmpty()) return; - try { - sr_dev->config_set(ConfigKey::SAMPLERATE, - Glib::Variant::create(sample_rate)); - update_sample_rate_selector(); - } catch (Error error) { - qDebug() << "Failed to configure samplerate."; + 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(); + } + + if (!selection_only) + session_.set_name(QFileInfo(file_name).fileName()); + + StoreProgress *dlg = new StoreProgress(file_name, format, options, + sample_range, session_, this); + dlg->run(); +} + +void MainBar::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()), + 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(); } - // Devices with built-in memory might impose limits on certain - // configurations, so let's check what sample count the driver - // lets us use now. - update_sample_count_selector(); + session_.load_file(file_name, format, options); + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingOpenDirectory, abs_path); } void MainBar::on_device_selected() { shared_ptr device = device_selector_.selected_device(); - if (!device) + if (!device) { + reset_device_selector(); return; + } - main_window_.select_device(device); + session_.select_device(device); +} +void MainBar::on_device_changed() +{ + update_device_list(); update_device_config_widgets(); } +void MainBar::on_capture_state_changed(int state) +{ + set_capture_state((pv::Session::capture_state)state); +} + void MainBar::on_sample_count_changed() { if (!updating_sample_count_) @@ -528,17 +729,80 @@ void MainBar::on_sample_rate_changed() commit_sample_rate(); } -void MainBar::on_run_stop() +void MainBar::on_config_changed() { commit_sample_count(); commit_sample_rate(); - main_window_.run_stop(); } -void MainBar::on_config_changed() +void MainBar::on_actionNewView_triggered() { - commit_sample_count(); - commit_sample_rate(); + new_view(&session_); +} + +void MainBar::on_actionOpen_triggered() +{ + QSettings settings; + const QString dir = settings.value(SettingOpenDirectory).toString(); + + // Show the dialog + const QString file_name = QFileDialog::getOpenFileName( + this, tr("Open File"), dir, tr( + "Sigrok Sessions (*.sr);;" + "All Files (*.*)")); + + if (!file_name.isEmpty()) { + session_.load_file(file_name); + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingOpenDirectory, abs_path); + } +} + +void MainBar::on_actionSaveAs_triggered() +{ + export_file(session_.device_manager().context()->output_formats()["srzip"]); +} + +void MainBar::on_actionSaveSelectionAs_triggered() +{ + export_file(session_.device_manager().context()->output_formats()["srzip"], true); +} + +void MainBar::on_actionConnect_triggered() +{ + // Stop any currently running capture session + session_.stop_capture(); + + dialogs::Connect dlg(this, session_.device_manager()); + + // If the user selected a device, select it in the device list. Select the + // current device otherwise. + if (dlg.exec()) + session_.select_device(dlg.get_selected_device()); + + update_device_list(); +} + +void MainBar::add_toolbar_widgets() +{ + addAction(action_new_view_); + addSeparator(); + addWidget(open_button_); + addWidget(save_button_); + addSeparator(); + + StandardBar::add_toolbar_widgets(); + + addWidget(&device_selector_); + configure_button_action_ = addWidget(&configure_button_); + channels_button_action_ = addWidget(&channels_button_); + addWidget(&sample_count_); + addWidget(&sample_rate_); +#ifdef ENABLE_DECODE + addSeparator(); + addWidget(add_decoder_button_); +#endif } bool MainBar::eventFilter(QObject *watched, QEvent *event)