X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsigrok%2Fcore%2Fclasses.i;h=2afe579124196e42f7782c95da099dc2e8c858f9;hb=HEAD;hp=93e03ef29e5203d9e45035a22da2aa7e93815fc8;hpb=a2e4d88205d08729d7a2f43dbd818ac68fdcf693;p=libsigrok.git diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i index 93e03ef2..d22db1c1 100644 --- a/bindings/python/sigrok/core/classes.i +++ b/bindings/python/sigrok/core/classes.i @@ -45,16 +45,15 @@ which provides access to the error code and description." %module(docstring=DOCSTRING) classes %{ +#include "config.h" + #include #include +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #include PyObject *PyGObject_lib; PyObject *GLib; -PyTypeObject *IOChannel; -PyTypeObject *PollFD; - -#include "config.h" #if PYGOBJECT_FLAGS_SIGNED typedef gint pyg_flags_type; @@ -62,6 +61,16 @@ typedef gint pyg_flags_type; typedef guint pyg_flags_type; #endif +#if PY_VERSION_HEX >= 0x03000000 +#define string_check PyUnicode_Check +#define string_from_python PyUnicode_AsUTF8 +#define string_to_python PyUnicode_FromString +#else +#define string_check PyString_Check +#define string_from_python PyString_AsString +#define string_to_python PyString_FromString +#endif + %} %init %{ @@ -76,30 +85,21 @@ typedef guint pyg_flags_type; if (!GLib) { fprintf(stderr, "Import of gi.repository.GLib failed.\n"); #if PY_VERSION_HEX >= 0x03000000 - return NULL; + return nullptr; #else return; #endif } - IOChannel = (PyTypeObject *) PyObject_GetAttrString(GLib, "IOChannel"); - PollFD = (PyTypeObject *) PyObject_GetAttrString(GLib, "PollFD"); import_array(); %} +%include "../../../swig/templates.i" + /* Map file objects to file descriptors. */ %typecheck(SWIG_TYPECHECK_POINTER) int fd { $1 = (PyObject_AsFileDescriptor($input) != -1); } -%typemap(in) int fd { - int fd = PyObject_AsFileDescriptor($input); - if (fd == -1) - SWIG_exception(SWIG_TypeError, - "Expected file object or integer file descriptor"); - else - $1 = fd; -} - /* Map from Glib::Variant to native Python types. */ %typemap(out) Glib::VariantBase { GValue *value = g_new0(GValue, 1); @@ -107,160 +107,88 @@ typedef guint pyg_flags_type; g_value_set_variant(value, $1.gobj()); PyObject *variant = pyg_value_as_pyobject(value, true); $result = PyObject_CallMethod(variant, - const_cast("unpack"), - const_cast(""), NULL); + const_cast("unpack"), nullptr); Py_XDECREF(variant); g_free(value); } -/* Map from Glib::IOCondition to GLib.IOCondition. */ -%typecheck(SWIG_TYPECHECK_POINTER) Glib::IOCondition { - pyg_flags_type flags; - $1 = pygobject_check($input, &PyGFlags_Type) && - (pyg_flags_get_value(G_TYPE_IO_CONDITION, $input, &flags) != -1); -} - -%typemap(in) Glib::IOCondition { - if (!pygobject_check($input, &PyGFlags_Type)) - SWIG_exception(SWIG_TypeError, "Expected GLib.IOCondition value"); - pyg_flags_type flags; - if (pyg_flags_get_value(G_TYPE_IO_CONDITION, $input, &flags) == -1) - SWIG_exception(SWIG_TypeError, "Not a valid Glib.IOCondition value"); - $1 = (Glib::IOCondition) flags; -} - -/* And back */ -%typemap(out) Glib::IOCondition { - GValue *value = g_new0(GValue, 1); - g_value_init(value, G_TYPE_IO_CONDITION); - g_value_set_flags(value, &$1); - $result = pyg_value_as_pyobject(value, true); - g_free(value); -} - -/* Map from GLib.PollFD to Glib::PollFD *. */ -%typecheck(SWIG_TYPECHECK_POINTER) Glib::PollFD { - $1 = pygobject_check($input, PollFD); -} - -%typemap(in) Glib::PollFD { - if (!pygobject_check($input, PollFD)) - SWIG_exception(SWIG_TypeError, "Expected GLib.PollFD"); - PyObject *fd_obj = PyObject_GetAttrString($input, "fd"); - PyObject *events_obj = PyObject_GetAttrString($input, "events"); - pyg_flags_type flags; - pyg_flags_get_value(G_TYPE_IO_CONDITION, events_obj, &flags); - int fd = PyInt_AsLong(fd_obj); - Glib::IOCondition events = (Glib::IOCondition) flags; - $1 = Glib::PollFD(fd, events); -} - -/* Map from GLib.IOChannel to Glib::IOChannel *. */ -%typecheck(SWIG_TYPECHECK_POINTER) Glib::RefPtr { - $1 = pygobject_check($input, IOChannel); -} +/* Use the same typemap above for Glib::VariantContainerBase */ +%apply Glib::VariantBase { Glib::VariantContainerBase } -%typemap(in) Glib::RefPtr { - if (!pygobject_check($input, IOChannel)) - SWIG_exception(SWIG_TypeError, "Expected GLib.IOChannel"); - $1 = Glib::wrap((GIOChannel *) PyObject_Hash($input), true); -} - -/* Map from callable PyObject to SourceCallbackFunction. */ -%typecheck(SWIG_TYPECHECK_POINTER) sigrok::SourceCallbackFunction { +/* Map from callable PyObject to LogCallbackFunction */ +%typecheck(SWIG_TYPECHECK_POINTER) sigrok::LogCallbackFunction { $1 = PyCallable_Check($input); } -%typemap(in) sigrok::SourceCallbackFunction { +%typemap(in) sigrok::LogCallbackFunction { if (!PyCallable_Check($input)) SWIG_exception(SWIG_TypeError, "Expected a callable Python object"); - $1 = [=] (Glib::IOCondition revents) { + $1 = [=] (const sigrok::LogLevel *loglevel, std::string message) { auto gstate = PyGILState_Ensure(); - GValue *value = g_new0(GValue, 1); - g_value_init(value, G_TYPE_IO_CONDITION); - g_value_set_flags(value, revents); - auto revents_obj = pyg_value_as_pyobject(value, true); - g_free(value); + auto log_obj = SWIG_NewPointerObj( + SWIG_as_voidptr(loglevel), SWIGTYPE_p_sigrok__LogLevel, 0); + + auto string_obj = string_to_python(message.c_str()); - auto arglist = Py_BuildValue("(O)", revents_obj); + auto arglist = Py_BuildValue("(OO)", log_obj, string_obj); - auto result = PyEval_CallObject($input, arglist); + auto result = PyObject_CallObject($input, arglist); Py_XDECREF(arglist); - Py_XDECREF(revents_obj); + Py_XDECREF(log_obj); + Py_XDECREF(string_obj); bool completed = !PyErr_Occurred(); if (!completed) PyErr_Print(); - bool valid_result = (completed && PyBool_Check(result)); + bool valid_result = (completed && result == Py_None); + + Py_XDECREF(result); if (completed && !valid_result) { PyErr_SetString(PyExc_TypeError, - "EventSource callback did not return a boolean"); + "Log callback did not return None"); PyErr_Print(); } - bool retval = (valid_result && result == Py_True); - - Py_XDECREF(result); - PyGILState_Release(gstate); if (!valid_result) throw sigrok::Error(SR_ERR); - - return retval; }; Py_XINCREF($input); } -/* Map from callable PyObject to LogCallbackFunction */ -%typecheck(SWIG_TYPECHECK_POINTER) sigrok::LogCallbackFunction { +/* Map from callable PyObject to SessionStoppedCallback */ +%typecheck(SWIG_TYPECHECK_POINTER) sigrok::SessionStoppedCallback { $1 = PyCallable_Check($input); } -%typemap(in) sigrok::LogCallbackFunction { +%typemap(in) sigrok::SessionStoppedCallback { if (!PyCallable_Check($input)) SWIG_exception(SWIG_TypeError, "Expected a callable Python object"); - $1 = [=] (const sigrok::LogLevel *loglevel, std::string message) { - auto gstate = PyGILState_Ensure(); - - auto log_obj = SWIG_NewPointerObj( - SWIG_as_voidptr(loglevel), SWIGTYPE_p_sigrok__LogLevel, 0); - - auto string_obj = PyString_FromString(message.c_str()); - - auto arglist = Py_BuildValue("(OO)", log_obj, string_obj); - - auto result = PyEval_CallObject($input, arglist); - - Py_XDECREF(arglist); - Py_XDECREF(log_obj); - Py_XDECREF(string_obj); - - bool completed = !PyErr_Occurred(); - - if (!completed) - PyErr_Print(); + $1 = [=] () { + const auto gstate = PyGILState_Ensure(); - bool valid_result = (completed && result == Py_None); - - Py_XDECREF(result); + const auto result = PyObject_CallObject($input, nullptr); + const bool completed = !PyErr_Occurred(); + const bool valid_result = (completed && result == Py_None); - if (completed && !valid_result) - { + if (completed && !valid_result) { PyErr_SetString(PyExc_TypeError, - "Log callback did not return None"); - PyErr_Print(); + "Session stop callback did not return None"); } + if (!valid_result) + PyErr_Print(); + Py_XDECREF(result); PyGILState_Release(gstate); if (!valid_result) @@ -293,7 +221,7 @@ typedef guint pyg_flags_type; auto arglist = Py_BuildValue("(OO)", device_obj, packet_obj); - auto result = PyEval_CallObject($input, arglist); + auto result = PyObject_CallObject($input, arglist); Py_XDECREF(arglist); Py_XDECREF(device_obj); @@ -383,12 +311,12 @@ std::map dict_to_map_string(PyObject *dict) Py_ssize_t pos = 0; while (PyDict_Next(dict, &pos, &py_key, &py_value)) { - if (!PyString_Check(py_key)) + if (!string_check(py_key)) throw sigrok::Error(SR_ERR_ARG); - if (!PyString_Check(py_value)) + if (!string_check(py_value)) throw sigrok::Error(SR_ERR_ARG); - auto key = PyString_AsString(py_key); - auto value = PyString_AsString(py_value); + auto key = string_from_python(py_key); + auto value = string_from_python(py_value); output[key] = value; } @@ -404,16 +332,25 @@ Glib::VariantBase python_to_variant_by_key(PyObject *input, const sigrok::Config return Glib::Variant::create(PyInt_AsLong(input)); if (type == SR_T_UINT64 && PyLong_Check(input)) return Glib::Variant::create(PyLong_AsLong(input)); - else if (type == SR_T_STRING && PyString_Check(input)) - return Glib::Variant::create(PyString_AsString(input)); + else if (type == SR_T_STRING && string_check(input)) + return Glib::Variant::create(string_from_python(input)); else if (type == SR_T_BOOL && PyBool_Check(input)) return Glib::Variant::create(input == Py_True); else if (type == SR_T_FLOAT && PyFloat_Check(input)) return Glib::Variant::create(PyFloat_AsDouble(input)); else if (type == SR_T_INT32 && PyInt_Check(input)) return Glib::Variant::create(PyInt_AsLong(input)); - else - throw sigrok::Error(SR_ERR_ARG); + else if (type == SR_T_UINT32 && PyInt_Check(input)) + return Glib::Variant::create(PyInt_AsLong(input)); + else if ((type == SR_T_RATIONAL_VOLT) && PyTuple_Check(input) && (PyTuple_Size(input) == 2)) { + PyObject *numObj = PyTuple_GetItem(input, 0); + PyObject *denomObj = PyTuple_GetItem(input, 1); + if ((PyInt_Check(numObj) || PyLong_Check(numObj)) && (PyInt_Check(denomObj) || PyLong_Check(denomObj))) { + const std::vector v = {(guint64)PyInt_AsLong(numObj), (guint64)PyInt_AsLong(denomObj)}; + return Glib::Variant< std::vector >::create(v); + } + } + throw sigrok::Error(SR_ERR_ARG); } /* Convert from a Python type to Glib::Variant, according to Option data type. */ @@ -426,14 +363,16 @@ Glib::VariantBase python_to_variant_by_option(PyObject *input, return Glib::Variant::create(PyInt_AsLong(input)); if (type == G_VARIANT_TYPE_UINT64 && PyLong_Check(input)) return Glib::Variant::create(PyLong_AsLong(input)); - else if (type == G_VARIANT_TYPE_STRING && PyString_Check(input)) - return Glib::Variant::create(PyString_AsString(input)); + else if (type == G_VARIANT_TYPE_STRING && string_check(input)) + return Glib::Variant::create(string_from_python(input)); else if (type == G_VARIANT_TYPE_BOOLEAN && PyBool_Check(input)) return Glib::Variant::create(input == Py_True); else if (type == G_VARIANT_TYPE_DOUBLE && PyFloat_Check(input)) return Glib::Variant::create(PyFloat_AsDouble(input)); else if (type == G_VARIANT_TYPE_INT32 && PyInt_Check(input)) return Glib::Variant::create(PyInt_AsLong(input)); + else if (type == G_VARIANT_TYPE_UINT32 && PyInt_Check(input)) + return Glib::Variant::create(PyInt_AsLong(input)); else throw sigrok::Error(SR_ERR_ARG); } @@ -451,9 +390,9 @@ std::map dict_to_map_options(PyObject *dict, Py_ssize_t pos = 0; while (PyDict_Next(dict, &pos, &py_key, &py_value)) { - if (!PyString_Check(py_key)) + if (!string_check(py_key)) throw sigrok::Error(SR_ERR_ARG); - auto key = PyString_AsString(py_key); + auto key = string_from_python(py_key); auto value = python_to_variant_by_option(py_value, options[key]); output[key] = value; } @@ -465,11 +404,12 @@ std::map dict_to_map_options(PyObject *dict, /* Ignore these methods, we will override them below. */ %ignore sigrok::Analog::data; +%ignore sigrok::Logic::data; %ignore sigrok::Driver::scan; %ignore sigrok::InputFormat::create_input; %ignore sigrok::OutputFormat::create_output; -%include "doc.i" +%include "doc_start.i" %define %attributevector(Class, Type, Name, Get) %rename(_ ## Get) sigrok::Class::Get; @@ -501,6 +441,16 @@ std::map dict_to_map_options(PyObject *dict, return (long) $self; } + std::string __str__() + { + return $self->name(); + } + + std::string __repr__() + { + return "Class." + $self->name(); + } + %pythoncode { def __eq__(self, other): @@ -528,9 +478,9 @@ std::map dict_to_map_options(PyObject *dict, while (PyDict_Next(dict, &pos, &py_key, &py_value)) { - if (!PyString_Check(py_key)) + if (!string_check(py_key)) throw sigrok::Error(SR_ERR_ARG); - auto key = sigrok::ConfigKey::get_by_identifier(PyString_AsString(py_key)); + auto key = sigrok::ConfigKey::get_by_identifier(string_from_python(py_key)); auto value = python_to_variant_by_key(py_value, key); options[key] = value; } @@ -612,3 +562,43 @@ std::map dict_to_map_options(PyObject *dict, data = property(_data) } } + +/* Return NumPy array from Logic::data(). */ +%extend sigrok::Logic +{ + PyObject * _data() + { + npy_intp dims[2]; + dims[0] = $self->data_length() / $self->unit_size(); + dims[1] = $self->unit_size(); + int typenum = NPY_UINT8; + void *data = $self->data_pointer(); + return PyArray_SimpleNewFromData(2, dims, typenum, data); + } + +%pythoncode +{ + data = property(_data) +} +} + +/* Create logic packet from Python buffer. */ +%extend sigrok::Context +{ + std::shared_ptr _create_logic_packet_buf(PyObject *buf, unsigned int unit_size) + { + Py_buffer view; + PyObject_GetBuffer(buf, &view, PyBUF_SIMPLE); + return $self->create_logic_packet(view.buf, view.len, unit_size); + } +} + +%pythoncode +{ + def _Context_create_logic_packet(self, buf, unit_size): + return self._create_logic_packet_buf(buf, unit_size) + + Context.create_logic_packet = _Context_create_logic_packet +} + +%include "doc_end.i"