#include "samplingbar.h"
#include <pv/devicemanager.h>
+#include <pv/devinst.h>
#include <pv/popups/deviceoptions.h>
#include <pv/popups/probes.h>
+using boost::shared_ptr;
+using std::map;
+using std::max;
+using std::min;
using std::string;
namespace pv {
namespace toolbars {
-const uint64_t SamplingBar::DefaultRecordLength = 1000000;
+const uint64_t SamplingBar::MinSampleCount = 100ULL;
+const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
+const uint64_t SamplingBar::DefaultSampleCount = 1000000;
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
QToolBar("Sampling Bar", parent),
}
void SamplingBar::set_device_list(
- const std::list<struct sr_dev_inst*> &devices)
+ const std::list< shared_ptr<pv::DevInst> > &devices)
{
_updating_device_selector = true;
_device_selector.clear();
+ _device_selector_map.clear();
- BOOST_FOREACH (sr_dev_inst *sdi, devices) {
- const string title = DeviceManager::format_device_title(sdi);
+ BOOST_FOREACH (shared_ptr<pv::DevInst> dev_inst, devices) {
+ assert(dev_inst);
+ const string title = dev_inst->format_device_title();
+ const sr_dev_inst *sdi = dev_inst->dev_inst();
+ assert(sdi);
+
+ _device_selector_map[sdi] = dev_inst;
_device_selector.addItem(title.c_str(),
qVariantFromValue((void*)sdi));
}
on_device_selected();
}
-struct sr_dev_inst* SamplingBar::get_selected_device() const
+shared_ptr<pv::DevInst> SamplingBar::get_selected_device() const
{
const int index = _device_selector.currentIndex();
if (index < 0)
- return NULL;
+ return shared_ptr<pv::DevInst>();
+
+ const sr_dev_inst *const sdi =
+ (const sr_dev_inst*)_device_selector.itemData(
+ index).value<void*>();
+ assert(sdi);
- return (sr_dev_inst*)_device_selector.itemData(
- index).value<void*>();
+ map<const sr_dev_inst*, boost::weak_ptr<DevInst> >::
+ const_iterator iter = _device_selector_map.find(sdi);
+ if (iter == _device_selector_map.end())
+ return shared_ptr<pv::DevInst>();
+
+ return shared_ptr<pv::DevInst>((*iter).second);
}
-void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi)
+void SamplingBar::set_selected_device(boost::shared_ptr<pv::DevInst> dev_inst)
{
+ assert(dev_inst);
+
for (int i = 0; i < _device_selector.count(); i++)
- if (sdi == _device_selector.itemData(i).value<void*>()) {
+ if (dev_inst->dev_inst() ==
+ _device_selector.itemData(i).value<void*>()) {
_device_selector.setCurrentIndex(i);
return;
}
void SamplingBar::update_sample_rate_selector()
{
- const sr_dev_inst *const sdi = get_selected_device();
GVariant *gvar_dict, *gvar_list;
const uint64_t *elements = NULL;
gsize num_elements;
- if (!sdi)
+ const shared_ptr<DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
return;
+ const sr_dev_inst *const sdi = dev_inst->dev_inst();
+ assert(sdi);
+
_updating_sample_rate = true;
if (sr_config_list(sdi->driver, sdi, NULL,
{
elements = (const uint64_t *)g_variant_get_fixed_array(
gvar_list, &num_elements, sizeof(uint64_t));
- _sample_rate.show_min_max_step(elements[0], elements[1],
- elements[2]);
+
+ const uint64_t min = elements[0];
+ const uint64_t max = elements[1];
+ const uint64_t step = elements[2];
+
g_variant_unref(gvar_list);
+
+ assert(min > 0);
+ assert(max > 0);
+ assert(max > min);
+ assert(step > 0);
+
+ if (step == 1)
+ _sample_rate.show_125_list(min, max);
+ else
+ {
+ // When the step is not 1, we cam't make a 1-2-5-10
+ // list of sample rates, because we may not be able to
+ // make round numbers. Therefore in this case, show a
+ // spin box.
+ _sample_rate.show_min_max_step(min, max, step);
+ }
}
else if ((gvar_list = g_variant_lookup_value(gvar_dict,
"samplerates", G_VARIANT_TYPE("at"))))
void SamplingBar::update_sample_rate_selector_value()
{
- sr_dev_inst *const sdi = get_selected_device();
GVariant *gvar;
uint64_t samplerate;
+ const shared_ptr<DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
+
+ const sr_dev_inst *const sdi = dev_inst->dev_inst();
assert(sdi);
if (sr_config_get(sdi->driver, sdi, NULL,
void SamplingBar::update_sample_count_selector()
{
- sr_dev_inst *const sdi = get_selected_device();
GVariant *gvar;
- uint64_t samplecount = 0;
+ const shared_ptr<DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
+
+ const sr_dev_inst *const sdi = dev_inst->dev_inst();
assert(sdi);
- _sample_count_supported = false;
+ _updating_sample_count = true;
- if (sr_config_list(sdi->driver, sdi, NULL,
- SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
+ if (_sample_count_supported)
{
- gsize num_opts;
- 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++)
+ uint64_t sample_count = DefaultSampleCount;
+ 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) {
+ g_variant_get(gvar, "(tt)",
+ &min_sample_count, &max_sample_count);
+ g_variant_unref(gvar);
+ }
+
+ min_sample_count = min(max(min_sample_count, MinSampleCount),
+ max_sample_count);
+
+ _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 (options[i] == SR_CONF_LIMIT_SAMPLES)
- {
- _sample_count_supported = true;
- break;
- }
+ sample_count = g_variant_get_uint64(gvar);
+ if (sample_count == 0)
+ sample_count = DefaultSampleCount;
+ sample_count = min(max(sample_count, MinSampleCount),
+ max_sample_count);
+
+ g_variant_unref(gvar);
}
- }
- if (_sample_count_supported)
- _sample_count.show_min_max_step(0, UINT64_MAX, 1);
+ _sample_count.set_value(sample_count);
+ }
else
_sample_count.show_none();
- if (sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK)
- {
- samplecount = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- }
-
- _updating_sample_count = true;
- _sample_count.set_value(samplecount);
_updating_sample_count = false;
}
{
uint64_t sample_count = 0;
- sr_dev_inst *const sdi = get_selected_device();
+ const shared_ptr<DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
+
+ const sr_dev_inst *const sdi = dev_inst->dev_inst();
assert(sdi);
sample_count = _sample_count.value();
{
uint64_t sample_rate = 0;
- sr_dev_inst *const sdi = get_selected_device();
+ const shared_ptr<DevInst> dev_inst = get_selected_device();
+ if (!dev_inst)
+ return;
+
+ const sr_dev_inst *const sdi = dev_inst->dev_inst();
assert(sdi);
sample_rate = _sample_rate.value();
void SamplingBar::on_device_selected()
{
+ GVariant *gvar;
+
using namespace pv::popups;
if (_updating_device_selector)
return;
- sr_dev_inst *const sdi = get_selected_device();
- _session.set_device(sdi);
+ const shared_ptr<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
- DeviceOptions *const opts = new DeviceOptions(sdi, this);
+ DeviceOptions *const opts = new DeviceOptions(dev_inst, this);
_configure_button_action->setVisible(
!opts->binding().properties().empty());
_configure_button.set_popup(opts);
Probes *const probes = new Probes(_session, this);
_probes_button.set_popup(probes);
+ // Update supported options.
+ _sample_count_supported = false;
+
+ if (sr_config_list(sdi->driver, sdi, NULL,
+ SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
+ {
+ gsize num_opts;
+ 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]) {
+ case SR_CONF_LIMIT_SAMPLES:
+ _sample_count_supported = true;
+ break;
+ case SR_CONF_LIMIT_FRAMES:
+ sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES,
+ g_variant_new_uint64(1));
+ break;
+ }
+ }
+ }
+
// Update sweep timing widgets.
update_sample_count_selector();
update_sample_rate_selector();
-
- if (_sample_count_supported && _sample_count.value() == 0) {
- _sample_count.set_value(DefaultRecordLength);
- commit_sample_count();
- }
}
void SamplingBar::on_sample_count_changed()
void SamplingBar::on_run_stop()
{
+ commit_sample_count();
commit_sample_rate();
run_stop();
}
projects / pulseview.git / blobdiff