X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsamplingbar.cpp;h=6eea6d78040af5b8be211e5037294a1e819139bc;hp=02e4e71d00693cb2070133608f918abde72d5767;hb=488883133fefe0af41737cea9b2fc9eb114042b8;hpb=6ac96c2e0ef986da9c9ebea50906cb717aa382ba diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp index 02e4e71d..6eea6d78 100644 --- a/pv/samplingbar.cpp +++ b/pv/samplingbar.cpp @@ -18,21 +18,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include -#include +#include -extern "C" { #include -} #include +#include #include "samplingbar.h" +#include + namespace pv { -const uint64_t SamplingBar::RecordLengths[11] = { +const uint64_t SamplingBar::RecordLengths[20] = { + 1000, + 2500, + 5000, + 10000, + 25000, + 50000, + 100000, + 250000, + 500000, 1000000, 2000000, 5000000, @@ -43,47 +53,70 @@ const uint64_t SamplingBar::RecordLengths[11] = { 250000000, 500000000, 1000000000, - 10000000000 + 10000000000ULL, }; +const uint64_t SamplingBar::DefaultRecordLength = 1000000; + SamplingBar::SamplingBar(QWidget *parent) : QToolBar("Sampling Bar", parent), _device_selector(this), + _configure_button(this), _record_length_selector(this), _sample_rate_list(this), + _icon_green(":/icons/status-green.svg"), + _icon_grey(":/icons/status-grey.svg"), _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"); - BOOST_FOREACH(uint64_t l, RecordLengths) + for (size_t i = 0; i < countof(RecordLengths); i++) { + const uint64_t &l = RecordLengths[i]; char *const text = sr_si_string_u64(l, " samples"); _record_length_selector.addItem(QString(text), qVariantFromValue(l)); g_free(text); + + if (l == DefaultRecordLength) + _record_length_selector.setCurrentIndex(i); } set_sampling(false); + _configure_button.setIcon(QIcon::fromTheme("configure", + QIcon(":/icons/configure.png"))); + + _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + 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); addWidget(&_run_stop_button); update_device_selector(); + update_sample_rate_selector(); + connect(&_sample_rate_list, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_sample_rate_changed())); + connect(&_sample_rate_value, SIGNAL(valueChanged(double)), + this, SLOT(on_sample_rate_changed())); } 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,33 +126,15 @@ 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(); } -uint64_t SamplingBar::get_sample_rate() const -{ - assert(_sample_rate_value_action); - assert(_sample_rate_list_action); - - if(_sample_rate_value_action->isVisible()) - return (uint64_t)_sample_rate_value.value(); - else if(_sample_rate_list_action->isVisible()) - { - const int index = _sample_rate_list.currentIndex(); - if(index < 0) - return 0; - - return _sample_rate_list.itemData(index).value(); - } - - return 0; -} - void SamplingBar::set_sampling(bool sampling) { + _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey); _run_stop_button.setText(sampling ? "Stop" : "Run"); } @@ -162,7 +177,7 @@ void SamplingBar::update_sample_rate_selector() assert(_sample_rate_value_action); assert(_sample_rate_list_action); - if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES, + if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE, (const void **)&samplerates, sdi) != SR_OK) return; @@ -187,6 +202,63 @@ void SamplingBar::update_sample_rate_selector() _sample_rate_list.show(); _sample_rate_list_action->setVisible(true); } + + update_sample_rate_selector_value(); +} + +void SamplingBar::update_sample_rate_selector_value() +{ + sr_dev_inst *const sdi = get_selected_device(); + assert(sdi); + + uint64_t *samplerate = NULL; + if(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, + (const void**)&samplerate, sdi) != SR_OK) { + qDebug() << + "WARNING: Failed to get value of sample rate"; + return; + } + + assert(_sample_rate_value_action); + assert(_sample_rate_list_action); + + if (_sample_rate_value_action->isVisible()) + _sample_rate_value.setValue(*samplerate); + else if (_sample_rate_list_action->isVisible()) + { + for(int i = 0; i < _sample_rate_list.count(); i++) + if(*samplerate == _sample_rate_list.itemData( + i).value()) + _sample_rate_list.setCurrentIndex(i); + } +} + +void SamplingBar::commit_sample_rate() +{ + uint64_t sample_rate = 0; + + sr_dev_inst *const sdi = get_selected_device(); + assert(sdi); + + assert(_sample_rate_value_action); + assert(_sample_rate_list_action); + + if (_sample_rate_value_action->isVisible()) + sample_rate = (uint64_t)_sample_rate_value.value(); + else if (_sample_rate_list_action->isVisible()) + { + const int index = _sample_rate_list.currentIndex(); + if (index >= 0) + sample_rate = _sample_rate_list.itemData( + index).value(); + } + + // Set the samplerate + if (sr_config_set(sdi, SR_CONF_SAMPLERATE, + &sample_rate) != SR_OK) { + qDebug() << "Failed to configure samplerate."; + return; + } } void SamplingBar::on_device_selected() @@ -194,4 +266,22 @@ void SamplingBar::on_device_selected() update_sample_rate_selector(); } +void SamplingBar::on_sample_rate_changed() +{ + commit_sample_rate(); +} + +void SamplingBar::configure() +{ + commit_sample_rate(); + + sr_dev_inst *const sdi = get_selected_device(); + assert(sdi); + + pv::dialogs::DeviceOptions dlg(this, sdi); + dlg.exec(); + + update_sample_rate_selector_value(); +} + } // namespace pv