#include <libsigrokdecode/libsigrokdecode.h>
-#include "decoderoptions.h"
+#include "decoderoptions.hpp"
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
#include <boost/none_t.hpp>
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/prop/int.h>
-#include <pv/prop/string.h>
+#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/decoder.hpp>
+#include <pv/prop/double.hpp>
+#include <pv/prop/enum.hpp>
+#include <pv/prop/int.hpp>
+#include <pv/prop/string.hpp>
-using boost::bind;
using boost::none;
-using boost::shared_ptr;
+using std::make_pair;
using std::map;
+using std::pair;
+using std::shared_ptr;
using std::string;
+using std::vector;
namespace pv {
namespace prop {
DecoderOptions::DecoderOptions(
shared_ptr<pv::data::DecoderStack> decoder_stack,
shared_ptr<data::decode::Decoder> decoder) :
- _decoder_stack(decoder_stack),
- _decoder(decoder)
+ decoder_stack_(decoder_stack),
+ decoder_(decoder)
{
- assert(_decoder);
+ assert(decoder_);
- const srd_decoder *const dec = _decoder->decoder();
+ const srd_decoder *const dec = decoder_->decoder();
assert(dec);
for (GSList *l = dec->options; l; l = l->next)
const QString name = QString::fromUtf8(opt->desc);
- const Property::Getter getter = bind(
- &DecoderOptions::getter, this, opt->id);
- const Property::Setter setter = bind(
- &DecoderOptions::setter, this, opt->id, _1);
+ const Property::Getter get = [&, opt]() {
+ return getter(opt->id); };
+ const Property::Setter set = [&, opt](Glib::VariantBase value) {
+ setter(opt->id, value); };
shared_ptr<Property> prop;
- if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
+ if (opt->values)
+ prop = bind_enum(name, opt, get, set);
+ else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
+ prop = shared_ptr<Property>(new Double(name, 2, "",
+ none, none, get, set));
+ else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
prop = shared_ptr<Property>(
- new Int(name, "", none, getter, setter));
+ new Int(name, "", none, get, set));
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
prop = shared_ptr<Property>(
- new String(name, getter, setter));
+ new String(name, get, set));
else
continue;
- _properties.push_back(prop);
+ properties_.push_back(prop);
}
}
-GVariant* DecoderOptions::getter(const char *id)
+shared_ptr<Property> DecoderOptions::bind_enum(
+ const QString &name, const srd_decoder_option *option,
+ Property::Getter getter, Property::Setter setter)
+{
+ vector< pair<Glib::VariantBase, QString> > values;
+ for (GSList *l = option->values; l; l = l->next) {
+ Glib::VariantBase var = Glib::VariantBase((GVariant*)l->data, true);
+ values.push_back(make_pair(var, print_gvariant(var)));
+ }
+
+ return shared_ptr<Property>(new Enum(name, values, getter, setter));
+}
+
+Glib::VariantBase DecoderOptions::getter(const char *id)
{
GVariant *val = NULL;
- assert(_decoder);
+ assert(decoder_);
// Get the value from the hash table if it is already present
- const map<string, GVariant*>& options = _decoder->options();
- map<string, GVariant*>::const_iterator iter = options.find(id);
+ const map<string, GVariant*>& options = decoder_->options();
+ const auto iter = options.find(id);
if (iter != options.end())
val = (*iter).second;
else
{
- assert(_decoder->decoder());
+ assert(decoder_->decoder());
// Get the default value if not
- for (GSList *l = _decoder->decoder()->options; l; l = l->next)
+ for (GSList *l = decoder_->decoder()->options; l; l = l->next)
{
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
}
if (val)
- g_variant_ref(val);
-
- return val;
+ return Glib::VariantBase(val, true);
+ else
+ return Glib::VariantBase();
}
-void DecoderOptions::setter(const char *id, GVariant *value)
+void DecoderOptions::setter(const char *id, Glib::VariantBase value)
{
- assert(_decoder);
- _decoder->set_option(id, value);
+ assert(decoder_);
+ decoder_->set_option(id, value.gobj());
- assert(_decoder_stack);
- _decoder_stack->begin_decode();
+ assert(decoder_stack_);
+ decoder_stack_->begin_decode();
}
} // binding