Added InputOutput binding

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6848be500153ac15381d6082391ab041fc92d825..99314d05e8213fc9bb1e95c92fa568836169b37c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,6 +147,7 @@ set(pulseview_SOURCES
        pv/storesession.cpp
        pv/util.cpp
        pv/binding/binding.cpp
        pv/storesession.cpp
        pv/util.cpp
        pv/binding/binding.cpp

+       pv/binding/inputoutput.cpp

        pv/binding/device.cpp
        pv/data/analog.cpp
        pv/data/analogsegment.cpp
        pv/binding/device.cpp
        pv/data/analog.cpp
        pv/data/analogsegment.cpp

diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp
new file mode 100644 (file)
index 0000000..42ebf06
--- /dev/null
+++ b/pv/binding/inputoutput.cpp
@@ -0,0 +1,114 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2015 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <cassert>
+#include <iostream>
+#include <utility>
+
+#include <boost/none_t.hpp>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+#include <pv/prop/double.hpp>
+#include <pv/prop/enum.hpp>
+#include <pv/prop/int.hpp>
+#include <pv/prop/string.hpp>
+
+#include "inputoutput.hpp"
+
+using boost::none;
+
+using std::make_pair;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+
+using Glib::VariantBase;
+using Glib::VariantType;
+
+using sigrok::Option;
+
+using pv::prop::Double;
+using pv::prop::Enum;
+using pv::prop::Int;
+using pv::prop::Property;
+using pv::prop::String;
+
+namespace pv {
+namespace binding {
+
+InputOutput::InputOutput(
+       const map<string, shared_ptr<Option>> &options)
+{
+       for (pair<string, shared_ptr<Option>> o : options)
+       {
+               const shared_ptr<Option> &opt = o.second;
+               assert(opt);
+
+               const QString name = QString::fromStdString(opt->name());
+               const VariantBase def_val = opt->default_value();
+               const vector<VariantBase> values = opt->values();
+
+               options_[opt->id()] = def_val;
+ 
+               const Property::Getter get = [&, opt]() {
+                       return options_[opt->id()]; };
+               const Property::Setter set = [&, opt](VariantBase value) {
+                       options_[opt->id()] = value; };
+
+               shared_ptr<Property> prop;
+
+               if (!opt->values().empty())
+                       prop = bind_enum(name, values, get, set);
+               else if (def_val.is_of_type(VariantType("d")))
+                       prop = shared_ptr<Property>(new Double(name, 2, "",
+                               nullptr, nullptr, get, set));
+               else if (def_val.is_of_type(VariantType("u")))
+                       prop = shared_ptr<Property>(
+                               new Int(name, "", none, get, set));
+               else if (def_val.is_of_type(VariantType("s")))
+                       prop = shared_ptr<Property>(
+                               new String(name, get, set));
+               else
+                       continue;
+
+               properties_.push_back(prop);
+       }
+}
+
+const map<string, VariantBase>& InputOutput::options() const
+{
+       return options_;
+}
+
+shared_ptr<Property> InputOutput::bind_enum(
+       const QString &name, const vector<VariantBase> &values,
+       Property::Getter getter, Property::Setter setter)
+{
+       vector< pair<VariantBase, QString> > enum_vals;
+       for (VariantBase var : values)
+               enum_vals.push_back(make_pair(var, print_gvariant(var)));
+       return shared_ptr<Property>(new Enum(name, enum_vals, getter, setter));
+}
+
+} // namespace binding
+} // namespace pv

diff --git a/pv/binding/inputoutput.hpp b/pv/binding/inputoutput.hpp
new file mode 100644 (file)
index 0000000..628b1c4
--- /dev/null
+++ b/pv/binding/inputoutput.hpp
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2015 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef PULSEVIEW_PV_BINDING_INPUTOUTPUT_HPP
+#define PULSEVIEW_PV_BINDING_INPUTOUTPUT_HPP
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include "binding.hpp"
+
+#include <pv/prop/property.hpp>
+
+namespace sigrok {
+class Option;
+}
+
+namespace pv {
+namespace binding {
+
+/**
+ * A binding of glibmm variants for sigrok input and output options.
+ */
+class InputOutput : public Binding
+{
+public:
+       /**
+        * Constructs a new @c InputOutput binding.
+        * @param options the map of options to use as a template.
+        */
+       InputOutput(
+               const std::map<std::string, std::shared_ptr<sigrok::Option>>
+                       &options);
+
+       /**
+        * Gets the map of selected options.
+        * @return the options.
+        */
+       const std::map<std::string, Glib::VariantBase>& options() const;
+
+private:
+       /**
+        * A helper function to bind an option list to and enum property.
+        * @param name the name of the property.
+        * @param values the list of values.
+        * @param getter the getter that will read the values out of the map.
+        * @param setter the setter that will set the values into the map.
+        */
+       std::shared_ptr<prop::Property> bind_enum(const QString &name,
+               const std::vector<Glib::VariantBase> &values,
+               prop::Property::Getter getter, prop::Property::Setter setter);
+
+private:
+       /**
+        * The current map of options.
+        */
+       std::map<std::string, Glib::VariantBase> options_;
+};
+
+} // binding
+} // pv
+
+#endif // PULSEVIEW_PV_BINDING_INPUTOUTPUT_H