X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=736ef80b1f4ffb9f64ffadbb574cb422eeafa512;hp=e77f18bb4e7ec861f32c55ccc38377080d9e5724;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index e77f18b..736ef80 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -61,9 +60,12 @@ 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; @@ -146,15 +148,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)), @@ -164,9 +166,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_); @@ -181,9 +183,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_); @@ -214,9 +216,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"))); + channels_button_.setToolTip(tr("Configure Channels")); channels_button_.setIcon(QIcon::fromTheme("channels", QIcon(":/icons/channels.svg"))); @@ -227,7 +231,7 @@ MainBar::MainBar(Session &session, QWidget *parent, // Setup session_ events connect(&session_, SIGNAL(capture_state_changed(int)), - this, SLOT(capture_state_changed(int))); + this, SLOT(on_capture_state_changed(int))); connect(&session, SIGNAL(device_changed()), this, SLOT(on_device_changed())); @@ -249,7 +253,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; @@ -292,7 +295,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(); @@ -402,9 +405,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); @@ -422,8 +428,10 @@ void MainBar::update_sample_count_selector() 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); } @@ -431,6 +439,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() @@ -561,11 +573,6 @@ void MainBar::show_session_error(const QString text, const QString info_text) msg.exec(); } -void MainBar::capture_state_changed(int state) -{ - set_capture_state((pv::Session::capture_state)state); -} - void MainBar::add_decoder(srd_decoder *decoder) { #ifdef ENABLE_DECODE @@ -587,7 +594,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) { @@ -606,13 +613,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 @@ -715,6 +723,11 @@ void MainBar::on_device_changed() 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_)