From 9f9c20aa4a9dfa0e8e1a3a38986e07a290906d3e Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Wed, 17 Jun 2015 16:49:49 +0200 Subject: [PATCH] new OBIDMS_column cython class --- .../obidms/obidmscolumn/capidmscolumn.cfiles | 7 ++++--- .../obidms/obidmscolumn/capidmscolumn.pxd | 15 +++++++++++++++ .../obidms/obidmscolumn/capidmscolumn.pyx | 10 ++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/python/obitools3/obidms/obidmscolumn/capidmscolumn.cfiles b/python/obitools3/obidms/obidmscolumn/capidmscolumn.cfiles index 109398a..f318290 100644 --- a/python/obitools3/obidms/obidmscolumn/capidmscolumn.cfiles +++ b/python/obitools3/obidms/obidmscolumn/capidmscolumn.cfiles @@ -1,3 +1,5 @@ +../../../../src/obidmscolumn.h +../../../../src/obidmscolumn.c ../../../../src/obidms.h ../../../../src/obidms.c ../../../../src/obierrno.h @@ -6,6 +8,5 @@ ../../../../src/obilittlebigman.c ../../../../src/obitypes.h ../../../../src/obitypes.c -../../../../src/obidmscolumn.h -../../../../src/obidmscolumn.c - +../../../../src/private_openat.h +../../../../src/private_openat.c diff --git a/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd b/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd index e69de29..17aba1c 100644 --- a/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd +++ b/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd @@ -0,0 +1,15 @@ +from obitools3.obidms.capidms cimport * + + +cdef extern from "obidmscolumn.h" nogil: + struct OBIDMS_column_t: + pass + + ctypedef OBIDMS_column_t* OBIDMS_column_p + + OBIDMS_column_p obi_create_column(OBIDMS_p dms, char* column_name, OBIType_t type, size_t nb_elements) + + +cdef class OBIDMS_column: + cdef OBIDMS_column_p pointer + cdef OBIDMS_p dms diff --git a/python/obitools3/obidms/obidmscolumn/capidmscolumn.pyx b/python/obitools3/obidms/obidmscolumn/capidmscolumn.pyx index e69de29..40f957f 100644 --- a/python/obitools3/obidms/obidmscolumn/capidmscolumn.pyx +++ b/python/obitools3/obidms/obidmscolumn/capidmscolumn.pyx @@ -0,0 +1,10 @@ +#cython: language_level=3 + +from .capidmscolumn cimport * + + +cdef class OBIDMS_column: + + def __init__(self, dms_name, column_name, type, nb_elements): + self.dms = obi_dms(dms_name) + self.pointer = obi_create_column(self.dms, column_name, type, nb_elements)