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

Handle string waveforms

Browse Source
This commit is contained in:
Philipp
2018-10-31 21:23:33 +01:00
parent 44e5bd98b9
commit 54fabd3a9d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
devsupApp/src/dbfield.c
View File

@ -19,7 +19,7 @@
#ifdef HAVE_NUMPY #ifdef HAVE_NUMPY
static const int dbf2np_map[DBF_MENU+1] = { static const int dbf2np_map[DBF_MENU+1] = {
NPY_BYTE, // DBF_STRING NPY_STRING, // DBF_STRING
NPY_BYTE, // DBF_CHAR NPY_BYTE, // DBF_CHAR
NPY_UBYTE, // DBF_UCHAR NPY_UBYTE, // DBF_UCHAR
NPY_INT16, // DBF_SHORT NPY_INT16, // DBF_SHORT
@ -81,19 +81,18 @@ static PyObject* build_array(PyObject* obj, void *data, unsigned short ftype, un
#ifdef HAVE_NUMPY #ifdef HAVE_NUMPY
PyArray_Descr *desc; PyArray_Descr *desc;
int ndims = 1; int ndims = 1;
npy_intp dims[2] = {nelem, 0}; npy_intp dims[1] = {nelem};
if(ftype>DBF_MENU) { if(ftype>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;
} else if(ftype==DBF_STRING) {
ndims = 2;
dims[1] = MAX_STRING_SIZE;
// element type is NPY_CHAR
} }
desc = dbf2np[ftype]; desc = dbf2np[ftype];
if(ftype==DBF_STRING) {
desc->elsize = MAX_STRING_SIZE;
}
Py_XINCREF(desc); Py_XINCREF(desc);
return PyArray_NewFromDescr(&PyArray_Type, desc, ndims, dims, NULL, data, flags, (PyObject*)obj); return PyArray_NewFromDescr(&PyArray_Type, desc, ndims, dims, NULL, data, flags, (PyObject*)obj);
#else #else