Commit c4258131 authored by florent's avatar florent
Browse files

Switch arguments of command plug.

       * src/dynamic-graph-py.cc,
       * src/dynamic_graph/__init__.py.
parent 476bd695
......@@ -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;
}
......
......@@ -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)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment