diff --git a/src/dynamic-graph-py.cc b/src/dynamic-graph-py.cc index 38874204ed41cddb25bf6c572261adaed1653e02..e524b2824cc35bbf23c6e81a2c3ae618fd45a2a6 100644 --- a/src/dynamic-graph-py.cc +++ b/src/dynamic-graph-py.cc @@ -19,6 +19,7 @@ namespace dynamicgraph { namespace signalBase { extern PyObject* create(PyObject* self, PyObject* args); extern PyObject* getTime(PyObject* self, PyObject* args); + extern PyObject* getName(PyObject* self, PyObject* args); extern PyObject* getValue(PyObject* self, PyObject* args); extern PyObject* setValue(PyObject* self, PyObject* args); extern PyObject* recompute(PyObject* self, PyObject* args); @@ -133,6 +134,8 @@ static PyMethodDef dynamicGraphMethods[] = { "create a SignalBase C++ object"}, {"signal_base_get_time", dynamicgraph::python::signalBase::getTime, METH_VARARGS, "Get time of a SignalBase"}, + {"signal_base_get_name", dynamicgraph::python::signalBase::getName, + METH_VARARGS, "Get the name of a signal"}, {"signal_base_get_value", dynamicgraph::python::signalBase::getValue, METH_VARARGS, "Read the value of a signal"}, {"signal_base_set_value", dynamicgraph::python::signalBase::setValue, diff --git a/src/dynamic_graph/signal_base.py b/src/dynamic_graph/signal_base.py index bbd69697503bb9dc2ff37679b962a40b62f17f0e..142c287945d05f31fa634c685a7add029f2b093d 100644 --- a/src/dynamic_graph/signal_base.py +++ b/src/dynamic_graph/signal_base.py @@ -200,6 +200,12 @@ class SignalBase (object) : string = objectToString(val) return wrap.signal_base_set_value(self.obj, string) + def getName(self): + """ + Get name of signal + """ + return wrap.signal_base_get_name(self.obj) + def recompute(self, time): """ Force signal to recompute the value at given time. diff --git a/src/signal-base-py.cc b/src/signal-base-py.cc index 0381a914a752ec245691e8a3ceb52fcdbf34140d..133c5cd32b4718fe331321490ceeb19027266ad9 100644 --- a/src/signal-base-py.cc +++ b/src/signal-base-py.cc @@ -91,6 +91,33 @@ namespace dynamicgraph { return Py_BuildValue("s", valueString.c_str()); } + PyObject* getName(PyObject* self, PyObject* args) + { + void* pointer = NULL; + PyObject* object = NULL; + if (!PyArg_ParseTuple(args,"O", &object)) + return NULL; + if (!PyCObject_Check(object)) + return NULL; + + pointer = PyCObject_AsVoidPtr(object); + SignalBase<int>* signal = (SignalBase<int>*)pointer; + + std::string name; + try { + name = signal->getName(); + } catch (const dynamicgraph::ExceptionAbstract& exc) { + PyErr_SetString(error, exc.getStringMessage().c_str()); + return NULL; + } catch (const std::exception& exc) { + PyErr_SetString(error, exc.what()); + } catch (...) { + PyErr_SetString(error, "Unknown exception"); + return NULL; + } + return Py_BuildValue("s", name.c_str()); + } + PyObject* setValue(PyObject* self, PyObject* args) { void * pointer = NULL;