projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
property: add the necessary include file for std::function
[pulseview.git]
/
pv
/
prop
/
binding
/
deviceoptions.cpp
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index 26d4ef2a8fabe72dd3047525ca7e7c22112f0e99..8811b6f3a21f73976a09a207203bd4184ad50ee0 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-18,10
+18,10
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <boost/bind.hpp>
-
#include <stdint.h>
#include <stdint.h>
+#include <QDebug>
+
#include "deviceoptions.h"
#include <pv/device/devinst.h>
#include "deviceoptions.h"
#include <pv/device/devinst.h>
@@
-32,12
+32,11
@@
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
-using boost::bind;
-using boost::function;
using boost::optional;
using boost::optional;
-using
boost::shared_ptr
;
+using
std::function
;
using std::make_pair;
using std::pair;
using std::make_pair;
using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-46,7
+45,7
@@
namespace prop {
namespace binding {
DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
namespace binding {
DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
- const sr_
probe
_group *group) :
+ const sr_
channel
_group *group) :
_dev_inst(dev_inst),
_group(group)
{
_dev_inst(dev_inst),
_group(group)
{
@@
-73,6
+72,11
@@
DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
const QString name = QString::fromUtf8(info->name);
const QString name = QString::fromUtf8(info->name);
+ const Property::Getter get = [&, key]() {
+ return _dev_inst->get_config(_group, key); };
+ const Property::Setter set = [&, key](GVariant *value) {
+ _dev_inst->set_config(_group, key, value); };
+
switch(key)
{
case SR_CONF_SAMPLERATE:
switch(key)
{
case SR_CONF_SAMPLERATE:
@@
-81,7
+85,8
@@
DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
break;
case SR_CONF_CAPTURE_RATIO:
break;
case SR_CONF_CAPTURE_RATIO:
- bind_int(name, key, "%", pair<int64_t, int64_t>(0, 100));
+ bind_int(name, "%", pair<int64_t, int64_t>(0, 100),
+ get, set);
break;
case SR_CONF_PATTERN_MODE:
break;
case SR_CONF_PATTERN_MODE:
@@
-91,24
+96,26
@@
DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
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, key, gvar_list);
+ bind_enum(name, key, gvar_list
, get, set
);
break;
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
break;
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
- bind_bool(name,
key
);
+ bind_bool(name,
get, set
);
break;
case SR_CONF_TIMEBASE:
break;
case SR_CONF_TIMEBASE:
- bind_enum(name, key, gvar_list, print_timebase);
+ bind_enum(name, key, gvar_list,
+ get, set, print_timebase);
break;
case SR_CONF_VDIV:
break;
case SR_CONF_VDIV:
- bind_enum(name, key, gvar_list, print_vdiv);
+ bind_enum(name, key, gvar_list,
get, set,
print_vdiv);
break;
case SR_CONF_VOLTAGE_THRESHOLD:
break;
case SR_CONF_VOLTAGE_THRESHOLD:
- bind_enum(name, key, gvar_list, print_voltage_threshold);
+ bind_enum(name, key, gvar_list,
+ get, set, print_voltage_threshold);
break;
}
break;
}
@@
-118,43
+125,45
@@
DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
g_variant_unref(gvar_opts);
}
g_variant_unref(gvar_opts);
}
-void DeviceOptions::bind_bool(const QString &name, int key)
+void DeviceOptions::bind_bool(const QString &name,
+ Property::Getter getter, Property::Setter setter)
{
assert(_dev_inst);
{
assert(_dev_inst);
- _properties.push_back(shared_ptr<Property>(new Bool(name,
- bind(&device::DevInst::get_config, _dev_inst, _group, key),
- bind(&device::DevInst::set_config, _dev_inst,
- _group, key, _1))));
+ _properties.push_back(shared_ptr<Property>(new Bool(
+ name, getter, setter)));
}
void DeviceOptions::bind_enum(const QString &name, int key,
}
void DeviceOptions::bind_enum(const QString &name, int key,
- GVariant *const gvar_list, function<QString (GVariant*)> printer)
+ GVariant *const gvar_list, Property::Getter getter,
+ Property::Setter setter, function<QString (GVariant*)> printer)
{
GVariant *gvar;
GVariantIter iter;
vector< pair<GVariant*, QString> > values;
assert(_dev_inst);
{
GVariant *gvar;
GVariantIter iter;
vector< pair<GVariant*, QString> > values;
assert(_dev_inst);
- assert(gvar_list);
+ if (!gvar_list) {
+ qDebug() << "Config key " << key << " was listed, but no "
+ "options were given";
+ return;
+ }
g_variant_iter_init (&iter, gvar_list);
while ((gvar = g_variant_iter_next_value (&iter)))
values.push_back(make_pair(gvar, printer(gvar)));
_properties.push_back(shared_ptr<Property>(new Enum(name, values,
g_variant_iter_init (&iter, gvar_list);
while ((gvar = g_variant_iter_next_value (&iter)))
values.push_back(make_pair(gvar, printer(gvar)));
_properties.push_back(shared_ptr<Property>(new Enum(name, values,
- bind(&device::DevInst::get_config, _dev_inst, _group, key),
- bind(&device::DevInst::set_config, _dev_inst,
- _group, key, _1))));
+ getter, setter)));
}
}
-void DeviceOptions::bind_int(const QString &name, int key, QString suffix,
- optional< std::pair<int64_t, int64_t> > range)
+void DeviceOptions::bind_int(const QString &name, QString suffix,
+ optional< std::pair<int64_t, int64_t> > range,
+ Property::Getter getter, Property::Setter setter)
{
assert(_dev_inst);
_properties.push_back(shared_ptr<Property>(new Int(name, suffix, range,
{
assert(_dev_inst);
_properties.push_back(shared_ptr<Property>(new Int(name, suffix, range,
- bind(&device::DevInst::get_config, _dev_inst, _group, key),
- bind(&device::DevInst::set_config, _dev_inst, _group, key, _1))));
+ getter, setter)));
}
QString DeviceOptions::print_timebase(GVariant *const gvar)
}
QString DeviceOptions::print_timebase(GVariant *const gvar)
@@
-174,10
+183,8
@@
QString DeviceOptions::print_vdiv(GVariant *const gvar)
QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
{
gdouble lo, hi;
QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
{
gdouble lo, hi;
- char buf[64];
g_variant_get(gvar, "(dd)", &lo, &hi);
g_variant_get(gvar, "(dd)", &lo, &hi);
- snprintf(buf, sizeof(buf), "L<%.1fV H>%.1fV", lo, hi);
- return QString::fromUtf8(buf);
+ return QString("L<%1V H>%2V").arg(lo, 0, 'f', 1).arg(hi, 0, 'f', 1);
}
} // binding
}
} // binding