lin-epics-modules/pyDevSup
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle array buffer replacement

Browse Source
This commit is contained in:
Michael Davidsaver
2013-12-10 12:44:13 -05:00
parent eb94e3c6c1
commit 46f997b9a9
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
devsupApp/src/dbfield.c
View File

@ -12,6 +12,8 @@
#include <dbCommon.h> #include <dbCommon.h>
#include <dbAccess.h> #include <dbAccess.h>
#include <dbStaticLib.h> #include <dbStaticLib.h>
#include <recSup.h>
#include <special.h>
#include "pydevsup.h" #include "pydevsup.h"
@ -158,11 +160,26 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
static PyObject *pyField_getarray(pyField *self) static PyObject *pyField_getarray(pyField *self)
{ {
#ifdef HAVE_NUMPY #ifdef HAVE_NUMPY
rset *prset;
int flags = NPY_CARRAY; int flags = NPY_CARRAY;
char *data=self->addr.pfield; char *data;
npy_intp dims[1] = {self->addr.no_elements}; npy_intp dims[1] = {self->addr.no_elements};
PyArray_Descr *desc; PyArray_Descr *desc;
if(self->addr.special==SPC_DBADDR &&
(prset=dbGetRset(&self->addr)) &&
prset->get_array_info)
{
char *datasave=self->addr.pfield;
long noe, off; /* ignored */
prset->get_array_info(&self->addr, &noe, &off);
data = self->addr.pfield;
/* get_array_info can modify pfield in >3.15.0.1 */
self->addr.pfield = datasave;
} else
data = self->addr.pfield;
if(self->addr.field_type>DBF_MENU) { if(self->addr.field_type>DBF_MENU) {
PyErr_SetString(PyExc_TypeError, "Can not map field type to numpy type"); PyErr_SetString(PyExc_TypeError, "Can not map field type to numpy type");
return NULL; return NULL;