StoreSession: Support output formats other than srzip

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

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index dc3a8e974355c515322d3fb30e1920f4148afaab..d9b4b88d540ebb285b1ea28e352e21003f978705 100644 (file)
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -18,65 +18,105 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "decoderoptions.h"
+#include <libsigrokdecode/libsigrokdecode.h>
 
-#include <boost/foreach.hpp>
-#include <boost/none_t.hpp>
+#include "decoderoptions.hpp"
 
-#include <pv/prop/int.h>
-#include <pv/prop/string.h>
+#include <boost/none_t.hpp>
 
-using namespace boost;
-using namespace std;
+#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::none;
+using std::make_pair;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 
 namespace pv {
 namespace prop {
 namespace binding {
 
-DecoderOptions::DecoderOptions(const srd_decoder *decoder,
-       GHashTable *options) :
-       _decoder(decoder),
-       _options(options)
+DecoderOptions::DecoderOptions(
+       shared_ptr<pv::data::DecoderStack> decoder_stack,
+       shared_ptr<data::decode::Decoder> decoder) :
+       decoder_stack_(decoder_stack),
+       decoder_(decoder)
 {
-       assert(decoder);
+       assert(decoder_);
 
+       const srd_decoder *const dec = decoder_->decoder();
+       assert(dec);
 
-       for (GSList *l = decoder->options; l; l = l->next)
+       for (GSList *l = dec->options; l; l = l->next)
        {
                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);
-               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);
+       }
+}
+
+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));
 }
 
-GVariant* DecoderOptions::getter(const char *id)
+Glib::VariantBase 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(_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());
+
                // Get the default value if not
-               for (GSList *l = _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;
@@ -88,15 +128,18 @@ GVariant* DecoderOptions::getter(const char *id)
        }
 
        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)
 {
-       g_variant_ref(value);
-       g_hash_table_insert(_options, (void*)g_strdup(id), value);
+       assert(decoder_);
+       decoder_->set_option(id, value.gobj());
+
+       assert(decoder_stack_);
+       decoder_stack_->begin_decode();
 }
 
 } // binding