X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=026610233c131a5a74a1f6eec39c5e5eed2ff4ca;hp=9bebda80061c1d29a5216a4188f2a09c3a911ce2;hb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;hpb=348f9ceca2a1e0812324348b16192a652ae06ea3 diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index 9bebda80..02661023 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -43,26 +43,27 @@ #include #include #include -#include #include +#include #include -#include +#include #include #include #ifdef ENABLE_DECODE -#include +#include #endif #include using std::back_inserter; -using std::cerr; using std::copy; -using std::endl; using std::list; +using std::make_pair; using std::map; using std::max; using std::min; +using std::pair; +using std::set; using std::shared_ptr; using std::string; using std::vector; @@ -85,18 +86,18 @@ const uint64_t MainBar::DefaultSampleCount = 1000000; const char *MainBar::SettingOpenDirectory = "MainWindow/OpenDirectory"; const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory"; -MainBar::MainBar(Session &session, QWidget *parent, - pv::views::TraceView::View *view) : +MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::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_restore_setup_(new QAction(this)), + action_save_setup_(new QAction(this)), action_connect_(new QAction(this)), open_button_(new QToolButton()), save_button_(new QToolButton()), - device_selector_(parent, session.device_manager(), - action_connect_), + device_selector_(parent, session.device_manager(), action_connect_), configure_button_(this), configure_button_action_(nullptr), channels_button_(this), @@ -107,12 +108,13 @@ MainBar::MainBar(Session &session, QWidget *parent, updating_sample_count_(false), sample_count_supported_(false) #ifdef ENABLE_DECODE - , add_decoder_button_(new QToolButton()), - menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) + , add_decoder_button_(new QToolButton()) #endif { setObjectName(QString::fromUtf8("MainBar")); + setContextMenuPolicy(Qt::PreventContextMenu); + // Actions action_new_view_->setText(tr("New &View")); action_new_view_->setIcon(QIcon::fromTheme("window-new", @@ -127,6 +129,10 @@ MainBar::MainBar(Session &session, QWidget *parent, connect(action_open_, SIGNAL(triggered(bool)), this, SLOT(on_actionOpen_triggered())); + action_restore_setup_->setText(tr("Restore Session Setu&p...")); + connect(action_restore_setup_, SIGNAL(triggered(bool)), + this, SLOT(on_actionRestoreSetup_triggered())); + action_save_as_->setText(tr("&Save As...")); action_save_as_->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png"))); @@ -141,48 +147,56 @@ MainBar::MainBar(Session &session, QWidget *parent, connect(action_save_selection_as_, SIGNAL(triggered(bool)), this, SLOT(on_actionSaveSelectionAs_triggered())); + action_save_setup_->setText(tr("Save Session Setu&p...")); + connect(action_save_setup_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSaveSetup_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))); + connect(menu_file_export, SIGNAL(format_selected(shared_ptr)), + this, SLOT(export_file(shared_ptr))); 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))); + connect(menu_file_import, SIGNAL(format_selected(shared_ptr)), + this, SLOT(import_file(shared_ptr))); action_connect_->setText(tr("&Connect to Device...")); connect(action_connect_, SIGNAL(triggered(bool)), this, SLOT(on_actionConnect_triggered())); // Open button + vector open_actions; + open_actions.push_back(action_open_); + QAction* separator_o = new QAction(this); + separator_o->setSeparator(true); + open_actions.push_back(separator_o); + open_actions.push_back(action_restore_setup_); + widgets::ImportMenu *import_menu = new widgets::ImportMenu(this, - session.device_manager().context(), action_open_); - connect(import_menu, - SIGNAL(format_selected(std::shared_ptr)), - this, - SLOT(import_file(std::shared_ptr))); + session.device_manager().context(), open_actions); + connect(import_menu, SIGNAL(format_selected(shared_ptr)), + this, SLOT(import_file(shared_ptr))); open_button_->setMenu(import_menu); open_button_->setDefaultAction(action_open_); open_button_->setPopupMode(QToolButton::MenuButtonPopup); // Save button - vector open_actions; - open_actions.push_back(action_save_as_); - open_actions.push_back(action_save_selection_as_); + vector save_actions; + save_actions.push_back(action_save_as_); + save_actions.push_back(action_save_selection_as_); + QAction* separator_s = new QAction(this); + separator_s->setSeparator(true); + save_actions.push_back(separator_s); + save_actions.push_back(action_save_setup_); widgets::ExportMenu *export_menu = new widgets::ExportMenu(this, - session.device_manager().context(), - open_actions); - connect(export_menu, - SIGNAL(format_selected(std::shared_ptr)), - this, - SLOT(export_file(std::shared_ptr))); + session.device_manager().context(), save_actions); + connect(export_menu, SIGNAL(format_selected(shared_ptr)), + this, SLOT(export_file(shared_ptr))); save_button_->setMenu(export_menu); save_button_->setDefaultAction(action_save_as_); @@ -194,14 +208,12 @@ MainBar::MainBar(Session &session, QWidget *parent, // Setup the decoder button #ifdef ENABLE_DECODE - 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_->setIcon(QIcon(":/icons/add-decoder.svg")); add_decoder_button_->setPopupMode(QToolButton::InstantPopup); - add_decoder_button_->setMenu(menu_decoders_add_); + add_decoder_button_->setToolTip(tr("Add protocol decoder")); + + connect(add_decoder_button_, SIGNAL(clicked()), + this, SLOT(on_add_decoder_clicked())); #endif connect(&sample_count_, SIGNAL(value_changed()), @@ -214,12 +226,11 @@ MainBar::MainBar(Session &session, QWidget *parent, set_capture_state(pv::Session::Stopped); configure_button_.setToolTip(tr("Configure Device")); - configure_button_.setIcon(QIcon::fromTheme("configure", - QIcon(":/icons/configure.png"))); + configure_button_.setIcon(QIcon::fromTheme("preferences-system", + QIcon(":/icons/preferences-system.png"))); channels_button_.setToolTip(tr("Configure Channels")); - channels_button_.setIcon(QIcon::fromTheme("channels", - QIcon(":/icons/channels.svg"))); + channels_button_.setIcon(QIcon(":/icons/channels.svg")); add_toolbar_widgets(); @@ -250,7 +261,6 @@ void MainBar::update_device_list() update_device_config_widgets(); } - void MainBar::set_capture_state(pv::Session::capture_state state) { bool ui_enabled = (state == pv::Session::Stopped) ? true : false; @@ -293,15 +303,14 @@ void MainBar::update_sample_rate_selector() GVariant *gvar_list; const uint64_t *elements = nullptr; gsize num_elements; - map< const ConfigKey*, std::set > keys; + map< const ConfigKey*, set > keys; if (updating_sample_rate_) { sample_rate_.show_none(); return; } - const shared_ptr device = - device_selector_.selected_device(); + const shared_ptr device = device_selector_.selected_device(); if (!device) return; @@ -310,8 +319,27 @@ void MainBar::update_sample_rate_selector() const shared_ptr sr_dev = device->device(); + sample_rate_.allow_user_entered_values(false); + if (sr_dev->config_check(ConfigKey::EXTERNAL_CLOCK, Capability::GET)) { + try { + auto gvar = sr_dev->config_get(ConfigKey::EXTERNAL_CLOCK); + if (gvar.gobj()) { + bool value = Glib::VariantBase::cast_dynamic>( + gvar).get(); + sample_rate_.allow_user_entered_values(value); + } + } catch (Error& error) { + // Do nothing + } + } + + if (sr_dev->config_check(ConfigKey::SAMPLERATE, Capability::LIST)) { - gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE); + try { + gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE); + } catch (Error& error) { + qDebug() << tr("Failed to get sample rate list:") << error.what(); + } } else { sample_rate_.show_none(); updating_sample_rate_ = false; @@ -321,7 +349,7 @@ void MainBar::update_sample_rate_selector() if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(), "samplerate-steps", G_VARIANT_TYPE("at")))) { elements = (const uint64_t *)g_variant_get_fixed_array( - gvar_list, &num_elements, sizeof(uint64_t)); + gvar_list, &num_elements, sizeof(uint64_t)); const uint64_t min = elements[0]; const uint64_t max = elements[1]; @@ -346,7 +374,7 @@ void MainBar::update_sample_rate_selector() } else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(), "samplerates", G_VARIANT_TYPE("at")))) { elements = (const uint64_t *)g_variant_get_fixed_array( - gvar_list, &num_elements, sizeof(uint64_t)); + gvar_list, &num_elements, sizeof(uint64_t)); sample_rate_.show_list(elements, num_elements); g_variant_unref(gvar_list); } @@ -360,8 +388,7 @@ void MainBar::update_sample_rate_selector_value() if (updating_sample_rate_) return; - const shared_ptr device = - device_selector_.selected_device(); + const shared_ptr device = device_selector_.selected_device(); if (!device) return; @@ -373,9 +400,8 @@ void MainBar::update_sample_rate_selector_value() updating_sample_rate_ = true; sample_rate_.set_value(samplerate); updating_sample_rate_ = false; - } catch (Error error) { - qDebug() << "WARNING: Failed to get value of sample rate"; - return; + } catch (Error& error) { + qDebug() << tr("Failed to get sample rate:") << error.what(); } } @@ -384,8 +410,7 @@ void MainBar::update_sample_count_selector() if (updating_sample_count_) return; - const shared_ptr device = - device_selector_.selected_device(); + const shared_ptr device = device_selector_.selected_device(); if (!device) return; @@ -411,17 +436,20 @@ void MainBar::update_sample_count_selector() } if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::LIST)) { - auto gvar = sr_dev->config_list(ConfigKey::LIMIT_SAMPLES); - if (gvar.gobj()) - g_variant_get(gvar.gobj(), "(tt)", - &min_sample_count, &max_sample_count); + try { + auto gvar = sr_dev->config_list(ConfigKey::LIMIT_SAMPLES); + if (gvar.gobj()) + g_variant_get(gvar.gobj(), "(tt)", + &min_sample_count, &max_sample_count); + } catch (Error& error) { + qDebug() << tr("Failed to get sample limit list:") << error.what(); + } } min_sample_count = min(max(min_sample_count, MinSampleCount), max_sample_count); - sample_count_.show_125_list( - min_sample_count, max_sample_count); + sample_count_.show_125_list(min_sample_count, max_sample_count); if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::GET)) { auto gvar = sr_dev->config_get(ConfigKey::LIMIT_SAMPLES); @@ -447,8 +475,7 @@ void MainBar::update_device_config_widgets() { using namespace pv::popups; - const shared_ptr device = - device_selector_.selected_device(); + const shared_ptr device = device_selector_.selected_device(); // Hide the widgets if no device is selected channels_button_action_->setVisible(!!device); @@ -465,8 +492,7 @@ void MainBar::update_device_config_widgets() // Update the configure popup DeviceOptions *const opts = new DeviceOptions(sr_dev, this); - configure_button_action_->setVisible( - !opts->binding().properties().empty()); + configure_button_action_->setVisible(!opts->binding().properties().empty()); configure_button_.set_popup(opts); // Update the channels popup @@ -479,12 +505,6 @@ void MainBar::update_device_config_widgets() if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::SET)) sample_count_supported_ = true; - if (sr_dev->config_check(ConfigKey::LIMIT_FRAMES, Capability::SET)) { - sr_dev->config_set(ConfigKey::LIMIT_FRAMES, - Glib::Variant::create(1)); - on_config_changed(); - } - // Add notification of reconfigure events disconnect(this, SLOT(on_config_changed())); connect(&opts->binding(), SIGNAL(config_changed()), @@ -499,23 +519,20 @@ void MainBar::commit_sample_rate() { uint64_t sample_rate = 0; - const shared_ptr device = - device_selector_.selected_device(); + 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."; + } catch (Error& error) { + qDebug() << tr("Failed to configure samplerate:") << error.what(); return; } @@ -529,8 +546,7 @@ void MainBar::commit_sample_count() { uint64_t sample_count = 0; - const shared_ptr device = - device_selector_.selected_device(); + const shared_ptr device = device_selector_.selected_device(); if (!device) return; @@ -542,8 +558,8 @@ void MainBar::commit_sample_count() sr_dev->config_set(ConfigKey::LIMIT_SAMPLES, Glib::Variant::create(sample_count)); update_sample_count_selector(); - } catch (Error error) { - qDebug() << "Failed to configure sample count."; + } catch (Error& error) { + qDebug() << tr("Failed to configure sample count:") << error.what(); return; } } @@ -554,35 +570,16 @@ void MainBar::commit_sample_count() update_sample_rate_selector(); } -void MainBar::session_error(const QString text, const QString info_text) -{ - QMetaObject::invokeMethod(this, "show_session_error", - Qt::QueuedConnection, Q_ARG(QString, text), - Q_ARG(QString, info_text)); -} - void MainBar::show_session_error(const QString text, const QString info_text) { QMessageBox msg(this); - msg.setText(text); - msg.setInformativeText(info_text); + msg.setText(text + "\n\n" + info_text); msg.setStandardButtons(QMessageBox::Ok); msg.setIcon(QMessageBox::Warning); msg.exec(); } -void MainBar::add_decoder(srd_decoder *decoder) -{ -#ifdef ENABLE_DECODE - assert(decoder); - session_.add_decoder(decoder); -#else - (void)decoder; -#endif -} - -void MainBar::export_file(shared_ptr format, - bool selection_only) +void MainBar::export_file(shared_ptr format, bool selection_only) { using pv::dialogs::StoreProgress; @@ -592,17 +589,17 @@ void MainBar::export_file(shared_ptr format, QSettings settings; const QString dir = settings.value(SettingSaveDirectory).toString(); - std::pair sample_range; + 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()); + views::trace::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).")); + "cursors before you can save the data enclosed by them " \ + "to a session file (e.g. using the Show Cursors button).")); return; } @@ -611,13 +608,21 @@ void MainBar::export_file(shared_ptr format, 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; + const uint64_t start_sample = (uint64_t)max( + 0.0, start_time.convert_to() * samplerate); + const uint64_t end_sample = (uint64_t)max( + 0.0, end_time.convert_to() * samplerate); - sample_range = std::make_pair(start_sample, end_sample); + if ((start_sample == 0) && (end_sample == 0)) { + // Both cursors are negative and were clamped to 0 + show_session_error(tr("Invalid Range"), tr("The cursors don't " \ + "define a valid range of samples.")); + return; + } + + sample_range = make_pair(start_sample, end_sample); } else { - sample_range = std::make_pair(0, 0); + sample_range = make_pair(0, 0); } // Construct the filter @@ -626,9 +631,9 @@ void MainBar::export_file(shared_ptr format, QString::fromStdString(format->description())); if (exts.empty()) - filter += "(*.*)"; + filter += "(*)"; else - filter += QString("(*.%1);;%2 (*.*)").arg( + filter += QString("(*.%1);;%2 (*)").arg( QString::fromStdString(join(exts, ", *.")), tr("All Files")); @@ -671,16 +676,19 @@ void MainBar::import_file(shared_ptr format) // 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, ", *."))); + const QString filter_exts = exts.empty() ? "" : QString::fromStdString("%1 (%2)").arg( + tr("%1 files").arg(QString::fromStdString(format->description())), + QString::fromStdString("*.%1").arg(QString::fromStdString(join(exts, " *.")))); + const QString filter_all = QString::fromStdString("%1 (%2)").arg( + tr("All Files"), QString::fromStdString("*")); + const QString filter = QString::fromStdString("%1%2%3").arg( + exts.empty() ? "" : filter_exts, + exts.empty() ? "" : ";;", + filter_all); // 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()))); + this, tr("Import File"), dir, filter); if (file_name.isEmpty()) return; @@ -697,7 +705,7 @@ void MainBar::import_file(shared_ptr format) options = dlg.options(); } - session_.load_file(file_name, format, options); + session_.load_file(file_name, nullptr, format, options); const QString abs_path = QFileInfo(file_name).absolutePath(); settings.setValue(SettingOpenDirectory, abs_path); @@ -706,12 +714,11 @@ void MainBar::import_file(shared_ptr format) void MainBar::on_device_selected() { shared_ptr device = device_selector_.selected_device(); - if (!device) { - reset_device_selector(); - return; - } - session_.select_device(device); + if (device) + session_.select_device(device); + else + reset_device_selector(); } void MainBar::on_device_changed() @@ -739,8 +746,12 @@ void MainBar::on_sample_rate_changed() void MainBar::on_config_changed() { + // We want to also call update_sample_rate_selector() here in case + // the user changed the SR_CONF_EXTERNAL_CLOCK option. However, + // commit_sample_rate() does this already, so we don't call it here + commit_sample_count(); - commit_sample_rate(); + commit_sample_rate(); } void MainBar::on_actionNewView_triggered() @@ -756,8 +767,8 @@ void MainBar::on_actionOpen_triggered() // Show the dialog const QString file_name = QFileDialog::getOpenFileName( this, tr("Open File"), dir, tr( - "Sigrok Sessions (*.sr);;" - "All Files (*.*)")); + "sigrok Sessions (*.sr);;" + "All Files (*)")); if (!file_name.isEmpty()) { session_.load_file(file_name); @@ -777,6 +788,40 @@ void MainBar::on_actionSaveSelectionAs_triggered() export_file(session_.device_manager().context()->output_formats()["srzip"], true); } +void MainBar::on_actionSaveSetup_triggered() +{ + QSettings settings; + const QString dir = settings.value(SettingSaveDirectory).toString(); + + const QString file_name = QFileDialog::getSaveFileName( + this, tr("Save File"), dir, tr( + "PulseView Session Setups (*.pvs);;" + "All Files (*)")); + + if (file_name.isEmpty()) + return; + + QSettings settings_storage(file_name, QSettings::IniFormat); + session_.save_setup(settings_storage); +} + +void MainBar::on_actionRestoreSetup_triggered() +{ + QSettings settings; + const QString dir = settings.value(SettingSaveDirectory).toString(); + + const QString file_name = QFileDialog::getOpenFileName( + this, tr("Open File"), dir, tr( + "PulseView Session Setups (*.pvs);;" + "All Files (*)")); + + if (file_name.isEmpty()) + return; + + QSettings settings_storage(file_name, QSettings::IniFormat); + session_.restore_setup(settings_storage); +} + void MainBar::on_actionConnect_triggered() { // Stop any currently running capture session @@ -792,6 +837,11 @@ void MainBar::on_actionConnect_triggered() update_device_list(); } +void MainBar::on_add_decoder_clicked() +{ + show_decoder_selector(&session_); +} + void MainBar::add_toolbar_widgets() { addAction(action_new_view_); @@ -816,8 +866,9 @@ void MainBar::add_toolbar_widgets() bool MainBar::eventFilter(QObject *watched, QEvent *event) { if (sample_count_supported_ && (watched == &sample_count_ || - watched == &sample_rate_) && - (event->type() == QEvent::ToolTip)) { + watched == &sample_rate_) && + (event->type() == QEvent::ToolTip)) { + auto sec = pv::util::Timestamp(sample_count_.value()) / sample_rate_.value(); QHelpEvent *help_event = static_cast(event);