diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2014-12-08 11:32:50 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2014-12-08 11:32:50 +0100 |
| commit | aa7491e356dfa04057fb94fc349c60300e60bd7b (patch) | |
| tree | 12890ef9bb3894f3cc28620aafbafd871b1f3c04 /src/CudaProjector3D.cpp | |
| parent | 817f0fd5a5b9484f77012bd773cd01053e1f81a4 (diff) | |
| download | astra-aa7491e356dfa04057fb94fc349c60300e60bd7b.tar.gz astra-aa7491e356dfa04057fb94fc349c60300e60bd7b.tar.bz2 astra-aa7491e356dfa04057fb94fc349c60300e60bd7b.tar.xz astra-aa7491e356dfa04057fb94fc349c60300e60bd7b.zip | |
Implement loading geometries into Projector3D
Diffstat (limited to 'src/CudaProjector3D.cpp')
| -rw-r--r-- | src/CudaProjector3D.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp index 4687825..c31b789 100644 --- a/src/CudaProjector3D.cpp +++ b/src/CudaProjector3D.cpp @@ -28,6 +28,9 @@ $Id$ #include "astra/CudaProjector3D.h" +#include "astra/VolumeGeometry3D.h" +#include "astra/ProjectionGeometry3D.h" + namespace astra { @@ -102,21 +105,7 @@ bool CCudaProjector3D::initialize(const Config& _cfg) return false; } - // TODO: These should go to the parent. - - // ProjectionGeometry - XMLNode* node = _cfg.self->getSingleNode("ProjectionGeometry"); - // TODO: Implement - ASTRA_DELETE(node); - CC.markNodeParsed("ProjectionGeometry"); - - // ReconstructionGeometry - node = _cfg.self->getSingleNode("VolumeGeometry"); - // TODO: Implement - ASTRA_DELETE(node); - CC.markNodeParsed("VolumeGeometry"); - - node = _cfg.self->getSingleNode("ProjectionKernel"); + XMLNode* node = _cfg.self->getSingleNode("ProjectionKernel"); m_projectionKernel = ker3d_default; if (node) { std::string sProjKernel = node->getContent(); |