Merge branch 'topic/jrl-mal' of github.com:jrl-umi3218/dynamic-graph-python into topic/jrl-mal

CMakeLists.txt

@@ -24,7 +24,6 @@ include(cmake/header.cmake)
 SET(PROJECT_NAME dynamic-graph-python)
 SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
 SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph-python")
-SET(PROJECT_VERSION 1.99)
 
 SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
 # Headers list.
@@ -43,6 +42,9 @@ SETUP_PROJECT()
 # Trigger dependency to dynamic-graph.
 ADD_REQUIRED_DEPENDENCY("dynamic-graph >= 1.0")
 
+# Add dependency toward dynamic graph library in pkg-config file.
+PKG_CONFIG_APPEND_LIBS("dynamic-graph-python")
+
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(doc)

src/CMakeLists.txt

@@ -42,6 +42,9 @@ ADD_LIBRARY(${LIBRARY_NAME}
   SHARED
   interpreter.cc)
 
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
+  ${Boost_LIBRARIES}
+  ${PYTHON_LIBRARY})
 SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
 PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
 
@@ -52,8 +55,7 @@ SET(EXECUTABLE_NAME dg-python)
 ADD_EXECUTABLE(${EXECUTABLE_NAME} dg-python.cc)
 TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
   ${LIBRARY_NAME}
-  ${Boost_LIBRARIES}
-  ${PYTHON_LIBRARY})
+  )
 INSTALL(TARGETS dg-python DESTINATION bin)
 
 #

src/dynamic-graph-py.cc

@@ -29,6 +29,7 @@ namespace dynamicgraph {
     namespace signalBase {
       extern PyObject* create(PyObject* self, PyObject* args);
       extern PyObject* getTime(PyObject* self, PyObject* args);
+      extern PyObject* setTime(PyObject* self, PyObject* args);
       extern PyObject* getName(PyObject* self, PyObject* args);
       extern PyObject* display(PyObject* self, PyObject* args);
       extern PyObject* displayDependencies(PyObject* self, PyObject* args);
@@ -149,6 +150,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_set_time", dynamicgraph::python::signalBase::setTime,
+   METH_VARARGS, "Set time of  a SignalBase"},
   {"signal_base_get_name", dynamicgraph::python::signalBase::getName,
    METH_VARARGS, "Get the name of a signal"},
   {"signal_base_display", dynamicgraph::python::signalBase::display,

src/dynamic_graph/signal_base.py

@@ -167,6 +167,16 @@ class SignalBase (object) :
         """
         return wrap.signal_base_get_time(self.obj)
 
+    @time.setter
+    def time(self, val) :
+        """
+        Set Time of signal
+
+          Input:
+            - an integer
+        """
+        return wrap.signal_base_set_time(self.obj, val)
+
     @property
     def value(self) :
         """

src/signal-base-py.cc

@@ -77,6 +77,25 @@ namespace dynamicgraph {
 	return Py_BuildValue("i", time);
       }
 
+      PyObject* setTime(PyObject* /*self*/, PyObject* args)
+      {
+	void* pointer = NULL;
+	PyObject* object = NULL;
+	int time;
+	if (!PyArg_ParseTuple(args,"Oi", &object, &time))
+	  return NULL;
+	if (!PyCObject_Check(object)) {
+	  PyErr_SetString(error, "object should be a C object");
+	  return NULL;
+	}
+
+	pointer = PyCObject_AsVoidPtr(object);
+	SignalBase<int>* obj = (SignalBase<int>*)pointer;
+
+	obj->setTime(time);
+	return Py_BuildValue("");
+      }
+
       PyObject* display(PyObject* /*self*/, PyObject* args)
       {
 	void* pointer = NULL;