Replaced lengthy iterator types with the auto keyword

[pulseview.git] / pv / prop / binding / decoderoptions.cpp

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 34f1b813a6478012ceec15eaa7f6d704784ab525..6e0630c00dd1d55f853c8614d97589b9566b12b6 100644 (file)
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -28,11 +28,19 @@
 
 #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>
 
-using namespace boost;
-using namespace std;
+using boost::bind;
+using boost::none;
+using boost::shared_ptr;
+using std::make_pair;
+using std::map;
+using std::pair;
+using std::string;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -54,7 +62,7 @@ DecoderOptions::DecoderOptions(
                const srd_decoder_option *const opt =
                        (srd_decoder_option*)l->data;
 
-               const QString name(opt->desc);
+               const QString name = QString::fromUtf8(opt->desc);
 
                const Property::Getter getter = bind(
                        &DecoderOptions::getter, this, opt->id);
@@ -63,7 +71,12 @@ DecoderOptions::DecoderOptions(
 
                shared_ptr<Property> prop;
 
-               if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
+               if (opt->values)
+                       prop = bind_enum(name, opt, getter, setter);
+               else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
+                       prop = shared_ptr<Property>(new Double(name, 2, "",
+                               none, none, getter, setter));
+               else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
                        prop = shared_ptr<Property>(
                                new Int(name, "", none, getter, setter));
                else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
@@ -76,15 +89,33 @@ DecoderOptions::DecoderOptions(
        }
 }
 
+shared_ptr<Property> DecoderOptions::bind_enum(
+       const QString &name, const srd_decoder_option *option,
+       Property::Getter getter, Property::Setter setter)
+{
+       vector< pair<GVariant*, QString> > values;
+       for (GSList *l = option->values; l; l = l->next) {
+               GVariant *const var = (GVariant*)l->data;
+               assert(var);
+               values.push_back(make_pair(var, print_gvariant(var)));
+       }
+
+       return shared_ptr<Property>(new Enum(name, values, getter, setter));
+}
+
 GVariant* DecoderOptions::getter(const char *id)
 {
+       GVariant *val = NULL;
+
        assert(_decoder);
 
        // Get the value from the hash table if it is already present
-       GVariant *val = (GVariant*)g_hash_table_lookup(
-               (GHashTable*)_decoder->options(), id);
+       const map<string, GVariant*>& options = _decoder->options();
+       const auto iter = options.find(id);
 
-       if (!val)
+       if (iter != options.end())
+               val = (*iter).second;
+       else
        {
                assert(_decoder->decoder());