diff options
| author | Wim van Aarle <wimvanaarle@gmail.com> | 2015-02-24 16:58:50 +0100 |
|---|---|---|
| committer | Wim van Aarle <wimvanaarle@gmail.com> | 2015-02-24 16:58:50 +0100 |
| commit | 85f397c64461499a27b13e84fbc0348b19feb248 (patch) | |
| tree | 0f91f91b004021c1663715bb02f3a7f072d32d0f /matlab/mex | |
| parent | 569515f3e20ef3b3c2c4a777f38f45dc67e6f9b6 (diff) | |
| download | astra-85f397c64461499a27b13e84fbc0348b19feb248.tar.gz astra-85f397c64461499a27b13e84fbc0348b19feb248.tar.bz2 astra-85f397c64461499a27b13e84fbc0348b19feb248.tar.xz astra-85f397c64461499a27b13e84fbc0348b19feb248.zip | |
re-enabled get_geometry for 3d projectors
Diffstat (limited to 'matlab/mex')
| -rw-r--r-- | matlab/mex/astra_mex_projector3d_c.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp index 25980f9..95b3e0f 100644 --- a/matlab/mex/astra_mex_projector3d_c.cpp +++ b/matlab/mex/astra_mex_projector3d_c.cpp @@ -135,16 +135,16 @@ void astra_mex_projector3d_get_projection_geometry(int nlhs, mxArray* plhs[], in } // step3: get projection_geometry and turn it into a MATLAB struct - //if (1 <= nlhs) { - // plhs[0] = createProjectionGeometryStruct(pProjector->getProjectionGeometry()); - //} + if (1 <= nlhs) { + plhs[0] = createProjectionGeometryStruct(pProjector->getProjectionGeometry()); + } } //----------------------------------------------------------------------------------------- /** * [recon_geom] = astra_mex_projector3d('get_volume_geometry', pid); */ -void astra_mex_projector3d_get_reconstruction_geometry(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) +void astra_mex_projector3d_get_volume_geometry(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) { // step1: read input if (nrhs < 2) { @@ -161,9 +161,9 @@ void astra_mex_projector3d_get_reconstruction_geometry(int nlhs, mxArray* plhs[] } // step3: get projection_geometry and turn it into a MATLAB struct - //if (1 <= nlhs) { - // plhs[0] = createVolumeGeometryStruct(pProjector->getVolumeGeometry()); - //} + if (1 <= nlhs) { + plhs[0] = createVolumeGeometryStruct(pProjector->getVolumeGeometry()); + } } //----------------------------------------------------------------------------------------- @@ -413,7 +413,7 @@ void mexFunction(int nlhs, mxArray* plhs[], } else if (sMode == "get_projection_geometry") { astra_mex_projector3d_get_projection_geometry(nlhs, plhs, nrhs, prhs); } else if (sMode == "get_volume_geometry") { - astra_mex_projector3d_get_reconstruction_geometry(nlhs, plhs, nrhs, prhs); + astra_mex_projector3d_get_volume_geometry(nlhs, plhs, nrhs, prhs); } else if (sMode == "weights_single_ray") { astra_mex_projector_weights_single_ray(nlhs, plhs, nrhs, prhs); //} else if (sMode == "weights_projection") { |