* 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 "deviceoptions.hpp"
-#include <pv/devinst.h>
-#include <pv/prop/bool.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
+#include <pv/prop/bool.hpp>
+#include <pv/prop/double.hpp>
+#include <pv/prop/enum.hpp>
+#include <pv/prop/int.hpp>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
-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;
+using sigrok::Capability;
+using sigrok::Configurable;
+using sigrok::ConfigKey;
+using sigrok::Error;
+
namespace pv {
namespace prop {
namespace binding {
-DeviceOptions::DeviceOptions(shared_ptr<pv::DevInst> dev_inst,
- const sr_probe_group *group) :
- _dev_inst(dev_inst),
- _group(group)
+DeviceOptions::DeviceOptions(shared_ptr<sigrok::Configurable> configurable) :
+ configurable_(configurable)
{
- assert(dev_inst);
- sr_dev_inst *const sdi = dev_inst->dev_inst();
- assert(sdi);
+ assert(configurable);
- GVariant *gvar_opts, *gvar_list;
- gsize num_opts;
+ for (auto entry : configurable->config_keys(ConfigKey::DEVICE_OPTIONS)) {
+ auto key = entry.first;
+ auto capabilities = entry.second;
- if ((sr_config_list(sdi->driver, sdi, group, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts) != SR_OK))
- /* Driver supports no device instance options. */
- return;
+ Glib::VariantContainerBase gvar_list;
- const int *const options = (const int32_t *)g_variant_get_fixed_array(
- gvar_opts, &num_opts, sizeof(int32_t));
- for (unsigned int i = 0; i < num_opts; i++) {
- const struct sr_config_info *const info =
- sr_config_info_get(options[i]);
-
- if (!info)
+ if (!capabilities.count(Capability::GET) ||
+ !capabilities.count(Capability::SET))
continue;
- const int key = info->key;
+ if (capabilities.count(Capability::LIST))
+ gvar_list = configurable->config_list(key);
+
+ string name_str;
+ try {
+ name_str = key->description();
+ } catch (Error e) {
+ name_str = key->name();
+ }
- if (sr_config_list(sdi->driver, sdi, group,
- key, &gvar_list) != SR_OK)
- gvar_list = NULL;
+ const QString name = QString::fromStdString(name_str);
- const QString name = QString::fromUtf8(info->name);
+ const Property::Getter get = [&, key]() {
+ return configurable_->config_get(key); };
+ const Property::Setter set = [&, key](Glib::VariantBase value) {
+ configurable_->config_set(key, value);
+ config_changed();
+ };
- switch(key)
+ switch (key->id())
{
case SR_CONF_SAMPLERATE:
// Sample rate values are not bound because they are shown
- // in the SamplingBar
+ // in the MainBar
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, 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, gvar_list, get, set, print_timebase);
break;
case SR_CONF_VDIV:
- bind_enum(name, key, gvar_list, print_vdiv);
+ bind_enum(name, gvar_list, get, set, print_vdiv);
break;
case SR_CONF_VOLTAGE_THRESHOLD:
- bind_enum(name, key, gvar_list, print_voltage_threshold);
+ bind_enum(name, gvar_list, get, set, print_voltage_threshold);
break;
- }
-
- if (gvar_list)
- g_variant_unref(gvar_list);
- }
- g_variant_unref(gvar_opts);
-}
-GVariant* DeviceOptions::config_getter(
- const sr_dev_inst *sdi, const sr_probe_group *group, int key)
-{
- 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;
+ default:
+ break;
+ }
}
- 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)
+void DeviceOptions::bind_bool(const QString &name,
+ Property::Getter getter, Property::Setter setter)
{
- 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(configurable_);
+ 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)
+void DeviceOptions::bind_enum(const QString &name,
+ Glib::VariantContainerBase gvar_list, Property::Getter getter,
+ Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
- GVariant *gvar;
- GVariantIter iter;
- vector< pair<GVariant*, QString> > values;
-
- assert(gvar_list);
+ Glib::VariantBase gvar;
+ vector< pair<Glib::VariantBase, QString> > values;
- sr_dev_inst *const sdi = _dev_inst->dev_inst();
- assert(sdi);
+ assert(configurable_);
- g_variant_iter_init (&iter, gvar_list);
- while ((gvar = g_variant_iter_next_value (&iter)))
+ Glib::VariantIter iter(gvar_list);
+ while ((iter.next_value(gvar)))
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);
+ assert(configurable_);
- _properties.push_back(shared_ptr<Property>(
- new Int(name, suffix, range,
- bind(config_getter, sdi, _group, key),
- bind(config_setter, sdi, _group, key, _1))));
+ properties_.push_back(shared_ptr<Property>(new Int(name, suffix, range,
+ getter, setter)));
}
-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);
- }
-
- return s;
-}
-
-QString DeviceOptions::print_timebase(GVariant *const gvar)
+QString DeviceOptions::print_timebase(Glib::VariantBase gvar)
{
uint64_t p, q;
- g_variant_get(gvar, "(tt)", &p, &q);
+ g_variant_get(gvar.gobj(), "(tt)", &p, &q);
return QString::fromUtf8(sr_period_string(p * q));
}
-QString DeviceOptions::print_vdiv(GVariant *const gvar)
+QString DeviceOptions::print_vdiv(Glib::VariantBase gvar)
{
uint64_t p, q;
- g_variant_get(gvar, "(tt)", &p, &q);
+ g_variant_get(gvar.gobj(), "(tt)", &p, &q);
return QString::fromUtf8(sr_voltage_string(p, q));
}
-QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
+QString DeviceOptions::print_voltage_threshold(Glib::VariantBase 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);
+ g_variant_get(gvar.gobj(), "(dd)", &lo, &hi);
+ return QString("L<%1V H>%2V").arg(lo, 0, 'f', 1).arg(hi, 0, 'f', 1);
}
} // binding
} // prop
} // pv
-
projects / pulseview.git / blobdiff