projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: document the purpose of sampling_mutex_.
[pulseview.git]
/
pv
/
binding
/
device.cpp
diff --git
a/pv/binding/device.cpp
b/pv/binding/device.cpp
index 224bc23a11079ea4593230a4637a2ff947e6886c..6f9788932c8dd0d4377d98771cee69ad6b6760e3 100644
(file)
--- a/
pv/binding/device.cpp
+++ b/
pv/binding/device.cpp
@@
-56,21
+56,22
@@
namespace binding {
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
configurable_(configurable)
{
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
configurable_(configurable)
{
-
assert(configurable)
;
+
std::map< const ConfigKey*, std::set<Capability> > keys
;
- for (auto entry : configurable->config_keys(ConfigKey::DEVICE_OPTIONS)) {
+ try {
+ keys = configurable->config_keys(ConfigKey::DEVICE_OPTIONS);
+ } catch (const Error) {
+ return;
+ }
+
+ for (auto entry : keys) {
auto key = entry.first;
auto capabilities = entry.second;
auto key = entry.first;
auto capabilities = entry.second;
- Glib::VariantContainerBase gvar_list;
-
if (!capabilities.count(Capability::GET) ||
!capabilities.count(Capability::SET))
continue;
if (!capabilities.count(Capability::GET) ||
!capabilities.count(Capability::SET))
continue;
- if (capabilities.count(Capability::LIST))
- gvar_list = configurable->config_list(key);
-
string name_str;
try {
name_str = key->description();
string name_str;
try {
name_str = key->description();
@@
-106,24
+107,29
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
case SR_CONF_FILTER:
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
case SR_CONF_FILTER:
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
- bind_enum(name,
gvar_list
, get, set);
+ bind_enum(name,
key, capabilities
, get, set);
break;
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
break;
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
+ case SR_CONF_POWER_OFF:
bind_bool(name, get, set);
break;
case SR_CONF_TIMEBASE:
bind_bool(name, get, set);
break;
case SR_CONF_TIMEBASE:
- bind_enum(name,
gvar_list
, get, set, print_timebase);
+ bind_enum(name,
key, capabilities
, get, set, print_timebase);
break;
case SR_CONF_VDIV:
break;
case SR_CONF_VDIV:
- bind_enum(name,
gvar_list
, get, set, print_vdiv);
+ bind_enum(name,
key, capabilities
, get, set, print_vdiv);
break;
case SR_CONF_VOLTAGE_THRESHOLD:
break;
case SR_CONF_VOLTAGE_THRESHOLD:
- bind_enum(name, gvar_list, get, set, print_voltage_threshold);
+ bind_enum(name, key, capabilities, get, set, print_voltage_threshold);
+ break;
+
+ case SR_CONF_PROBE_FACTOR:
+ bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
break;
default:
break;
default:
@@
-141,7
+147,8
@@
void Device::bind_bool(const QString &name,
}
void Device::bind_enum(const QString &name,
}
void Device::bind_enum(const QString &name,
- Glib::VariantContainerBase gvar_list, Property::Getter getter,
+ const ConfigKey *key, std::set<Capability> capabilities,
+ Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
Glib::VariantBase gvar;
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
Glib::VariantBase gvar;
@@
-149,7
+156,10
@@
void Device::bind_enum(const QString &name,
assert(configurable_);
assert(configurable_);
- Glib::VariantIter iter(gvar_list);
+ if (!capabilities.count(Capability::LIST))
+ return;
+
+ Glib::VariantIter iter(configurable_->config_list(key));
while ((iter.next_value(gvar)))
values.push_back(make_pair(gvar, printer(gvar)));
while ((iter.next_value(gvar)))
values.push_back(make_pair(gvar, printer(gvar)));