bindings: Expose EnumValue::id and EnumValue::name as attributes.

diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index 1941f783a8b3bcc92c0c606e0f3b3348aae85700..d0b4ec44ca2b25ce3568fe5fc6a20e104de61810 100644 (file)
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -146,6 +146,11 @@ for enum, (classname, classbrief) in classes.items():
     if os.path.exists(filename):
         print >> code, str.join('', open(filename).readlines())
 
-    # Instantiate EnumValue template for SWIG wrappers
-    print >> swig, '%%template(EnumValue%s) EnumValue<%s, enum %s>;' % (
+    # Map EnumValue::id() and EnumValue::name() as SWIG attributes.
+    print >> swig, '%%attribute(sigrok::%s, int, id, id);' % classname
+    print >> swig, '%%attributestring(sigrok::%s, std::string, name, name);' % classname
+
+    # Instantiate EnumValue template for SWIG
+    print >> swig, '%%template(EnumValue%s) sigrok::EnumValue<sigrok::%s, enum %s>;' % (
         classname, classname, enum_name)
+

diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
index 07e74573bfe837a7af196334d9fd4c27690596bf..1bbba90fd3fd53d4a482c8c7b99e58b42ae5aa3e 100644 (file)
--- a/bindings/swig/classes.i
+++ b/bindings/swig/classes.i
@@ -272,7 +272,8 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
 
 %include "libsigrok/libsigrok.hpp"
 
-namespace sigrok {
 %include "enums.i"
+
+namespace sigrok {
 %include "libsigrok/enums.hpp"
 }