BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindings: Wrap enum sr_configcap as Capability class.

This commit is contained in:
Martin Ling 2015-11-02 20:52:00 +00:00 committed by Uwe Hermann
parent c57aa1ac19
commit 12f2f640cb
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bindings/cxx/classes.cpp
View File

@ -491,12 +491,12 @@ Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const
return Glib::VariantContainerBase(data); return Glib::VariantContainerBase(data);
} }
map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKey *key) map<const ConfigKey *, set<const Capability *>> Configurable::config_keys(const ConfigKey *key)
{ {
GVariant *gvar_opts; GVariant *gvar_opts;
gsize num_opts; gsize num_opts;
const uint32_t *opts; const uint32_t *opts;
map<const ConfigKey *, set<Capability>> result; map<const ConfigKey *, set<const Capability *>> result;
check(sr_config_list( check(sr_config_list(
config_driver, config_sdi, config_channel_group, config_driver, config_sdi, config_channel_group,
@ -508,13 +508,13 @@ map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKe
for (gsize i = 0; i < num_opts; i++) for (gsize i = 0; i < num_opts; i++)
{ {
auto key = ConfigKey::get(opts[i] & SR_CONF_MASK); auto key = ConfigKey::get(opts[i] & SR_CONF_MASK);
set<Capability> capabilities; set<const Capability *> capabilities;
if (opts[i] & SR_CONF_GET) if (opts[i] & SR_CONF_GET)
capabilities.insert(GET); capabilities.insert(Capability::GET);
if (opts[i] & SR_CONF_SET) if (opts[i] & SR_CONF_SET)
capabilities.insert(SET); capabilities.insert(Capability::SET);
if (opts[i] & SR_CONF_LIST) if (opts[i] & SR_CONF_LIST)
capabilities.insert(LIST); capabilities.insert(Capability::LIST);
result[key] = capabilities; result[key] = capabilities;
} }

1
bindings/cxx/enums.py
View File

@ -40,6 +40,7 @@ mapping = dict([
('sr_unit', ('Unit', 'Unit of measurement')), ('sr_unit', ('Unit', 'Unit of measurement')),
('sr_mqflag', ('QuantityFlag', 'Flag applied to measured quantity')), ('sr_mqflag', ('QuantityFlag', 'Flag applied to measured quantity')),
('sr_configkey', ('ConfigKey', 'Configuration key')), ('sr_configkey', ('ConfigKey', 'Configuration key')),
('sr_configcap', ('Capability', 'Configuration capability')),
('sr_datatype', ('DataType', 'Configuration data type')), ('sr_datatype', ('DataType', 'Configuration data type')),
('sr_channeltype', ('ChannelType', 'Channel type')), ('sr_channeltype', ('ChannelType', 'Channel type')),
('sr_trigger_matches', ('TriggerMatchType', 'Trigger match type')), ('sr_trigger_matches', ('TriggerMatchType', 'Trigger match type')),

9
bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
View File

@ -98,6 +98,7 @@ class SR_API HardwareDevice;
class SR_API Channel; class SR_API Channel;
class SR_API Session; class SR_API Session;
class SR_API ConfigKey; class SR_API ConfigKey;
class SR_API Capability;
class SR_API InputFormat; class SR_API InputFormat;
class SR_API OutputFormat; class SR_API OutputFormat;
class SR_API OutputFlag; class SR_API OutputFlag;
@ -310,12 +311,6 @@ private:
friend struct std::default_delete<Context>; friend struct std::default_delete<Context>;
}; };
enum Capability {
GET = SR_CONF_GET,
SET = SR_CONF_SET,
LIST = SR_CONF_LIST
};
/** An object that can be configured. */ /** An object that can be configured. */
class SR_API Configurable class SR_API Configurable
{ {
@ -331,7 +326,7 @@ public:
* @param key ConfigKey to enumerate values for. */ * @param key ConfigKey to enumerate values for. */
Glib::VariantContainerBase config_list(const ConfigKey *key) const; Glib::VariantContainerBase config_list(const ConfigKey *key) const;
/** Enumerate available keys, according to a given index key. */ /** Enumerate available keys, according to a given index key. */
map<const ConfigKey *, set<enum Capability> > config_keys(const ConfigKey *key); map<const ConfigKey *, set<const Capability *> > config_keys(const ConfigKey *key);
/** Check for a key in the list from a given index key. */ /** Check for a key in the list from a given index key. */
bool config_check(const ConfigKey *key, const ConfigKey *index_key) const; bool config_check(const ConfigKey *key, const ConfigKey *index_key) const;
protected: protected:

14
bindings/java/org/sigrok/core/classes/classes.i
View File

@ -195,14 +195,14 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
/* Specialisation for ConfigKey->set<Capability> maps */ /* Specialisation for ConfigKey->set<Capability> maps */
MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>, MAP_COMMON(const sigrok::ConfigKey *, std::set<const sigrok::Capability *>,
ConfigKey, java.util.Set<Capability>) ConfigKey, java.util.Set<Capability>)
%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > "jobject" %typemap(jni) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> > "jobject"
%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > %typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> >
"java.util.Map<ConfigKey,java.util.Set<Capability>>" "java.util.Map<ConfigKey,java.util.Set<Capability>>"
%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > { %typemap(out) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> > {
jclass HashMap = jenv->FindClass("java/util/HashMap"); jclass HashMap = jenv->FindClass("java/util/HashMap");
jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V"); jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put", jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
@ -214,8 +214,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
jclass ConfigKey = jenv->FindClass("org/sigrok/core/classes/ConfigKey"); jclass ConfigKey = jenv->FindClass("org/sigrok/core/classes/ConfigKey");
jmethodID ConfigKey_init = jenv->GetMethodID(ConfigKey, "<init>", "(JZ)V"); jmethodID ConfigKey_init = jenv->GetMethodID(ConfigKey, "<init>", "(JZ)V");
jclass Capability = jenv->FindClass("org/sigrok/core/classes/Capability"); jclass Capability = jenv->FindClass("org/sigrok/core/classes/Capability");
jmethodID Capability_swigToEnum = jenv->GetStaticMethodID(Capability, jmethodID Capability_init = jenv->GetMethodID(Capability, "<init>", "(JZ)V");
"swigToEnum", "(I)Lorg/sigrok/core/classes/Capability;");
$result = jenv->NewObject(HashMap, HashMap_init); $result = jenv->NewObject(HashMap, HashMap_init);
jlong key = 0; jlong key = 0;
for (auto map_entry : $1) for (auto map_entry : $1)
@ -224,8 +223,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
jobject value = jenv->NewObject(HashSet, HashSet_init); jobject value = jenv->NewObject(HashSet, HashSet_init);
for (auto &set_entry : map_entry.second) for (auto &set_entry : map_entry.second)
jenv->CallObjectMethod(value, HashSet_add, jenv->CallObjectMethod(value, HashSet_add,
jenv->CallStaticObjectMethod(Capability, jenv->NewObject(Capability, Capability_init, set_entry));
Capability_swigToEnum, set_entry));
jenv->CallObjectMethod($result, HashMap_put, jenv->CallObjectMethod($result, HashMap_put,
jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value); jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
} }

9
bindings/swig/templates.i
View File

@ -63,11 +63,16 @@ namespace std {
%template(ConfigMap) %template(ConfigMap)
std::map<const sigrok::ConfigKey *, Glib::VariantBase>; std::map<const sigrok::ConfigKey *, Glib::VariantBase>;
/* Currently broken on Python. */
#ifndef SWIGPYTHON
%template(CapabilitySet) %template(CapabilitySet)
std::set<enum sigrok::Capability>; std::set<const sigrok::Capability *>;
%template(ConfigKeys) %template(ConfigKeys)
std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >; std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> >;
#endif
%template(OptionVector) %template(OptionVector)
std::vector<std::shared_ptr<sigrok::Option> >; std::vector<std::shared_ptr<sigrok::Option> >;