X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Finputoutput.cpp;h=9d2299afaf95fd767a5d7142fb71a606e3d97f0f;hp=d13ba196e3674ea29b46be4ca3b122bbb38f8f72;hb=bb19aac49414cc772a2a1e52730cbb2ca24b425c;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp index d13ba19..9d2299a 100644 --- a/pv/binding/inputoutput.cpp +++ b/pv/binding/inputoutput.cpp @@ -65,11 +65,12 @@ InputOutput::InputOutput( assert(opt); const QString name = QString::fromStdString(opt->name()); + const QString desc = QString::fromStdString(opt->description()); const VariantBase def_val = opt->default_value(); const vector values = opt->values(); options_[opt->id()] = def_val; - + const Property::Getter get = [&, opt]() { return options_[opt->id()]; }; const Property::Setter set = [&, opt](VariantBase value) { @@ -78,20 +79,20 @@ InputOutput::InputOutput( shared_ptr prop; if (!opt->values().empty()) - prop = bind_enum(name, values, get, set); + prop = bind_enum(name, desc, values, get, set); else if (def_val.is_of_type(VariantType("b"))) - prop = shared_ptr(new Bool(name, get, set)); + prop = shared_ptr(new Bool(name, desc, get, set)); else if (def_val.is_of_type(VariantType("d"))) - prop = shared_ptr(new Double(name, 2, "", + prop = shared_ptr(new Double(name, desc, 2, "", none, none, get, set)); else if (def_val.is_of_type(VariantType("i")) || def_val.is_of_type(VariantType("t")) || def_val.is_of_type(VariantType("u"))) prop = shared_ptr( - new Int(name, "", none, get, set)); + new Int(name, desc, "", none, get, set)); else if (def_val.is_of_type(VariantType("s"))) prop = shared_ptr( - new String(name, get, set)); + new String(name, desc, get, set)); else continue; @@ -105,13 +106,13 @@ const map& InputOutput::options() const } shared_ptr InputOutput::bind_enum( - const QString &name, const vector &values, + const QString &name, const QString &desc, const vector &values, Property::Getter getter, Property::Setter setter) { vector< pair > enum_vals; for (VariantBase var : values) enum_vals.push_back(make_pair(var, print_gvariant(var))); - return shared_ptr(new Enum(name, enum_vals, getter, setter)); + return shared_ptr(new Enum(name, desc, enum_vals, getter, setter)); } } // namespace binding