Update of
/cvsroot/playerstage/code/player/client_libs/libplayerc/bindings/python
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9621/client_libs/libplayerc/bindings/python
Modified Files:
playerc.i
Log Message:
more fixes for blackboard an dpython
Index: playerc.i
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc/bindings/python/playerc.i,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** playerc.i 21 Jan 2008 02:58:45 -0000 1.28
--- playerc.i 22 Jan 2008 20:03:29 -0000 1.29
***************
*** 8,12 ****
%include "typemaps.i"
-
// Provide array access to the RFID tags
// We will return a list of tuples. Each tuple contains the RFID type, and
the RFID ID.
--- 8,11 ----
***************
*** 417,444 ****
%extend playerc_blackboard
{
PyObject * subscribe_to_key(const char *key)
{
! char *str = NULL;
! int i = 0;
! double d = 0.0;
! PyObject *data;
! PyObject *dict = PyDict_New();
! player_blackboard_entry_t **out;
player_blackboard_entry_t *entry;
! entry = NULL;
! int result = playerc_blackboard_subscribe_to_key(self, key, out);
if (result != 0)
{
return NULL;
}
! assert(out);
! entry = *out;
assert(entry);
assert(entry->key);
! /*printf("key=%s\n",entry->key);
! printf("type=%d\n",entry->type);
! printf("subtype=%d\n",entry->subtype);
! printf("timestamp_sec=%d\n",entry->timestamp_sec);
! printf("timestamp_usec=%d\n",entry->timestamp_usec);*/
PyDict_SetItem(dict, PyString_FromString("key"),
PyString_FromString(entry->key));
PyDict_SetItem(dict, PyString_FromString("type"),
PyLong_FromLong(entry->type));
--- 416,515 ----
%extend playerc_blackboard
{
+ static void python_on_blackboard_event(playerc_blackboard_t *device,
player_blackboard_entry_t entry)
+ {
+ PyObject *data;
+ PyObject *dict;
+ char * str;
+ int i;
+ double d;
+
+ if (device->py_private == NULL)
+ {
+ device->py_private = PyList_New(0);
+ }
+
+ dict = PyDict_New();
+ PyDict_SetItem(dict, PyString_FromString("key"),
PyString_FromString(entry.key));
+ PyDict_SetItem(dict, PyString_FromString("type"),
PyLong_FromLong(entry.type));
+ PyDict_SetItem(dict, PyString_FromString("subtype"),
PyLong_FromLong(entry.subtype));
+ PyDict_SetItem(dict, PyString_FromString("timestamp_sec"),
PyLong_FromLong(entry.timestamp_sec));
+ PyDict_SetItem(dict, PyString_FromString("timestamp_usec"),
PyLong_FromLong(entry.timestamp_usec));
+
+ switch(entry.subtype)
+ {
+ case PLAYERC_BLACKBOARD_DATA_SUBTYPE_NONE:
+ data = Py_None;
+ break;
+ case PLAYERC_BLACKBOARD_DATA_SUBTYPE_STRING:
+ assert(entry.type == PLAYERC_BLACKBOARD_DATA_TYPE_COMPLEX);
+ str = malloc(entry.data_count);
+ assert(str);
+ memcpy(str, entry.data, entry.data_count);
+ data = PyString_FromString(str);
+ break;
+ case PLAYERC_BLACKBOARD_DATA_SUBTYPE_INT:
+ assert(entry.type == PLAYERC_BLACKBOARD_DATA_TYPE_SIMPLE);
+ i = 0;
+ memcpy(&i, entry.data, entry.data_count);
+ data = PyLong_FromLong(i);
+ break;
+ case PLAYERC_BLACKBOARD_DATA_SUBTYPE_DOUBLE:
+ assert(entry.type == PLAYERC_BLACKBOARD_DATA_TYPE_SIMPLE);
+ d = 0.0;
+ memcpy(&d, entry.data, entry.data_count);
+ data = PyFloat_FromDouble(d);
+ break;
+ default:
+ data = Py_None;
+ break;
+
+ }
+
+ PyDict_SetItem(dict, PyString_FromString("data"), data);
+ PyList_Append(device->py_private, dict);
+ }
+
+ // Will always return a list object. Returns a list of dictionary
objects containing the event data.
+ PyObject *get_events()
+ {
+ PyObject *list, *copy;
+ int i;
+ if (self->py_private == NULL)
+ {
+ self->py_private = PyList_New(0);
+ return (PyObject*)self->py_private;
+ }
+
+ list = (PyObject*)self->py_private;
+ copy = PyList_New(0);
+ for (i = 0; i < PyList_Size(list); i++)
+ {
+ PyList_Append(copy, PyList_GetItem(list, i));
+ }
+
+ Py_DECREF(list);
+ list = NULL;
+ return copy;
+ }
+
PyObject * subscribe_to_key(const char *key)
{
! char *str;
! int i;
! double d;
! PyObject *data, *dict;
player_blackboard_entry_t *entry;
!
! assert(self);
! int result = playerc_blackboard_subscribe_to_key(self, key, &entry);
if (result != 0)
{
return NULL;
}
!
assert(entry);
assert(entry->key);
!
! dict = PyDict_New();
PyDict_SetItem(dict, PyString_FromString("key"),
PyString_FromString(entry->key));
PyDict_SetItem(dict, PyString_FromString("type"),
PyLong_FromLong(entry->type));
***************
*** 451,484 ****
case PLAYERC_BLACKBOARD_DATA_SUBTYPE_NONE:
data = Py_None;
- printf("data = Py_None\n");
break;
case PLAYERC_BLACKBOARD_DATA_SUBTYPE_STRING:
assert(entry->type == PLAYERC_BLACKBOARD_DATA_TYPE_COMPLEX);
- assert(entry->subtype ==
PLAYERC_BLACKBOARD_DATA_SUBTYPE_STRING);
str = malloc(entry->data_count);
assert(str);
memcpy(str, entry->data, entry->data_count);
- /*printf("data = %s\n", str);*/
data = PyString_FromString(str);
- free(str);
break;
case PLAYERC_BLACKBOARD_DATA_SUBTYPE_INT:
assert(entry->type == PLAYERC_BLACKBOARD_DATA_TYPE_SIMPLE);
- assert(entry->subtype ==
PLAYERC_BLACKBOARD_DATA_SUBTYPE_INT);
i = 0;
memcpy(&i, entry->data, entry->data_count);
- /*printf("data = %d\n", i);*/
data = PyLong_FromLong(i);
break;
case PLAYERC_BLACKBOARD_DATA_SUBTYPE_DOUBLE:
assert(entry->type == PLAYERC_BLACKBOARD_DATA_TYPE_SIMPLE);
- assert(entry->subtype ==
PLAYERC_BLACKBOARD_DATA_SUBTYPE_DOUBLE);
d = 0.0;
memcpy(&d, entry->data, entry->data_count);
- /*printf("data = %f\n",d);*/
data = PyFloat_FromDouble(d);
break;
default:
- /*printf("data = defaulted to Py_None\n");*/
data = Py_None;
break;
--- 522,546 ----
***************
*** 487,495 ****
PyDict_SetItem(dict, PyString_FromString("data"), data);
!
return dict;
}
! PyObject *set_entry(const char* str_key, PyObject *dict)
{
PyObject *key;
--- 549,559 ----
PyDict_SetItem(dict, PyString_FromString("data"), data);
! free(entry->key);
! free(entry->data);
! free(entry);
return dict;
}
! PyObject *set_entry(PyObject *dict)
{
PyObject *key;
***************
*** 498,504 ****
PyObject *timestamp_sec;
PyObject *timestamp_usec;
player_blackboard_entry_t entry;
! memset(&entry, 0, sizeof(player_blackboard_entry_t));
key = PyDict_GetItem(dict, PyString_FromString("key"));
--- 562,579 ----
PyObject *timestamp_sec;
PyObject *timestamp_usec;
+ PyObject *data;
+ char *str;
+ int i, result;
+ double d;
+ int length;
+
+ if (!PyDict_Check(dict))
+ {
+ printf("Expected a dictionary object.\n");
+ return PyLong_FromLong(-1);
+ }
player_blackboard_entry_t entry;
! memset(&entry, 0, sizeof(entry));
key = PyDict_GetItem(dict, PyString_FromString("key"));
***************
*** 507,511 ****
--- 582,595 ----
timestamp_sec = PyDict_GetItem(dict,
PyString_FromString("timestamp_sec"));
timestamp_usec = PyDict_GetItem(dict,
PyString_FromString("timestamp_usec"));
+ data = PyDict_GetItem(dict, PyString_FromString("data"));
+
+ if (key == NULL || type == NULL || subtype == NULL || timestamp_sec ==
NULL || timestamp_usec == NULL || data == NULL)
+ {
+ printf("Dictionary object missing keys.\n");
+ return PyLong_FromLong(-1);
+ }
+ entry.key = PyString_AsString(key);
+ entry.key_count = strlen(entry.key) + 1;
entry.type = PyInt_AsLong(type);
entry.subtype = PyInt_AsLong(subtype);
***************
*** 513,530 ****
entry.timestamp_usec = PyInt_AsLong(timestamp_usec);
! /*printf("key=%s\n",entry.key);
! printf("type=%d\n",entry.type);
! printf("subtype=%d\n",entry.subtype);
! printf("timestamp_sec=%d\n",entry.timestamp_sec);
! printf("timestamp_usec=%d\n",entry.timestamp_usec);*/
! int result = playerc_blackboard_set_entry(self, &entry);
if (result != 0)
{
return PyLong_FromLong(-1);
! }
return PyLong_FromLong(0);
}
}
--- 597,689 ----
entry.timestamp_usec = PyInt_AsLong(timestamp_usec);
! switch (entry.subtype)
! {
! case PLAYERC_BLACKBOARD_DATA_SUBTYPE_NONE:
! entry.data = NULL;
! entry.data_count = 0;
! break;
! case PLAYERC_BLACKBOARD_DATA_SUBTYPE_STRING:
! str = NULL;
! str = PyString_AsString(data);
! printf("str=%s\n", str);
! length = strlen(str) + 1;
! entry.data = malloc(length);
! assert(entry.data);
! memcpy(entry.data, str, length);
! entry.data_count = length;
! break;
! case PLAYERC_BLACKBOARD_DATA_SUBTYPE_INT:
! i = 0;
! i = PyInt_AsLong(data);
! length = sizeof(i);
! entry.data = malloc(length);
! assert(entry.data);
! memcpy(&entry.data, &i, length);
! entry.data_count = length;
! break;
! case PLAYERC_BLACKBOARD_DATA_SUBTYPE_DOUBLE:
! d = 0.0;
! d = PyLong_AsDouble(data);
! length = sizeof(d);
! entry.data = malloc(length);
! assert(entry.data);
! memcpy(&entry.data, &d, length);
! entry.data_count = length;
! break;
! default:
! entry.data = NULL;
! entry.data_count = 0;
! break;
! }
! printf("entry:\n");
! printf("key:%s\n", entry.key);
! printf("key_count:%d\n", entry.key_count);
! printf("data:%s\n", (char*)entry.data);
! printf("data_count:%d\n", entry.data_count);
! printf("timestamp_sec:%d\n", entry.timestamp_sec);
! printf("timestamp_usec:%d\n", entry.timestamp_usec);
! printf("type:%d\n", entry.type);
! printf("subtype:%d\n", entry.subtype);
! result = playerc_blackboard_set_entry(self, &entry);
if (result != 0)
{
return PyLong_FromLong(-1);
! }
! free(entry.data);
return PyLong_FromLong(0);
}
+ }
+ %{
+ // This code overrides the default swig wrapper. We use a different callback
function for the python interface.
+ // It performs the same functionality, but points the callback function to
the new python one.
+ playerc_blackboard_t *python_playerc_blackboard_create(playerc_client_t
*client, int index)
+ {
+ playerc_blackboard_t *device= playerc_blackboard_create(client, index);
+ if (device == NULL)
+ {
+ return NULL;
+ }
+
+ device->on_blackboard_event =
playerc_blackboard_python_on_blackboard_event;
+ return device;
+
+ }
+ #undef new_playerc_blackboard
+ #define new_playerc_blackboard python_playerc_blackboard_create
+
+ // We have to clear up the list we created in the callback function.
+ void python_playerc_blackboard_destroy(playerc_blackboard_t* device)
+ {
+ playerc_device_term(&device->info);
+ if (device->py_private != NULL)
+ {
+ Py_DECREF((PyObject*)device->py_private);
+ }
+ free(device);
}
+ #undef del_playerc_blackboard
+ #define del_playerc_blackboard python_playerc_blackboard_destroy
+ %}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
