}
void SamplingBar::set_device_list(
- const std::map< shared_ptr<Device>, string > &device_names,
+ const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
shared_ptr<Device> selected)
{
int selected_index = -1;
_device_selector.clear();
- for (auto entry : device_names) {
+ for (auto entry : devices) {
auto device = entry.first;
- auto description = entry.second;
+ auto display_name = entry.second;
assert(device);
if (selected == device)
selected_index = _device_selector.count();
- _device_selector.addItem(description.c_str(),
+ _device_selector.addItem(display_name.c_str(),
qVariantFromValue(device));
}
_run_stop_button.setIcon(*icons[state]);
_run_stop_button.setText((state == pv::SigSession::Stopped) ?
tr("Run") : tr("Stop"));
+ _run_stop_button.setShortcut(QKeySequence(Qt::Key_Space));
}
void SamplingBar::update_sample_rate_selector()
try {
auto gvar = device->config_get(ConfigKey::SAMPLERATE);
uint64_t samplerate =
- Glib::VariantBase::cast_dynamic<Glib::Variant<uint64_t>>(gvar).get();
+ Glib::VariantBase::cast_dynamic<Glib::Variant<guint64>>(gvar).get();
assert(!_updating_sample_rate);
_updating_sample_rate = true;
_sample_rate.set_value(samplerate);
if (capabilities.count(Capability::SET))
{
device->config_set(ConfigKey::LIMIT_FRAMES,
- Glib::Variant<uint64_t>::create(1));
+ Glib::Variant<guint64>::create(1));
on_config_changed();
}
break;
{
try {
device->config_set(ConfigKey::LIMIT_SAMPLES,
- Glib::Variant<uint64_t>::create(sample_count));
+ Glib::Variant<guint64>::create(sample_count));
on_config_changed();
} catch (Error error) {
qDebug() << "Failed to configure sample count.";
_updating_sample_rate = true;
try {
device->config_set(ConfigKey::SAMPLERATE,
- Glib::Variant<uint64_t>::create(sample_rate));
+ Glib::Variant<guint64>::create(sample_rate));
on_config_changed();
} catch (Error error) {
qDebug() << "Failed to configure samplerate.";