Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic-graph-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
dynamic-graph-python
Commits
e661bae7
Commit
e661bae7
authored
14 years ago
by
florent
Browse files
Options
Downloads
Patches
Plain Diff
Implement binidings for commands
* src/dynamic-graph-py.cc, * src/entity-py.cc.
parent
73796538
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/dynamic-graph-py.cc
+5
-1
5 additions, 1 deletion
src/dynamic-graph-py.cc
src/entity-py.cc
+125
-10
125 additions, 10 deletions
src/entity-py.cc
with
130 additions
and
11 deletions
src/dynamic-graph-py.cc
+
5
−
1
View file @
e661bae7
...
...
@@ -27,7 +27,7 @@ namespace dynamicgraph {
extern
PyObject
*
getName
(
PyObject
*
self
,
PyObject
*
args
);
extern
PyObject
*
getSignal
(
PyObject
*
self
,
PyObject
*
args
);
extern
PyObject
*
displaySignals
(
PyObject
*
self
,
PyObject
*
args
);
extern
PyObject
*
executeCommand
(
PyObject
*
self
,
PyObject
*
args
);
}
namespace
factory
{
...
...
@@ -117,6 +117,10 @@ static PyMethodDef dynamicGraphMethods[] = {
{
"entity_display_signals"
,
dynamicgraph
::
python
::
entity
::
displaySignals
,
METH_VARARGS
,
"Display the list of signals of an entity in standard output"
},
{
"entity_execute_command"
,
dynamicgraph
::
python
::
entity
::
executeCommand
,
METH_VARARGS
,
"execute a command"
},
{
"factory_get_entity_class_list"
,
dynamicgraph
::
python
::
factory
::
getEntityClassList
,
METH_VARARGS
,
...
...
This diff is collapsed.
Click to expand it.
src/entity-py.cc
+
125
−
10
View file @
e661bae7
...
...
@@ -11,18 +11,25 @@
#include
<dynamic-graph/entity.h>
#include
<dynamic-graph/factory.h>
#include
"dynamic-graph/command.h"
#include
"dynamic-graph/value.h"
using
dynamicgraph
::
Entity
;
using
dynamicgraph
::
SignalBase
;
using
dynamicgraph
::
ExceptionAbstract
;
using
dynamicgraph
::
command
::
Command
;
using
dynamicgraph
::
command
::
Value
;
namespace
dynamicgraph
{
namespace
python
{
extern
PyObject
*
error
;
namespace
entity
{
static
void
destroy
(
void
*
self
);
static
Value
pythonToValue
(
PyObject
*
pyObject
,
const
Value
::
Type
&
valueType
);
/**
\brief Create an instance of Entity
*/
...
...
@@ -30,10 +37,10 @@ namespace dynamicgraph {
{
char
*
className
=
NULL
;
char
*
instanceName
=
NULL
;
if
(
!
PyArg_ParseTuple
(
args
,
"ss"
,
&
className
,
&
instanceName
))
return
NULL
;
Entity
*
obj
=
NULL
;
try
{
obj
=
dynamicgraph
::
g_factory
.
newEntity
(
std
::
string
(
className
),
...
...
@@ -42,11 +49,11 @@ namespace dynamicgraph {
PyErr_SetString
(
error
,
exc
.
getStringMessage
().
c_str
());
return
NULL
;
}
// Return the pointer as a PyCObject
return
PyCObject_FromVoidPtr
((
void
*
)
obj
,
destroy
);
}
/**
\brief Destroy an instance of Entity
*/
...
...
@@ -55,7 +62,7 @@ namespace dynamicgraph {
Entity
*
obj
=
(
Entity
*
)
self
;
delete
obj
;
}
/**
\brief Get name of entity
*/
...
...
@@ -93,7 +100,7 @@ namespace dynamicgraph {
if
(
!
PyArg_ParseTuple
(
args
,
"Os"
,
&
object
,
&
name
))
return
NULL
;
if
(
!
PyCObject_Check
(
object
))
return
NULL
;
...
...
@@ -116,10 +123,10 @@ namespace dynamicgraph {
{
void
*
pointer
=
NULL
;
PyObject
*
object
=
NULL
;
if
(
!
PyArg_ParseTuple
(
args
,
"O"
,
&
object
))
return
NULL
;
if
(
!
PyCObject_Check
(
object
))
return
NULL
;
...
...
@@ -133,6 +140,114 @@ namespace dynamicgraph {
}
return
Py_BuildValue
(
""
);
}
Value
pythonToValue
(
PyObject
*
pyObject
,
const
Value
::
Type
&
valueType
)
{
double
dvalue
;
std
::
string
svalue
;
int
ivalue
;
switch
(
valueType
)
{
case
(
Value
::
INT
)
:
if
(
!
PyLong_Check
(
pyObject
))
{
throw
ExceptionFactory
(
ExceptionFactory
::
GENERIC
,
"float"
);
}
ivalue
=
(
int
)
PyLong_AsLong
(
pyObject
);
std
::
cout
<<
"int value = "
<<
ivalue
<<
std
::
endl
;
return
Value
(
ivalue
);
break
;
case
(
Value
::
DOUBLE
)
:
if
(
!
PyFloat_Check
(
pyObject
))
{
throw
ExceptionFactory
(
ExceptionFactory
::
GENERIC
,
"float"
);
}
dvalue
=
PyFloat_AsDouble
(
pyObject
);
std
::
cout
<<
"double value = "
<<
dvalue
<<
std
::
endl
;
return
Value
(
dvalue
);
break
;
case
(
Value
::
STRING
)
:
svalue
=
PyString_AsString
(
pyObject
);
return
Value
(
svalue
);
break
;
default
:
std
::
cerr
<<
"Only int, double and string are supported."
<<
std
::
endl
;
}
return
Value
();
}
PyObject
*
executeCommand
(
PyObject
*
self
,
PyObject
*
args
)
{
PyObject
*
object
=
NULL
;
PyObject
*
argTuple
=
NULL
;
std
::
string
commandName
;
void
*
pointer
=
NULL
;
if
(
!
PyArg_ParseTuple
(
args
,
"OsO"
,
&
object
,
&
commandName
,
&
argTuple
))
{
return
NULL
;
}
// Retrieve the entity instance
if
(
!
PyCObject_Check
(
object
))
{
PyErr_SetString
(
error
,
"first argument is not an object"
);
return
NULL
;
}
pointer
=
PyCObject_AsVoidPtr
(
object
);
Entity
*
entity
=
(
Entity
*
)
pointer
;
// Retrieve the argument tuple
if
(
!
PyTuple_Check
(
argTuple
))
{
PyErr_SetString
(
error
,
"third argument is not a tuple"
);
return
NULL
;
}
unsigned
int
size
=
PyTuple_Size
(
argTuple
);
std
::
map
<
const
std
::
string
,
Command
*>
commandMap
=
entity
->
getNewStyleCommandMap
();
if
(
commandMap
.
count
(
commandName
)
!=
1
)
{
std
::
string
msg
=
"command "
+
commandName
+
" is not referenced in Entity "
+
entity
->
getName
();
PyErr_SetString
(
error
,
msg
.
c_str
());
return
NULL
;
}
Command
*
command
=
commandMap
[
commandName
];
// Check that tuple size is equal to command number of arguments
const
std
::
vector
<
Value
::
Type
>
typeVector
=
command
->
valueTypes
();
if
(
size
!=
typeVector
.
size
())
{
std
::
stringstream
ss
;
ss
<<
"command takes "
<<
typeVector
.
size
()
<<
" parameters, "
<<
size
<<
" given."
;
PyErr_SetString
(
error
,
ss
.
str
().
c_str
());
return
NULL
;
}
std
::
vector
<
Value
>
valueVector
;
for
(
unsigned
int
iParam
=
0
;
iParam
<
size
;
iParam
++
)
{
PyObject
*
PyValue
=
PyTuple_GetItem
(
argTuple
,
iParam
);
Value
::
Type
valueType
=
typeVector
[
iParam
];
try
{
Value
value
=
pythonToValue
(
PyValue
,
valueType
);
valueVector
.
push_back
(
value
);
}
catch
(
ExceptionAbstract
&
exc
)
{
std
::
stringstream
ss
;
ss
<<
"argument "
<<
iParam
+
1
<<
" should be a "
<<
exc
.
what
()
<<
"."
;
PyErr_SetString
(
error
,
ss
.
str
().
c_str
())
;
return
NULL
;
}
}
command
->
setParameterValues
(
valueVector
);
try
{
command
->
execute
();
}
catch
(
const
ExceptionAbstract
&
exc
)
{
PyErr_SetString
(
error
,
exc
.
what
())
;
return
NULL
;
}
return
Py_BuildValue
(
""
);
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment