From e2d5375ecc5c8fc45b796e0bd9d948cd729abcc9 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 24 Jan 2019 13:48:49 +0100 Subject: Remove largely unimplemented CProjector2D::projectPoint method This includes the astra_mex_projector('splat') matlab function. --- src/ParallelBeamDistanceDrivenProjector2D.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/ParallelBeamDistanceDrivenProjector2D.cpp') diff --git a/src/ParallelBeamDistanceDrivenProjector2D.cpp b/src/ParallelBeamDistanceDrivenProjector2D.cpp index a4ac450..531bef9 100644 --- a/src/ParallelBeamDistanceDrivenProjector2D.cpp +++ b/src/ParallelBeamDistanceDrivenProjector2D.cpp @@ -32,8 +32,7 @@ along with the ASTRA Toolbox. If not, see . #include "astra/DataProjectorPolicies.h" -using namespace std; -using namespace astra; +namespace astra { #include "astra/ParallelBeamDistanceDrivenProjector2D.inl" @@ -140,8 +139,8 @@ bool CParallelBeamDistanceDrivenProjector2D::initialize(CParallelProjectionGeome // Get maximum amount of weights on a single ray int CParallelBeamDistanceDrivenProjector2D::getProjectionWeightsCount(int _iProjectionIndex) { - int maxDim = max(m_pVolumeGeometry->getGridRowCount(), m_pVolumeGeometry->getGridColCount()); - int scale = m_pProjectionGeometry->getDetectorWidth() / min(m_pVolumeGeometry->getPixelLengthX(), m_pVolumeGeometry->getPixelLengthY()); + int maxDim = std::max(m_pVolumeGeometry->getGridRowCount(), m_pVolumeGeometry->getGridColCount()); + int scale = m_pProjectionGeometry->getDetectorWidth() / std::min(m_pVolumeGeometry->getPixelLengthX(), m_pVolumeGeometry->getPixelLengthY()); return maxDim * scale * 10 + 1; } @@ -159,16 +158,4 @@ void CParallelBeamDistanceDrivenProjector2D::computeSingleRayWeights(int _iProje _iStoredPixelCount = p.getStoredPixelCount(); } -//---------------------------------------------------------------------------------------- -// Splat a single point -std::vector CParallelBeamDistanceDrivenProjector2D::projectPoint(int _iRow, int _iCol) -{ - // TODO - assert(false); - - std::vector res; - - // return result vector - return res; - } -- cgit v1.2.3