From d605c870c6ca780f0b076c30e8ae9d2aabe5dbcf Mon Sep 17 00:00:00 2001
From: florent <florent@laas.fr>
Date: Tue, 6 Jul 2010 13:11:24 +0200
Subject: [PATCH] Rewrite dynamic_graph.plug.
* src/dynamic-graph-py.cc: rename plug -> w_plug,
* src/dynamic_graph/__init__.py: bing wrap.w_plug to plug.
---
src/dynamic-graph-py.cc | 4 ++--
src/dynamic_graph/__init__.py | 13 ++++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/dynamic-graph-py.cc b/src/dynamic-graph-py.cc
index d3bc4e8..8ec7f59 100644
--- a/src/dynamic-graph-py.cc
+++ b/src/dynamic-graph-py.cc
@@ -91,9 +91,9 @@ namespace dynamicgraph {
\brief List of python functions
*/
static PyMethodDef dynamicGraphMethods[] = {
- {"plug", dynamicgraph::python::plug, METH_VARARGS,
+ {"w_plug", dynamicgraph::python::plug, METH_VARARGS,
"plug an output signal into an input signal"},
- {"debugtrace", dynamicgraph::python::enableTrace, METH_VARARGS,
+ {"w_debugtrace", dynamicgraph::python::enableTrace, METH_VARARGS,
"Enable or disable tracing debug info in a file"},
// Signals
{"create_signal_base", dynamicgraph::python::signalBase::create, METH_VARARGS,
diff --git a/src/dynamic_graph/__init__.py b/src/dynamic_graph/__init__.py
index 9f831c4..50aff79 100644
--- a/src/dynamic_graph/__init__.py
+++ b/src/dynamic_graph/__init__.py
@@ -3,5 +3,16 @@ Copyright (c) 2010 CNRS
Author: Florent Lamiraux
"""
-import wrap
+from wrap import *
import entity, signal_base
+import re
+
+def plug (signalOut, signalIn) :
+ """
+ Plug an output signal into an input signal
+ syntax is plug ("entityOut.signalOut", "entityIn.signalIn")
+ """
+ # get signals and entities
+ [eOut, sOut] = re.split("\.", signalOut)
+ [eIn, sIn] = re.split("\.", signalOut)
+ w_plug(eOut, sOut, eIn, sIn)
--
GitLab