Remove unused data3d functions

4 files changed, 0 insertions, 213 deletions

diff --git a/include/astra/Float32ProjectionData3D.h b/include/astra/Float32ProjectionData3D.h
index ae0664b..1634eeb 100644
--- a/include/astra/Float32ProjectionData3D.h
+++ b/include/astra/Float32ProjectionData3D.h
@@ -85,55 +85,6 @@ public:
 	 */
 	virtual CFloat32Data3D::EDataType getType() const;
 
-	/** Fetch a COPY of a projection of the data.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data back in the 3D-volume you must return the data by calling 'returnProjection'.
-	 *
-	 * @param _iProjectionNr projection number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchProjection(int _iProjectionNr) const = 0;
-	
-	/** Return a projection slice to the 3d data.  The data will be deleted. If the slice was fetched with 
-	 * 'fetchProjection', the data will be stored first. 
-	 *
-	 * @param _iProjectionNr projection number
-	 * @param _pProjection 2D Projection Data
-	 */
-	virtual void returnProjection(int _iProjectionNr, CFloat32VolumeData2D* _pProjection) = 0;
-
-	/** Fetch a COPY of a sinogram slice of the data.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data back in the 3D-volume you must return the data by calling 'returnSlice'.
-	 *
-	 * @param _iSliceNr slice number
-	 * @return Sinogram data object
-	 */
-	virtual CFloat32ProjectionData2D* fetchSinogram(int _iSliceNr) const = 0;
-
-	/** Return a sinogram slice to the 3d data.  The data will be stored in the 3D Data object.
-	 *
-	 * @param _iSliceNr slice number
-	 * @param _pSinogram2D 2D Sinogram Object.
-	 */
-	virtual void returnSinogram(int _iSliceNr, CFloat32ProjectionData2D* _pSinogram2D) = 0;
-
-	/** This SLOW function returns a detector value stored a specific index in the array.
-	 *  Reading values in this way might cause a lot of unnecessar__y 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 getDetectorValue(int _iIndex) = 0;
-
-	/** This SLOW function stores a detector 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 setDetectorValue(int _iIndex, float32 _fValue) = 0;
-
 	/**
 	 * Overloaded Operator: data += data (pointwise)
 	 *
diff --git a/include/astra/Float32ProjectionData3DMemory.h b/include/astra/Float32ProjectionData3DMemory.h
index 14bae36..732c31a 100644
--- a/include/astra/Float32ProjectionData3DMemory.h
+++ b/include/astra/Float32ProjectionData3DMemory.h
@@ -166,55 +166,6 @@ public:
 
 
 
-	/** Fetch a COPY of a projection of the data.  Note that if you update the 2D data slice, the data in the 
-	 * 3D data object will remain unaltered.  To copy the data back in the 3D-volume you must return the data by calling 'returnProjection'.
-	 *
-	 * @param _iProjectionNr projection number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchProjection(int _iProjectionNr) const;
-	
-	/** Return a projection slice to the 3D data.  The data will be deleted. If the slice was fetched with 
-	 * 'fetchProjection', the data will be stored first. 
-	 *
-	 * @param _iProjectionNr projection number
-	 * @param _pProjection 2D Projection image
-	 */
-	virtual void returnProjection(int _iProjectionNr, CFloat32VolumeData2D* _pProjection);
-
-	/** Fetch a COPY of a sinogram slice of the data.  Note that if you update the 2D data slice, the data in the 
-	 * 3D data object will remain unaltered.  To copy the data back in the 3D-volume you must return the data by calling 'returnSlice'.
-	 *
-	 * @param _iSliceNr slice number
-	 * @return Sinogram data object
-	 */
-	virtual CFloat32ProjectionData2D* fetchSinogram(int _iSliceNr) const;
-
-	/** This SLOW function returns a detector 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 getDetectorValue(int _iIndex);
-
-	/** This SLOW function stores a detector 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 setDetectorValue(int _iIndex, float32 _fValue);
-
-	/** Return a sinogram slice to the 3d data.  The data will be stored in the 3D Data object.
-	 *
-	 * @param _iSliceNr slice number
-	 * @param _pSinogram2D 2D Sinogram Object.
-	 */
-	virtual void returnSinogram(int _iSliceNr, CFloat32ProjectionData2D* _pSinogram2D);
-
 	/** Which type is this class?
 	 *
 	 * @return DataType: PROJECTION 
diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h
index 7a32efe..535e960 100644
--- a/include/astra/Float32VolumeData3D.h
+++ b/include/astra/Float32VolumeData3D.h
@@ -85,72 +85,6 @@ public:
 	 */
 	virtual CFloat32Data3D::EDataType getType() const;
 	
-	/** Fetch a slice from the data in the x direction.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data you must return the data by calling 'returnSliceX'.
-	 * You should not delete data fetched with this function yourself, instead call the 'returnSliceX' function.
-	 *
-	 * @param _iColumnIndex slice number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchSliceX(int _iColumnIndex) const = 0;
-
-	/** Fetch a slice from the data in the y direction.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data you must return the data by calling 'returnSliceY'.
-	 * You should not delete data fetched with this function yourself, instead call the 'returnSliceY' function.
-	 *
-	 * @param _iRowIndex slice number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchSliceY(int _iRowIndex) const = 0;
-
-	/** Fetch a slice from the data in the z direction.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data you must return the data by calling 'returnSliceZ'.
-	 * You should not delete data fetched with this function yourself, instead call the 'returnSliceZ' function.
-	 *
-	 * @param _iSliceIndex slice number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchSliceZ(int _iSliceIndex) const = 0;
-
-	/** Return a slice from the data in the x direction to the 3d data.  The data will be deleted. If the slice was 
-	 * fetched with 'fetchSliceX', the data will be stored first. 
-	 *
-	 * @param _iColumnIndex slice number
-	 */
-	virtual void returnSliceX(int _iColumnIndex, CFloat32VolumeData2D * _pSlice) = 0;
-	
-	/** Return a slice from the data in the y direction to the 3d data.  The data will be deleted. If the slice was 
-	 * fetched with 'fetchSliceY', the data will be stored first. 
-	 *
-	 * @param _iRowIndex slice number
-	 */
-	virtual void returnSliceY(int _iRowIndex, CFloat32VolumeData2D * _pSlice) = 0;
-
-	/** Return a slice from the data in the z direction to the 3d data.  The data will be deleted. If the slice was 
-	 * fetched with 'fetchSliceZ', the data will be stored first. 
-	 *
-	 * @param _iSliceIndex slice number
-	 */
-	virtual void returnSliceZ(int _iSliceIndex, CFloat32VolumeData2D * _pSlice) = 0;
-
-	/** This SLOW function returns a voxel value stored at 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 stored at the location specified by _iIndex
-	 */
-	virtual float32 getVoxelValue(int _iIndex) = 0;
-
-	/** 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) = 0;
-
 	/**
 	 * Overloaded Operator: data += data (pointwise)
 	 *
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
@@ -159,55 +159,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)
 	 *
 	 * @param _dataIn r-value