X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsamplingbar.cpp;h=08cb0f34e015121af17b0ef9777bdc563051d1b7;hp=02e4e71d00693cb2070133608f918abde72d5767;hb=688ef6454b81bf0b9db0b5e734c6df4a932b143d;hpb=6ac96c2e0ef986da9c9ebea50906cb717aa382ba diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp index 02e4e71d..08cb0f34 100644 --- a/pv/samplingbar.cpp +++ b/pv/samplingbar.cpp @@ -30,6 +30,8 @@ extern "C" { #include "samplingbar.h" +#include + namespace pv { const uint64_t SamplingBar::RecordLengths[11] = { @@ -49,13 +51,17 @@ const uint64_t SamplingBar::RecordLengths[11] = { SamplingBar::SamplingBar(QWidget *parent) : QToolBar("Sampling Bar", parent), _device_selector(this), + _configure_button(this), _record_length_selector(this), _sample_rate_list(this), _run_stop_button(this) { - connect(&_run_stop_button, SIGNAL(clicked()), this, SIGNAL(run_stop())); + connect(&_run_stop_button, SIGNAL(clicked()), + this, SIGNAL(run_stop())); connect(&_device_selector, SIGNAL(currentIndexChanged (int)), this, SLOT(on_device_selected())); + connect(&_configure_button, SIGNAL(clicked()), + this, SLOT(configure())); _sample_rate_value.setDecimals(0); _sample_rate_value.setSuffix("Hz"); @@ -70,7 +76,11 @@ SamplingBar::SamplingBar(QWidget *parent) : set_sampling(false); + _configure_button.setIcon(QIcon::fromTheme("configure", + QIcon(":/icons/configure.png"))); + addWidget(&_device_selector); + addWidget(&_configure_button); addWidget(&_record_length_selector); _sample_rate_list_action = addWidget(&_sample_rate_list); _sample_rate_value_action = addWidget(&_sample_rate_value); @@ -83,7 +93,7 @@ SamplingBar::SamplingBar(QWidget *parent) : struct sr_dev_inst* SamplingBar::get_selected_device() const { const int index = _device_selector.currentIndex(); - if(index < 0) + if (index < 0) return NULL; return (sr_dev_inst*)_device_selector.itemData( @@ -93,7 +103,7 @@ struct sr_dev_inst* SamplingBar::get_selected_device() const uint64_t SamplingBar::get_record_length() const { const int index = _record_length_selector.currentIndex(); - if(index < 0) + if (index < 0) return 0; return _record_length_selector.itemData(index).value(); @@ -104,12 +114,12 @@ uint64_t SamplingBar::get_sample_rate() const assert(_sample_rate_value_action); assert(_sample_rate_list_action); - if(_sample_rate_value_action->isVisible()) + if (_sample_rate_value_action->isVisible()) return (uint64_t)_sample_rate_value.value(); - else if(_sample_rate_list_action->isVisible()) + else if (_sample_rate_list_action->isVisible()) { const int index = _sample_rate_list.currentIndex(); - if(index < 0) + if (index < 0) return 0; return _sample_rate_list.itemData(index).value(); @@ -194,4 +204,13 @@ void SamplingBar::on_device_selected() update_sample_rate_selector(); } +void SamplingBar::configure() +{ + sr_dev_inst *const sdi = get_selected_device(); + assert(sdi); + + pv::dialogs::HwCap dlg(this, sdi); + dlg.exec(); +} + } // namespace pv