projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Force trace replaint when a setting changes
[pulseview.git]
/
pv
/
binding
/
device.cpp
diff --git
a/pv/binding/device.cpp
b/pv/binding/device.cpp
index 845708e59626f3dea41fdbc183c7424ef0f87ccf..07d8ccc05249ffa3bed1be1f923fa15e3c3ef962 100644
(file)
--- a/
pv/binding/device.cpp
+++ b/
pv/binding/device.cpp
@@
-32,7
+32,6
@@
using boost::optional;
using std::function;
using boost::optional;
using std::function;
-using std::make_pair;
using std::pair;
using std::set;
using std::shared_ptr;
using std::pair;
using std::set;
using std::shared_ptr;
@@
-69,7
+68,7
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
string name_str;
try {
name_str = key->description();
string name_str;
try {
name_str = key->description();
- } catch (Error e) {
+ } catch (Error
&
e) {
name_str = key->name();
}
name_str = key->name();
}
@@
-89,8
+88,7
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
break;
case SR_CONF_CAPTURE_RATIO:
break;
case SR_CONF_CAPTURE_RATIO:
- bind_int(name, "%", pair<int64_t, int64_t>(0, 100),
- get, set);
+ bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100), get, set);
break;
case SR_CONF_PATTERN_MODE:
break;
case SR_CONF_PATTERN_MODE:
@@
-99,33
+97,40
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
case SR_CONF_TRIGGER_SLOPE:
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
case SR_CONF_TRIGGER_SLOPE:
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
- bind_enum(name, key, capabilities, get, set);
+ case SR_CONF_DATA_SOURCE:
+ case SR_CONF_EXTERNAL_CLOCK_SOURCE:
+ bind_enum(name, "", key, capabilities, get, set);
break;
case SR_CONF_FILTER:
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
case SR_CONF_POWER_OFF:
break;
case SR_CONF_FILTER:
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
case SR_CONF_POWER_OFF:
- bind_bool(name, get, set);
+ case SR_CONF_AVERAGING:
+ bind_bool(name, "", get, set);
break;
case SR_CONF_TIMEBASE:
break;
case SR_CONF_TIMEBASE:
- bind_enum(name, key, capabilities, 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, key, capabilities, 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, key, capabilities, get, set, print_voltage_threshold);
+ bind_enum(name,
"",
key, capabilities, get, set, print_voltage_threshold);
break;
case SR_CONF_PROBE_FACTOR:
if (capabilities.count(Capability::LIST))
break;
case SR_CONF_PROBE_FACTOR:
if (capabilities.count(Capability::LIST))
- bind_enum(name, key, capabilities, get, set, print_probe_factor);
+ bind_enum(name,
"",
key, capabilities, get, set, print_probe_factor);
else
else
- bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
+ bind_int(name, "", "", pair<int64_t, int64_t>(1, 500), get, set);
+ break;
+
+ case SR_CONF_AVG_SAMPLES:
+ bind_int(name, "", "", pair<int64_t, int64_t>(0, INT32_MAX), get, set);
break;
default:
break;
default:
@@
-134,43
+139,49
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
}
}
}
}
-void Device::bind_bool(const QString &name,
+void Device::bind_bool(const QString &name,
const QString &desc,
Property::Getter getter, Property::Setter setter)
{
assert(configurable_);
properties_.push_back(shared_ptr<Property>(new Bool(
Property::Getter getter, Property::Setter setter)
{
assert(configurable_);
properties_.push_back(shared_ptr<Property>(new Bool(
- name, getter, setter)));
+ name,
desc,
getter, setter)));
}
}
-void Device::bind_enum(const QString &name,
+void Device::bind_enum(const QString &name,
const QString &desc,
const ConfigKey *key, set<const Capability *> capabilities,
Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
const ConfigKey *key, set<const Capability *> capabilities,
Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
- Glib::VariantBase gvar;
- vector< pair<Glib::VariantBase, QString> > values;
-
assert(configurable_);
if (!capabilities.count(Capability::LIST))
return;
assert(configurable_);
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)));
+ try {
+ Glib::VariantContainerBase gvar = configurable_->config_list(key);
+ Glib::VariantIter iter(gvar);
+
+ vector< pair<Glib::VariantBase, QString> > values;
+ while ((iter.next_value(gvar)))
+ values.emplace_back(gvar, printer(gvar));
- properties_.push_back(shared_ptr<Property>(new Enum(name, values,
- getter, setter)));
+ properties_.push_back(shared_ptr<Property>(new Enum(name, desc, values,
+ getter, setter)));
+
+ } catch (sigrok::Error& e) {
+ qDebug() << "Error: Listing device key" << name << "failed!";
+ return;
+ }
}
}
-void Device::bind_int(const QString &name, QString suffix,
+void Device::bind_int(const QString &name,
const QString &desc,
QString suffix,
optional< pair<int64_t, int64_t> > range,
Property::Getter getter, Property::Setter setter)
{
assert(configurable_);
optional< pair<int64_t, int64_t> > range,
Property::Getter getter, Property::Setter setter)
{
assert(configurable_);
- properties_.push_back(shared_ptr<Property>(new Int(name,
suffix, range
,
- getter, setter)));
+ properties_.push_back(shared_ptr<Property>(new Int(name,
desc, suffix
,
+
range,
getter, setter)));
}
QString Device::print_timebase(Glib::VariantBase gvar)
}
QString Device::print_timebase(Glib::VariantBase gvar)
@@
-201,5
+212,5
@@
QString Device::print_probe_factor(Glib::VariantBase gvar)
return QString("%1x").arg(factor);
}
return QString("%1x").arg(factor);
}
-}
//
binding
-}
//
pv
+}
// namespace
binding
+}
// namespace
pv