From c425813171bc8991ba10b8729bc75484aa5df5aa Mon Sep 17 00:00:00 2001
From: florent <florent@laas.fr>
Date: Wed, 17 Nov 2010 11:33:03 +0100
Subject: [PATCH] Switch arguments of command plug.
* src/dynamic-graph-py.cc,
* src/dynamic_graph/__init__.py.
---
src/dynamic-graph-py.cc | 12 ++++++------
src/dynamic_graph/__init__.py | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/dynamic-graph-py.cc b/src/dynamic-graph-py.cc
index b3a993b..544b0b5 100644
--- a/src/dynamic-graph-py.cc
+++ b/src/dynamic-graph-py.cc
@@ -44,18 +44,18 @@ namespace dynamicgraph {
PyObject*
plug(PyObject* self, PyObject* args)
{
- char* objOut = NULL;
char* objIn = NULL;
- char* sigOut = NULL;
+ char* objOut = NULL;
char* sigIn = NULL;
- if (!PyArg_ParseTuple(args,"ssss", &objIn, &sigIn, &objOut, &sigOut))
+ char* sigOut = NULL;
+ if (!PyArg_ParseTuple(args,"ssss", &objOut, &sigOut, &objIn, &sigIn))
return NULL;
std::ostringstream os;
try {
- interpreter.cmdPlug(objIn, sigIn, objOut, sigOut, os);
- } catch (dynamicgraph::ExceptionFactory& exc) {
- PyErr_SetString(error, exc.getStringMessage().c_str());
+ interpreter.cmdPlug(objOut, sigOut, objIn, sigIn, os);
+ } catch (std::exception& exc) {
+ PyErr_SetString(error, exc.what());
return NULL;
}
diff --git a/src/dynamic_graph/__init__.py b/src/dynamic_graph/__init__.py
index 5ecd6b7..9ca6f39 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 (signalIn, signalOut) :
+def plug (signalOut, signalIn) :
"""
Plug an output signal into an input signal
syntax is plug ("entityIn.signalIn", "entityOut.signalOut")
"""
# get signals and entities
- [eIn, sIn] = re.split("\.", signalOut)
[eOut, sOut] = re.split("\.", signalOut)
- w_plug(eIn, sIn, eOut, sOut)
+ [eIn, sIn] = re.split("\.", signalIn)
+ w_plug(eOut, sOut, eIn, sIn)
--
GitLab