From b8bf069f375424fd303ad6e594412583633c1110 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 23 Jun 2020 11:40:26 +0200 Subject: Refactor cython data3d object creation to prepare --- python/astra/PyIncludes.pxd | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'python/astra/PyIncludes.pxd') diff --git a/python/astra/PyIncludes.pxd b/python/astra/PyIncludes.pxd index b9a61a9..f964118 100644 --- a/python/astra/PyIncludes.pxd +++ b/python/astra/PyIncludes.pxd @@ -236,9 +236,17 @@ cdef extern from "astra/ProjectionGeometry3D.h" namespace "astra": int getDetectorColCount() int getDetectorRowCount() +cdef extern from "astra/Float32VolumeData3D.h" namespace "astra": + cdef cppclass CFloat32VolumeData3D(CFloat32Data3D): + pass + +cdef extern from "astra/Float32ProjectionData3D.h" namespace "astra": + cdef cppclass CFloat32ProjectionData3D(CFloat32Data3D): + pass + cdef extern from "astra/Float32VolumeData3DMemory.h" namespace "astra": - cdef cppclass CFloat32VolumeData3DMemory: + cdef cppclass CFloat32VolumeData3DMemory(CFloat32VolumeData3D): CFloat32VolumeData3DMemory(CVolumeGeometry3D*) CFloat32VolumeData3DMemory(CVolumeGeometry3D*, CFloat32CustomMemory*) CVolumeGeometry3D* getGeometry() @@ -266,7 +274,7 @@ cdef extern from "astra/ConeVecProjectionGeometry3D.h" namespace "astra": CConeVecProjectionGeometry3D() cdef extern from "astra/Float32ProjectionData3DMemory.h" namespace "astra": - cdef cppclass CFloat32ProjectionData3DMemory: + cdef cppclass CFloat32ProjectionData3DMemory(CFloat32ProjectionData3D): CFloat32ProjectionData3DMemory(CProjectionGeometry3D*) CFloat32ProjectionData3DMemory(CConeProjectionGeometry3D*) CFloat32ProjectionData3DMemory(CProjectionGeometry3D*, CFloat32CustomMemory*) @@ -280,7 +288,7 @@ cdef extern from "astra/Float32ProjectionData3DMemory.h" namespace "astra": IF HAVE_CUDA==True: cdef extern from "astra/Float32VolumeData3DGPU.h" namespace "astra": - cdef cppclass CFloat32VolumeData3DGPU: + cdef cppclass CFloat32VolumeData3DGPU(CFloat32VolumeData3D): CFloat32VolumeData3DGPU(CVolumeGeometry3D*, MemHandle3D) CVolumeGeometry3D* getGeometry() void changeGeometry(CVolumeGeometry3D*) @@ -290,7 +298,7 @@ IF HAVE_CUDA==True: bool isInitialized() cdef extern from "astra/Float32ProjectionData3DGPU.h" namespace "astra": - cdef cppclass CFloat32ProjectionData3DGPU: + cdef cppclass CFloat32ProjectionData3DGPU(CFloat32ProjectionData3D): CFloat32ProjectionData3DGPU(CProjectionGeometry3D*, MemHandle3D) CProjectionGeometry3D* getGeometry() void changeGeometry(CProjectionGeometry3D*) -- cgit v1.2.3