projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.gitignore: Ignore QtCreator generated files.
[pulseview.git]
/
pv
/
prop
/
binding
/
decoderoptions.cpp
diff --git
a/pv/prop/binding/decoderoptions.cpp
b/pv/prop/binding/decoderoptions.cpp
index d9904852ca645e21f6b4b4d447a200860e301d94..a01d722f431f2a47feb2e258f73f48e25baa4ee2 100644
(file)
--- a/
pv/prop/binding/decoderoptions.cpp
+++ b/
pv/prop/binding/decoderoptions.cpp
@@
-22,22
+22,20
@@
#include "decoderoptions.h"
#include "decoderoptions.h"
-#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 <boost/none_t.hpp>
#include <pv/data/decoderstack.h>
#include <pv/data/decode/decoder.h>
+#include <pv/prop/double.h>
#include <pv/prop/enum.h>
#include <pv/prop/int.h>
#include <pv/prop/string.h>
#include <pv/prop/enum.h>
#include <pv/prop/int.h>
#include <pv/prop/string.h>
-using boost::bind;
using boost::none;
using boost::none;
-using boost::shared_ptr;
using std::make_pair;
using std::map;
using std::pair;
using std::make_pair;
using std::map;
using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-63,21
+61,24
@@
DecoderOptions::DecoderOptions(
const QString name = QString::fromUtf8(opt->desc);
const QString name = QString::fromUtf8(opt->desc);
- const Property::Getter get
ter = bind(
-
&DecoderOptions::getter, this, opt->id)
;
- const Property::Setter set
ter = 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 (opt->values)
shared_ptr<Property> prop;
if (opt->values)
- prop = bind_enum(name, opt, getter, setter);
+ 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>(
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
prop = shared_ptr<Property>(
- new Int(name, "", none, get
ter, setter
));
+ new Int(name, "", none, get
, set
));
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
prop = shared_ptr<Property>(
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
prop = shared_ptr<Property>(
- new String(name, get
ter, setter
));
+ new String(name, get
, set
));
else
continue;
else
continue;
@@
-89,17
+90,16
@@
shared_ptr<Property> DecoderOptions::bind_enum(
const QString &name, const srd_decoder_option *option,
Property::Getter getter, Property::Setter setter)
{
const QString &name, const srd_decoder_option *option,
Property::Getter getter, Property::Setter setter)
{
- vector< pair<G
Variant*
, QString> > values;
+ vector< pair<G
lib::VariantBase
, QString> > values;
for (GSList *l = option->values; l; l = l->next) {
for (GSList *l = option->values; l; l = l->next) {
- GVariant *const var = (GVariant*)l->data;
- assert(var);
+ 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));
}
values.push_back(make_pair(var, print_gvariant(var)));
}
return shared_ptr<Property>(new Enum(name, values, getter, setter));
}
-G
Variant*
DecoderOptions::getter(const char *id)
+G
lib::VariantBase
DecoderOptions::getter(const char *id)
{
GVariant *val = NULL;
{
GVariant *val = NULL;
@@
-107,7
+107,7
@@
GVariant* DecoderOptions::getter(const char *id)
// Get the value from the hash table if it is already present
const map<string, GVariant*>& options = _decoder->options();
// 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 auto
iter = options.find(id);
if (iter != options.end())
val = (*iter).second;
if (iter != options.end())
val = (*iter).second;
@@
-128,15
+128,15
@@
GVariant* DecoderOptions::getter(const char *id)
}
if (val)
}
if (val)
-
g_variant_ref(val
);
-
-
return val
;
+
return Glib::VariantBase(val, true
);
+ else
+
return Glib::VariantBase()
;
}
}
-void DecoderOptions::setter(const char *id, G
Variant *
value)
+void DecoderOptions::setter(const char *id, G
lib::VariantBase
value)
{
assert(_decoder);
{
assert(_decoder);
- _decoder->set_option(id, value);
+ _decoder->set_option(id, value
.gobj()
);
assert(_decoder_stack);
_decoder_stack->begin_decode();
assert(_decoder_stack);
_decoder_stack->begin_decode();