* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <boost/bind.hpp>
+#include <stdint.h>
#include <QDebug>
-#include <QObject>
-
-#include <stdint.h>
#include "deviceoptions.h"
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
#include <pv/prop/bool.h>
#include <pv/prop/double.h>
#include <pv/prop/enum.h>
#include <libsigrok/libsigrok.h>
-using boost::bind;
-using boost::function;
using boost::optional;
-using boost::shared_ptr;
+using std::function;
using std::make_pair;
using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
namespace prop {
namespace binding {
-DeviceOptions::DeviceOptions(shared_ptr<pv::DevInst> dev_inst,
- const sr_probe_group *group) :
+DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_channel_group *group) :
_dev_inst(dev_inst),
_group(group)
{
assert(dev_inst);
- sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
- GVariant *gvar_opts, *gvar_list;
+ GVariant *gvar_opts;
gsize num_opts;
- if ((sr_config_list(sdi->driver, sdi, group, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts) != SR_OK))
+ if (!(gvar_opts = dev_inst->list_config(group, SR_CONF_DEVICE_OPTIONS)))
/* Driver supports no device instance options. */
return;
continue;
const int key = info->key;
-
- if (sr_config_list(sdi->driver, sdi, group,
- key, &gvar_list) != SR_OK)
- gvar_list = NULL;
+ GVariant *const gvar_list = dev_inst->list_config(group, key);
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:
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:
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:
- bind_bool(name, key);
+ bind_bool(name, get, set);
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:
- bind_enum(name, key, gvar_list, print_vdiv);
+ bind_enum(name, key, gvar_list, get, set, print_vdiv);
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;
}
g_variant_unref(gvar_opts);
}
-GVariant* DeviceOptions::config_getter(
- const sr_dev_inst *sdi, const sr_probe_group *group, int key)
+void DeviceOptions::bind_bool(const QString &name,
+ Property::Getter getter, Property::Setter setter)
{
- GVariant *data = NULL;
- if (sr_config_get(sdi->driver, sdi, group, key, &data) != SR_OK) {
- qDebug() <<
- "WARNING: Failed to get value of config id" << key;
- return NULL;
- }
- return data;
-}
-
-void DeviceOptions::config_setter(
- const struct sr_dev_inst *sdi, const sr_probe_group *group, int key,
- GVariant* value)
-{
- if (sr_config_set(sdi, group, key, value) != SR_OK)
- qDebug() << "WARNING: Failed to set value of sample rate";
-}
-
-void DeviceOptions::bind_bool(const QString &name, int key)
-{
- sr_dev_inst *const sdi = _dev_inst->dev_inst();
- assert(sdi);
-
- _properties.push_back(shared_ptr<Property>(
- new Bool(name, bind(config_getter, sdi, _group, key),
- bind(config_setter, sdi, _group, key, _1))));
+ assert(_dev_inst);
+ _properties.push_back(shared_ptr<Property>(new Bool(
+ name, getter, setter)));
}
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(gvar_list);
-
- sr_dev_inst *const sdi = _dev_inst->dev_inst();
- assert(sdi);
+ assert(_dev_inst);
+ 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,
- bind(config_getter, sdi, _group, key),
- bind(config_setter, sdi, _group, key, _1))));
+ _properties.push_back(shared_ptr<Property>(new Enum(name, values,
+ 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)
{
- sr_dev_inst *const sdi = _dev_inst->dev_inst();
- assert(sdi);
-
- _properties.push_back(shared_ptr<Property>(
- new Int(name, suffix, range,
- bind(config_getter, sdi, _group, key),
- bind(config_setter, sdi, _group, key, _1))));
-}
-
-QString DeviceOptions::print_gvariant(GVariant *const gvar)
-{
- QString s;
-
- if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s")))
- s = QString::fromUtf8(g_variant_get_string(gvar, NULL));
- else
- {
- gchar *const text = g_variant_print(gvar, FALSE);
- s = QString::fromUtf8(text);
- g_free(text);
- }
+ assert(_dev_inst);
- return s;
+ _properties.push_back(shared_ptr<Property>(new Int(name, suffix, range,
+ getter, setter)));
}
QString DeviceOptions::print_timebase(GVariant *const gvar)
QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
{
gdouble lo, hi;
- char buf[64];
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
projects / pulseview.git / blobdiff