From 95ac92a2d09042bca1f1c1f0aa9ed56ee9b7ddf4 Mon Sep 17 00:00:00 2001
From: florent <florent@laas.fr>
Date: Tue, 6 Jul 2010 17:07:11 +0200
Subject: [PATCH] Call plug with right order for signals: plug (sigIn, sigOut).
* src/dynamic-graph-py.cc,
* src/dynamic_graph/__init__.py.
---
src/dynamic-graph-py.cc | 4 ++--
src/dynamic_graph/__init__.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/dynamic-graph-py.cc b/src/dynamic-graph-py.cc
index 8ec7f59..1e260e3 100644
--- a/src/dynamic-graph-py.cc
+++ b/src/dynamic-graph-py.cc
@@ -44,12 +44,12 @@ namespace dynamicgraph {
char* objIn = NULL;
char* sigOut = NULL;
char* sigIn = NULL;
- if (!PyArg_ParseTuple(args,"ssss", &objOut, &sigOut, &objIn, &sigIn))
+ if (!PyArg_ParseTuple(args,"ssss", &objIn, &sigIn, &objOut, &sigOut))
return NULL;
std::ostringstream os;
try {
- interpreter.cmdPlug(objOut, sigOut, objIn, sigIn, os);
+ interpreter.cmdPlug(objIn, sigIn, objOut, sigOut, os);
} catch (dynamicgraph::ExceptionFactory& exc) {
PyErr_SetString(error, exc.getStringMessage().c_str());
return NULL;
diff --git a/src/dynamic_graph/__init__.py b/src/dynamic_graph/__init__.py
index 50aff79..5ecd6b7 100644
--- a/src/dynamic_graph/__init__.py
+++ b/src/dynamic_graph/__init__.py
@@ -7,12 +7,12 @@ from wrap import *
import entity, signal_base
import re
-def plug (signalOut, signalIn) :
+def plug (signalIn, signalOut) :
"""
Plug an output signal into an input signal
- syntax is plug ("entityOut.signalOut", "entityIn.signalIn")
+ syntax is plug ("entityIn.signalIn", "entityOut.signalOut")
"""
# get signals and entities
- [eOut, sOut] = re.split("\.", signalOut)
[eIn, sIn] = re.split("\.", signalOut)
- w_plug(eOut, sOut, eIn, sIn)
+ [eOut, sOut] = re.split("\.", signalOut)
+ w_plug(eIn, sIn, eOut, sOut)
--
GitLab