#include <boost/foreach.hpp>
-#include <libsigrok/libsigrok.h>
-
#include <QAction>
#include <QDebug>
#include "samplingbar.h"
#include <pv/devicemanager.h>
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
#include <pv/popups/deviceoptions.h>
#include <pv/popups/probes.h>
}
void SamplingBar::set_device_list(
- const std::list< shared_ptr<pv::DevInst> > &devices)
+ const std::list< shared_ptr<pv::device::DevInst> > &devices)
{
_updating_device_selector = true;
_device_selector.clear();
_device_selector_map.clear();
- BOOST_FOREACH (shared_ptr<pv::DevInst> dev_inst, devices) {
+ BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices) {
assert(dev_inst);
const string title = dev_inst->format_device_title();
const sr_dev_inst *sdi = dev_inst->dev_inst();
}
_updating_device_selector = false;
-
- on_device_selected();
}
-shared_ptr<pv::DevInst> SamplingBar::get_selected_device() const
+shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
{
const int index = _device_selector.currentIndex();
if (index < 0)
- return shared_ptr<pv::DevInst>();
+ return shared_ptr<pv::device::DevInst>();
const sr_dev_inst *const sdi =
(const sr_dev_inst*)_device_selector.itemData(
index).value<void*>();
assert(sdi);
- map<const sr_dev_inst*, boost::weak_ptr<DevInst> >::
+ map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >::
const_iterator iter = _device_selector_map.find(sdi);
if (iter == _device_selector_map.end())
- return shared_ptr<pv::DevInst>();
+ return shared_ptr<pv::device::DevInst>();
- return shared_ptr<pv::DevInst>((*iter).second);
+ return shared_ptr<pv::device::DevInst>((*iter).second);
}
-void SamplingBar::set_selected_device(boost::shared_ptr<pv::DevInst> dev_inst)
+void SamplingBar::set_selected_device(shared_ptr<pv::device::DevInst> dev_inst)
{
assert(dev_inst);
for (int i = 0; i < _device_selector.count(); i++)
if (dev_inst->dev_inst() ==
_device_selector.itemData(i).value<void*>()) {
+ // Calling this leads to on_device_selected being
+ // invoked, which updates the sampling bar widgets.
_device_selector.setCurrentIndex(i);
return;
}
const uint64_t *elements = NULL;
gsize num_elements;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ if (_updating_sample_rate)
return;
- const sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
+ const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
+ assert(!_updating_sample_rate);
_updating_sample_rate = true;
- if (sr_config_list(sdi->driver, sdi, NULL,
- SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK)
+ if (!(gvar_dict = dev_inst->list_config(NULL, SR_CONF_SAMPLERATE)))
{
_sample_rate.show_none();
_updating_sample_rate = false;
GVariant *gvar;
uint64_t samplerate;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ if (_updating_sample_rate)
return;
- const sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
+ const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
- if (sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_SAMPLERATE, &gvar) != SR_OK) {
- qDebug() <<
- "WARNING: Failed to get value of sample rate";
+ if (!(gvar = dev_inst->get_config(NULL, SR_CONF_SAMPLERATE))) {
+ qDebug() << "WARNING: Failed to get value of sample rate";
return;
}
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
+ assert(!_updating_sample_rate);
_updating_sample_rate = true;
_sample_rate.set_value(samplerate);
_updating_sample_rate = false;
{
GVariant *gvar;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ if (_updating_sample_count)
return;
- const sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
+ const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
+ assert(!_updating_sample_count);
_updating_sample_count = true;
if (_sample_count_supported)
{
- uint64_t sample_count = DefaultSampleCount;
+ uint64_t sample_count = _sample_count.value();
uint64_t min_sample_count = 0;
uint64_t max_sample_count = MaxSampleCount;
- if (sr_config_list(sdi->driver, sdi, NULL,
- SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) {
+ if (sample_count == 0)
+ sample_count = DefaultSampleCount;
+
+ if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES)))
+ {
g_variant_get(gvar, "(tt)",
&min_sample_count, &max_sample_count);
g_variant_unref(gvar);
_sample_count.show_125_list(
min_sample_count, max_sample_count);
- if (sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK)
+ if ((gvar = dev_inst->get_config(NULL, SR_CONF_LIMIT_SAMPLES)))
{
sample_count = g_variant_get_uint64(gvar);
if (sample_count == 0)
{
uint64_t sample_count = 0;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ if (_updating_sample_count)
return;
- const sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
+ const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
sample_count = _sample_count.value();
// Set the sample count
- if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES,
- g_variant_new_uint64(sample_count)) != SR_OK) {
+ assert(!_updating_sample_count);
+ _updating_sample_count = true;
+ if (_sample_count_supported &&
+ !dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES,
+ g_variant_new_uint64(sample_count))) {
qDebug() << "Failed to configure sample count.";
return;
}
+ _updating_sample_count = false;
}
void SamplingBar::commit_sample_rate()
{
uint64_t sample_rate = 0;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ if (_updating_sample_rate)
return;
- const sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
+ const shared_ptr<device::DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
sample_rate = _sample_rate.value();
if (sample_rate == 0)
return;
// Set the samplerate
- if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
- g_variant_new_uint64(sample_rate)) != SR_OK) {
+ assert(!_updating_sample_rate);
+ _updating_sample_rate = true;
+ if (!dev_inst->set_config(NULL, SR_CONF_SAMPLERATE,
+ g_variant_new_uint64(sample_rate))) {
qDebug() << "Failed to configure samplerate.";
return;
}
+ _updating_sample_rate = false;
}
void SamplingBar::on_device_selected()
if (_updating_device_selector)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<device::DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
- const sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
-
_session.set_device(dev_inst);
// Update the configure popup
// Update supported options.
_sample_count_supported = false;
- if (sr_config_list(sdi->driver, sdi, NULL,
- SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
+ if ((gvar = dev_inst->list_config(NULL, SR_CONF_DEVICE_OPTIONS)))
{
gsize num_opts;
- const int *const options = (const int32_t *)g_variant_get_fixed_array(
- gvar, &num_opts, sizeof(int32_t));
+ const int *const options =
+ (const int32_t *)g_variant_get_fixed_array(
+ gvar, &num_opts, sizeof(int32_t));
for (unsigned int i = 0; i < num_opts; i++)
{
switch (options[i]) {
_sample_count_supported = true;
break;
case SR_CONF_LIMIT_FRAMES:
- sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES,
+ dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES,
g_variant_new_uint64(1));
break;
}
}
}
+ // Add notification of reconfigure events
+ disconnect(this, SLOT(on_config_changed()));
+ connect(dev_inst.get(), SIGNAL(config_changed()),
+ this, SLOT(on_config_changed()));
+
// Update sweep timing widgets.
update_sample_count_selector();
update_sample_rate_selector();
void SamplingBar::on_sample_count_changed()
{
- if(!_updating_sample_count)
- commit_sample_count();
+ commit_sample_count();
}
void SamplingBar::on_sample_rate_changed()
{
- if (!_updating_sample_rate)
- commit_sample_rate();
+ commit_sample_rate();
}
void SamplingBar::on_run_stop()
run_stop();
}
+void SamplingBar::on_config_changed()
+{
+ commit_sample_count();
+ update_sample_count_selector();
+ commit_sample_rate();
+ update_sample_rate_selector();
+}
+
} // namespace toolbars
} // namespace pv
projects / pulseview.git / blobdiff