#include <assert.h>
-#include <boost/foreach.hpp>
-
#include <QAction>
#include <QDebug>
#include <QHelpEvent>
#include <QToolTip>
-#include "samplingbar.h"
+#include "samplingbar.hpp"
+
+#include <pv/devicemanager.hpp>
+#include <pv/mainwindow.hpp>
+#include <pv/popups/deviceoptions.hpp>
+#include <pv/popups/channels.hpp>
+#include <pv/util.hpp>
-#include <pv/devicemanager.h>
-#include <pv/device/devinst.h>
-#include <pv/popups/deviceoptions.h>
-#include <pv/popups/probes.h>
+#include <libsigrok/libsigrok.hpp>
-using boost::shared_ptr;
using std::map;
+using std::vector;
using std::max;
using std::min;
+using std::shared_ptr;
using std::string;
+using sigrok::Capability;
+using sigrok::ConfigKey;
+using sigrok::Device;
+using sigrok::Error;
+
namespace pv {
namespace toolbars {
const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
const uint64_t SamplingBar::DefaultSampleCount = 1000000;
-SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
- QToolBar("Sampling Bar", parent),
- _session(session),
- _device_selector(this),
- _updating_device_selector(false),
- _configure_button(this),
- _configure_button_action(NULL),
- _probes_button(this),
- _sample_count(" samples", this),
- _sample_rate("Hz", this),
- _updating_sample_rate(false),
- _updating_sample_count(false),
- _sample_count_supported(false),
- _icon_red(":/icons/status-red.svg"),
- _icon_green(":/icons/status-green.svg"),
- _icon_grey(":/icons/status-grey.svg"),
- _run_stop_button(this)
+SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
+ QToolBar("Sampling Bar", &main_window),
+ session_(session),
+ main_window_(main_window),
+ device_selector_(this),
+ updating_device_selector_(false),
+ configure_button_(this),
+ configure_button_action_(NULL),
+ channels_button_(this),
+ sample_count_(" samples", this),
+ sample_rate_("Hz", this),
+ updating_sample_rate_(false),
+ updating_sample_count_(false),
+ sample_count_supported_(false),
+ icon_red_(":/icons/status-red.svg"),
+ icon_green_(":/icons/status-green.svg"),
+ icon_grey_(":/icons/status-grey.svg"),
+ run_stop_button_(this)
{
- connect(&_run_stop_button, SIGNAL(clicked()),
+ setObjectName(QString::fromUtf8("SamplingBar"));
+
+ connect(&run_stop_button_, SIGNAL(clicked()),
this, SLOT(on_run_stop()));
- connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
+ connect(&device_selector_, SIGNAL(currentIndexChanged (int)),
this, SLOT(on_device_selected()));
- connect(&_sample_count, SIGNAL(value_changed()),
+ connect(&sample_count_, SIGNAL(value_changed()),
this, SLOT(on_sample_count_changed()));
- connect(&_sample_rate, SIGNAL(value_changed()),
+ connect(&sample_rate_, SIGNAL(value_changed()),
this, SLOT(on_sample_rate_changed()));
- _sample_count.show_min_max_step(0, UINT64_MAX, 1);
+ sample_count_.show_min_max_step(0, UINT64_MAX, 1);
- set_capture_state(pv::SigSession::Stopped);
+ set_capture_state(pv::Session::Stopped);
- _configure_button.setIcon(QIcon::fromTheme("configure",
+ configure_button_.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
- _probes_button.setIcon(QIcon::fromTheme("probes",
- QIcon(":/icons/probes.svg")));
+ channels_button_.setIcon(QIcon::fromTheme("channels",
+ QIcon(":/icons/channels.svg")));
- _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ run_stop_button_.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- addWidget(&_device_selector);
- _configure_button_action = addWidget(&_configure_button);
- addWidget(&_probes_button);
- addWidget(&_sample_count);
- addWidget(&_sample_rate);
+ addWidget(&device_selector_);
+ configure_button_action_ = addWidget(&configure_button_);
+ addWidget(&channels_button_);
+ addWidget(&sample_count_);
+ addWidget(&sample_rate_);
- addWidget(&_run_stop_button);
+ addWidget(&run_stop_button_);
- _sample_count.installEventFilter(this);
- _sample_rate.installEventFilter(this);
+ sample_count_.installEventFilter(this);
+ sample_rate_.installEventFilter(this);
}
void SamplingBar::set_device_list(
- const std::list< shared_ptr<pv::device::DevInst> > &devices,
- shared_ptr<pv::device::DevInst> selected)
+ const std::list< std::shared_ptr<sigrok::Device> > &devices,
+ shared_ptr<Device> selected)
{
int selected_index = -1;
assert(selected);
- _updating_device_selector = true;
+ updating_device_selector_ = true;
+
+ device_selector_.clear();
- _device_selector.clear();
- _device_selector_map.clear();
+ for (auto device : devices) {
+ assert(device);
- 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();
- assert(sdi);
+ string display_name =
+ session_.device_manager().get_display_name(device);
- if (selected == dev_inst)
- selected_index = _device_selector.count();
+ if (selected == device)
+ selected_index = device_selector_.count();
- _device_selector_map[sdi] = dev_inst;
- _device_selector.addItem(title.c_str(),
- qVariantFromValue((void*)sdi));
+ device_selector_.addItem(display_name.c_str(),
+ qVariantFromValue(device));
}
// The selected device should have been in the list
assert(selected_index != -1);
- _device_selector.setCurrentIndex(selected_index);
+ device_selector_.setCurrentIndex(selected_index);
update_device_config_widgets();
- _updating_device_selector = false;
+ updating_device_selector_ = false;
}
-shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
+shared_ptr<Device> SamplingBar::get_selected_device() const
{
- const int index = _device_selector.currentIndex();
+ const int index = device_selector_.currentIndex();
if (index < 0)
- return shared_ptr<pv::device::DevInst>();
+ return shared_ptr<Device>();
- 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<device::DevInst> >::
- const_iterator iter = _device_selector_map.find(sdi);
- if (iter == _device_selector_map.end())
- return shared_ptr<pv::device::DevInst>();
-
- return shared_ptr<pv::device::DevInst>((*iter).second);
+ return device_selector_.itemData(index).value<shared_ptr<Device>>();
}
-void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
+void SamplingBar::set_capture_state(pv::Session::capture_state state)
{
- const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green};
- _run_stop_button.setIcon(*icons[state]);
- _run_stop_button.setText((state == pv::SigSession::Stopped) ?
+ const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+ run_stop_button_.setIcon(*icons[state]);
+ run_stop_button_.setText((state == pv::Session::Stopped) ?
tr("Run") : tr("Stop"));
+ run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
}
void SamplingBar::update_sample_rate_selector()
{
- GVariant *gvar_dict, *gvar_list;
+ Glib::VariantContainerBase gvar_dict;
+ GVariant *gvar_list;
const uint64_t *elements = NULL;
gsize num_elements;
- if (_updating_sample_rate)
+ if (updating_sample_rate_)
return;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ const shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
- assert(!_updating_sample_rate);
- _updating_sample_rate = true;
+ assert(!updating_sample_rate_);
+ updating_sample_rate_ = true;
+
+ const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+ const auto iter = keys.find(ConfigKey::SAMPLERATE);
+ if (iter != keys.end() &&
+ (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+ const auto keys = device->config_keys(
+ ConfigKey::DEVICE_OPTIONS);
+ try {
+ gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
+ } catch(const sigrok::Error &e) {
+ // Failed to enunmerate samplerate
+ (void)e;
+ }
+ }
- if (!(gvar_dict = dev_inst->list_config(NULL, SR_CONF_SAMPLERATE)))
- {
- _sample_rate.show_none();
- _updating_sample_rate = false;
+ if (!gvar_dict) {
+ sample_rate_.show_none();
+ updating_sample_rate_ = false;
return;
}
- if ((gvar_list = g_variant_lookup_value(gvar_dict,
+ if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
"samplerate-steps", G_VARIANT_TYPE("at"))))
{
elements = (const uint64_t *)g_variant_get_fixed_array(
assert(step > 0);
if (step == 1)
- _sample_rate.show_125_list(min, max);
+ 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);
+ sample_rate_.show_min_max_step(min, max, step);
}
}
- else if ((gvar_list = g_variant_lookup_value(gvar_dict,
+ else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
"samplerates", G_VARIANT_TYPE("at"))))
{
elements = (const uint64_t *)g_variant_get_fixed_array(
gvar_list, &num_elements, sizeof(uint64_t));
- _sample_rate.show_list(elements, num_elements);
+ sample_rate_.show_list(elements, num_elements);
g_variant_unref(gvar_list);
}
- _updating_sample_rate = false;
+ updating_sample_rate_ = false;
- g_variant_unref(gvar_dict);
update_sample_rate_selector_value();
}
void SamplingBar::update_sample_rate_selector_value()
{
- GVariant *gvar;
- uint64_t samplerate;
-
- if (_updating_sample_rate)
+ if (updating_sample_rate_)
return;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ const shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
- if (!(gvar = dev_inst->get_config(NULL, SR_CONF_SAMPLERATE))) {
+ try {
+ auto gvar = device->config_get(ConfigKey::SAMPLERATE);
+ uint64_t samplerate =
+ Glib::VariantBase::cast_dynamic<Glib::Variant<guint64>>(gvar).get();
+ assert(!updating_sample_rate_);
+ updating_sample_rate_ = true;
+ sample_rate_.set_value(samplerate);
+ updating_sample_rate_ = false;
+ } catch (Error error) {
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;
}
void SamplingBar::update_sample_count_selector()
{
- GVariant *gvar;
-
- if (_updating_sample_count)
+ if (updating_sample_count_)
return;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ const shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
- assert(!_updating_sample_count);
- _updating_sample_count = true;
+ assert(!updating_sample_count_);
+ updating_sample_count_ = true;
- if (_sample_count_supported)
+ if (!sample_count_supported_)
{
- uint64_t sample_count = _sample_count.value();
- uint64_t min_sample_count = 0;
- uint64_t max_sample_count = MaxSampleCount;
-
- if (sample_count == 0)
- sample_count = DefaultSampleCount;
+ sample_count_.show_none();
+ updating_sample_count_ = false;
+ return;
+ }
- 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);
+ uint64_t sample_count = sample_count_.value();
+ uint64_t min_sample_count = 0;
+ uint64_t max_sample_count = MaxSampleCount;
+
+ if (sample_count == 0)
+ sample_count = DefaultSampleCount;
+
+ const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+ const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
+ if (iter != keys.end() &&
+ (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+ try {
+ auto gvar =
+ device->config_list(ConfigKey::LIMIT_SAMPLES);
+ if (gvar)
+ g_variant_get(gvar.gobj(), "(tt)",
+ &min_sample_count, &max_sample_count);
+ } catch(const sigrok::Error &e) {
+ // Failed to query sample limit
+ (void)e;
}
+ }
- min_sample_count = min(max(min_sample_count, MinSampleCount),
- max_sample_count);
+ min_sample_count = min(max(min_sample_count, MinSampleCount),
+ max_sample_count);
- _sample_count.show_125_list(
- min_sample_count, max_sample_count);
+ sample_count_.show_125_list(
+ min_sample_count, max_sample_count);
- if ((gvar = dev_inst->get_config(NULL, SR_CONF_LIMIT_SAMPLES)))
- {
- 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);
- }
+ try {
+ auto gvar = device->config_get(ConfigKey::LIMIT_SAMPLES);
+ sample_count = g_variant_get_uint64(gvar.gobj());
+ if (sample_count == 0)
+ sample_count = DefaultSampleCount;
+ sample_count = min(max(sample_count, MinSampleCount),
+ max_sample_count);
+ } catch (Error error) {}
- _sample_count.set_value(sample_count);
- }
- else
- _sample_count.show_none();
+ sample_count_.set_value(sample_count);
- _updating_sample_count = false;
+ updating_sample_count_ = false;
}
void SamplingBar::update_device_config_widgets()
{
- GVariant *gvar;
-
using namespace pv::popups;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ const shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
// Update the configure popup
- DeviceOptions *const opts = new DeviceOptions(dev_inst, this);
- _configure_button_action->setVisible(
+ DeviceOptions *const opts = new DeviceOptions(device, this);
+ configure_button_action_->setVisible(
!opts->binding().properties().empty());
- _configure_button.set_popup(opts);
+ configure_button_.set_popup(opts);
- // Update the probes popup
- Probes *const probes = new Probes(_session, this);
- _probes_button.set_popup(probes);
+ // Update the channels popup
+ Channels *const channels = new Channels(session_, this);
+ channels_button_.set_popup(channels);
// Update supported options.
- _sample_count_supported = false;
+ sample_count_supported_ = false;
- 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));
- for (unsigned int i = 0; i < num_opts; i++)
+ try {
+ for (auto entry : device->config_keys(ConfigKey::DEVICE_OPTIONS))
{
- switch (options[i]) {
+ auto key = entry.first;
+ auto capabilities = entry.second;
+ switch (key->id()) {
case SR_CONF_LIMIT_SAMPLES:
- _sample_count_supported = true;
+ if (capabilities.count(Capability::SET))
+ sample_count_supported_ = true;
break;
case SR_CONF_LIMIT_FRAMES:
- dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES,
- g_variant_new_uint64(1));
+ if (capabilities.count(Capability::SET))
+ {
+ device->config_set(ConfigKey::LIMIT_FRAMES,
+ Glib::Variant<guint64>::create(1));
+ on_config_changed();
+ }
+ break;
+ default:
break;
}
}
- }
+ } catch (Error error) {}
// Add notification of reconfigure events
disconnect(this, SLOT(on_config_changed()));
- connect(dev_inst.get(), SIGNAL(config_changed()),
+ connect(&opts->binding(), SIGNAL(config_changed()),
this, SLOT(on_config_changed()));
// Update sweep timing widgets.
{
uint64_t sample_count = 0;
- if (_updating_sample_count)
+ if (updating_sample_count_)
return;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ const shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
- sample_count = _sample_count.value();
+ sample_count = sample_count_.value();
// Set the sample count
- 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;
+ assert(!updating_sample_count_);
+ updating_sample_count_ = true;
+ if (sample_count_supported_)
+ {
+ try {
+ device->config_set(ConfigKey::LIMIT_SAMPLES,
+ Glib::Variant<guint64>::create(sample_count));
+ on_config_changed();
+ } catch (Error error) {
+ qDebug() << "Failed to configure sample count.";
+ return;
+ }
}
- _updating_sample_count = false;
+ updating_sample_count_ = false;
}
void SamplingBar::commit_sample_rate()
{
uint64_t sample_rate = 0;
- if (_updating_sample_rate)
+ if (updating_sample_rate_)
return;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ const shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
- sample_rate = _sample_rate.value();
+ sample_rate = sample_rate_.value();
if (sample_rate == 0)
return;
// Set the samplerate
- assert(!_updating_sample_rate);
- _updating_sample_rate = true;
- if (!dev_inst->set_config(NULL, SR_CONF_SAMPLERATE,
- g_variant_new_uint64(sample_rate))) {
+ assert(!updating_sample_rate_);
+ updating_sample_rate_ = true;
+ try {
+ device->config_set(ConfigKey::SAMPLERATE,
+ Glib::Variant<guint64>::create(sample_rate));
+ on_config_changed();
+ } catch (Error error) {
qDebug() << "Failed to configure samplerate.";
return;
}
- _updating_sample_rate = false;
+ updating_sample_rate_ = false;
}
void SamplingBar::on_device_selected()
{
- if (_updating_device_selector)
+ if (updating_device_selector_)
return;
- const shared_ptr<device::DevInst> dev_inst = get_selected_device();
- if (!dev_inst)
+ shared_ptr<Device> device = get_selected_device();
+ if (!device)
return;
- _session.set_device(dev_inst);
+ main_window_.select_device(device);
update_device_config_widgets();
}
{
commit_sample_count();
commit_sample_rate();
- run_stop();
+ main_window_.run_stop();
}
void SamplingBar::on_config_changed()
bool SamplingBar::eventFilter(QObject *watched, QEvent *event)
{
- if ((watched == &_sample_count || watched == &_sample_rate) &&
+ if ((watched == &sample_count_ || watched == &sample_rate_) &&
(event->type() == QEvent::ToolTip)) {
- double sec = (double)_sample_count.value() / _sample_rate.value();
-
- QString str;
- QTextStream(&str)
- << tr("Total sampling time: ")
- << fixed
- << qSetRealNumberPrecision(1)
- << sec
- << "s";
-
+ double sec = (double)sample_count_.value() / sample_rate_.value();
QHelpEvent *help_event = static_cast<QHelpEvent*>(event);
+
+ QString str = tr("Total sampling time: %1").arg(pv::util::format_second(sec));
QToolTip::showText(help_event->globalPos(), str);
return true;
projects / pulseview.git / blobdiff