From 71db6331f8dd0d5abbeee92977af01293be4f427 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 15:54:07 +0100 Subject: Update headers (website+2016) --- include/astra/Float32VolumeData3DMemory.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include/astra/Float32VolumeData3DMemory.h') diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index 619d83b..870c6e2 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA3DMEMORY -- cgit v1.2.3 From 3b26f7643d39f4b7a00a96c160dc9bd13722f14c Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 23 Jan 2017 13:25:52 +0100 Subject: Fix warning --- include/astra/Float32VolumeData3DMemory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/astra/Float32VolumeData3DMemory.h') diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index 870c6e2..70f0939 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.h @@ -156,7 +156,7 @@ public: * * @return pointer to volume geometry. */ - CVolumeGeometry3D* getGeometry(); + CVolumeGeometry3D* getGeometry() const; /** * Gets a slice, containing all voxels with a given x (= column) index. @@ -218,7 +218,7 @@ public: //---------------------------------------------------------------------------------------- // Get the projection geometry. -inline CVolumeGeometry3D* CFloat32VolumeData3DMemory::getGeometry() +inline CVolumeGeometry3D* CFloat32VolumeData3DMemory::getGeometry() const { ASTRA_ASSERT(m_bInitialized); return m_pGeometry; -- cgit v1.2.3 From e8f6dd643fc04588cb8a8eaa8453c0eb6d40e236 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 28 Oct 2016 09:35:21 +0200 Subject: Remove unused data3d functions --- include/astra/Float32VolumeData3DMemory.h | 49 ------------------------------- 1 file changed, 49 deletions(-) (limited to 'include/astra/Float32VolumeData3DMemory.h') diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index 70f0939..4a70f65 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.h @@ -158,55 +158,6 @@ public: */ CVolumeGeometry3D* getGeometry() const; - /** - * Gets a slice, containing all voxels with a given x (= column) index. - */ - CFloat32VolumeData2D * fetchSliceX(int _iColumnIndex) const; - - /** - * Gets a slice, containing all voxels with a given y (= row) index. - */ - CFloat32VolumeData2D * fetchSliceY(int _iRowIndex) const; - - /** - * Gets a slice, containing all voxels with a given z (= slice) index. - */ - CFloat32VolumeData2D * fetchSliceZ(int _iSliceIndex) const; - - /** - * Gets a slice, containing all voxels with a given x (= column) index. - */ - void returnSliceX(int _iColumnIndex, CFloat32VolumeData2D * _pSliceData); - - /** - * Gets a slice, containing all voxels with a given y (= row) index. - */ - void returnSliceY(int _iRowIndex, CFloat32VolumeData2D * _pSliceData); - - /** - * Copies data from a 2D slice containing all voxels with a given z (= slice) index to the - * 3D memory stored in this class. - */ - void returnSliceZ(int _iSliceIndex, CFloat32VolumeData2D * _pSliceData); - - /** This SLOW function returns a volume value stored a specific index in the array. - * Reading values in this way might cause a lot of unnecessary memory operations, don't - * use it in time-critical code. - * - * @param _iIndex Index in the array if the data were stored completely in main memory - * @return The value the location specified by _iIndex - */ - virtual float32 getVoxelValue(int _iIndex); - - /** This SLOW function stores a voxel value at a specific index in the array. - * Writing values in this way might cause a lot of unnecessary memory operations, don't - * use it in time-critical code. - * - * @param _iIndex Index in the array if the data were stored completely in main memory - * @param _fValue The value to be stored at the location specified by _iIndex - */ - virtual void setVoxelValue(int _iIndex, float32 _fValue); - /** * Overloaded Operator: data = data (pointwise) * -- cgit v1.2.3