X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=1a177fd65eea01c99d900ba68a54ac2c7e4fa875;hp=05952e0f94d87c897dd461b2e034dc62b8bbda12;hb=ae95fe5832e1f3d63d0f0f952629591aae3419cf;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index 05952e0f..1a177fd6 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -43,8 +43,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -56,13 +56,14 @@ #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; @@ -145,15 +146,15 @@ MainBar::MainBar(Session &session, QWidget *parent, 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))); + 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))); + SIGNAL(format_selected(shared_ptr)), + this, SLOT(import_file(shared_ptr))); action_connect_->setText(tr("&Connect to Device...")); connect(action_connect_, SIGNAL(triggered(bool)), @@ -163,9 +164,9 @@ MainBar::MainBar(Session &session, QWidget *parent, widgets::ImportMenu *import_menu = new widgets::ImportMenu(this, session.device_manager().context(), action_open_); connect(import_menu, - SIGNAL(format_selected(std::shared_ptr)), + SIGNAL(format_selected(shared_ptr)), this, - SLOT(import_file(std::shared_ptr))); + SLOT(import_file(shared_ptr))); open_button_->setMenu(import_menu); open_button_->setDefaultAction(action_open_); @@ -180,9 +181,9 @@ MainBar::MainBar(Session &session, QWidget *parent, session.device_manager().context(), open_actions); connect(export_menu, - SIGNAL(format_selected(std::shared_ptr)), + SIGNAL(format_selected(shared_ptr)), this, - SLOT(export_file(std::shared_ptr))); + SLOT(export_file(shared_ptr))); save_button_->setMenu(export_menu); save_button_->setDefaultAction(action_save_as_); @@ -202,6 +203,7 @@ MainBar::MainBar(Session &session, QWidget *parent, QIcon(":/icons/add-decoder.svg"))); add_decoder_button_->setPopupMode(QToolButton::InstantPopup); add_decoder_button_->setMenu(menu_decoders_add_); + add_decoder_button_->setToolTip(tr("Add low-level, non-stacked protocol decoder")); #endif connect(&sample_count_, SIGNAL(value_changed()), @@ -250,7 +252,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,7 +294,7 @@ 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(); @@ -403,9 +404,12 @@ void MainBar::update_sample_count_selector() uint64_t sample_count = sample_count_.value(); uint64_t min_sample_count = 0; uint64_t max_sample_count = MaxSampleCount; + bool default_count_set = false; - if (sample_count == 0) + if (sample_count == 0) { sample_count = DefaultSampleCount; + default_count_set = true; + } if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::LIST)) { auto gvar = sr_dev->config_list(ConfigKey::LIMIT_SAMPLES); @@ -417,14 +421,15 @@ void MainBar::update_sample_count_selector() 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); sample_count = g_variant_get_uint64(gvar.gobj()); - if (sample_count == 0) + if (sample_count == 0) { sample_count = DefaultSampleCount; + default_count_set = true; + } sample_count = min(max(sample_count, MinSampleCount), max_sample_count); } @@ -432,6 +437,10 @@ void MainBar::update_sample_count_selector() sample_count_.set_value(sample_count); updating_sample_count_ = false; + + // If we show the default rate then make sure the device uses the same + if (default_count_set) + commit_sample_count(); } void MainBar::update_device_config_widgets() @@ -572,8 +581,7 @@ void MainBar::add_decoder(srd_decoder *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; @@ -583,7 +591,7 @@ 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) { @@ -602,13 +610,14 @@ 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( + (double)0, start_time.convert_to() * samplerate); + const uint64_t end_sample = (uint64_t)max( + (double)0, end_time.convert_to() * samplerate); - sample_range = std::make_pair(start_sample, end_sample); + 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 @@ -731,7 +740,7 @@ void MainBar::on_sample_rate_changed() void MainBar::on_config_changed() { commit_sample_count(); - commit_sample_rate(); + commit_sample_rate(); } void MainBar::on_actionNewView_triggered()