X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdecoder.cpp;h=f2e2e1d579f46eabe7b67104de3a103a6647055a;hp=b2b4e4f7e6728198713a67e8042b71b5e4ce0c8f;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hpb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416 diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp index b2b4e4f..f2e2e1d 100644 --- a/pv/binding/decoder.cpp +++ b/pv/binding/decoder.cpp @@ -72,16 +72,16 @@ Decoder::Decoder( shared_ptr prop; if (opt->values) - prop = bind_enum(name, opt, get, set); + prop = bind_enum(name, "", opt, get, set); else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d"))) - prop = shared_ptr(new Double(name, 2, "", + prop = shared_ptr(new Double(name, "", 2, "", none, none, get, set)); else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x"))) prop = shared_ptr( - new Int(name, "", none, get, set)); + new Int(name, "", "", none, get, set)); else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s"))) prop = shared_ptr( - new String(name, get, set)); + new String(name, "", get, set)); else continue; @@ -90,7 +90,8 @@ Decoder::Decoder( } shared_ptr Decoder::bind_enum( - const QString &name, const srd_decoder_option *option, + const QString &name, const QString &desc, + const srd_decoder_option *option, Property::Getter getter, Property::Setter setter) { vector< pair > values; @@ -99,7 +100,7 @@ shared_ptr Decoder::bind_enum( values.push_back(make_pair(var, print_gvariant(var))); } - return shared_ptr(new Enum(name, values, getter, setter)); + return shared_ptr(new Enum(name, desc, values, getter, setter)); } Glib::VariantBase Decoder::getter(const char *id)