1 files changed, 4 insertions, 95 deletions

diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp
index 14adb1a..27ae87b 100644
--- a/src/Float32VolumeData3DMemory.cpp
+++ b/src/Float32VolumeData3DMemory.cpp
@@ -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 <http://www.gnu.org/licenses/>.
 
 -----------------------------------------------------------------------
-$Id$
 */
 
 #include "astra/Float32VolumeData3DMemory.h"
@@ -115,103 +114,13 @@ bool CFloat32VolumeData3DMemory::initialize(CVolumeGeometry3D* _pGeometry, float
 }
 //----------------------------------------------------------------------------------------
 // Initialization
-bool CFloat32VolumeData3DMemory::initialize(CVolumeGeometry3D* _pGeometry, CFloat32CustomMemory* _pCustomMemory) 
+bool CFloat32VolumeData3DMemory::initialize(CVolumeGeometry3D* _pGeometry, CFloat32CustomMemory* _pCustomMemory)
 {
 	m_pGeometry = _pGeometry->clone();
 	m_bInitialized = _initialize(m_pGeometry->getGridColCount(), m_pGeometry->getGridRowCount(), m_pGeometry->getGridSliceCount(), _pCustomMemory);
 	return m_bInitialized;
 }
 
-
-//----------------------------------------------------------------------------------------
-// Fetch a slice
-CFloat32VolumeData2D * CFloat32VolumeData3DMemory::fetchSliceZ(int _iSliceIndex) const
-{
-	// fetch slice of the geometry
-	int iRowCount = m_pGeometry->getGridRowCount();
-	int iColumnCount = m_pGeometry->getGridColCount();
-	CVolumeGeometry2D volGeom(iColumnCount, iRowCount);
-
-	// create new volume data
-	CFloat32VolumeData2D* res = new CFloat32VolumeData2D(&volGeom);
-
-	// copy data
-	float * pfTargetData = res->getData();
-	for(int iRowIndex = 0; iRowIndex < iRowCount; iRowIndex++)
-	{
-		for(int iColumnIndex = 0; iColumnIndex < iColumnCount; iColumnIndex++)
-		{
-			int iSourceIndex = _iSliceIndex * iColumnCount * iRowCount + iRowIndex * iColumnCount + iColumnIndex;
-			int iTargetIndex = iRowIndex * iColumnCount + iColumnIndex;
-			float fStoredValue = m_pfData[iSourceIndex];
-			pfTargetData[iTargetIndex] = fStoredValue;
-		}
-	}
-	// return
-	return res;
-}
-
-//----------------------------------------------------------------------------------------
-// Return a slice
-void CFloat32VolumeData3DMemory::returnSliceZ(int _iSliceIndex, CFloat32VolumeData2D * _pSlice)
-{
-	int iRowCount = _pSlice->getGeometry()->getGridRowCount();
-	int iColumnCount = _pSlice->getGeometry()->getGridColCount();
-
-	assert(iRowCount == m_pGeometry->getGridRowCount());
-	assert(iColumnCount == m_pGeometry->getGridColCount());
-
-	for(int iRowIndex = 0; iRowIndex < iRowCount; iRowIndex++)
-	{
-		for(int iColumnIndex = 0; iColumnIndex < iColumnCount; iColumnIndex++)
-		{
-			int iSourceIndex = iRowIndex * iColumnCount + iColumnIndex;
-			int iTargetIndex = _iSliceIndex * iColumnCount * iRowCount + iRowIndex * iColumnCount + iColumnIndex;
-			float fStoredValue = _pSlice->getDataConst()[iSourceIndex];
-			m_pfData[iTargetIndex] = fStoredValue;
-		}
-	}
-}
-
-CFloat32VolumeData2D * CFloat32VolumeData3DMemory::fetchSliceX(int _iColumnIndex) const
-{
-	// TODO:
-	assert(false);
-	return NULL;
-}
-
-CFloat32VolumeData2D * CFloat32VolumeData3DMemory::fetchSliceY(int _iRowIndex) const
-{
-	// TODO:
-	assert(false);
-	return NULL;
-}
-
-void CFloat32VolumeData3DMemory::returnSliceX(int _iColumnIndex, CFloat32VolumeData2D * _pSliceData)
-{
-	// TODO:
-	assert(false);
-}
-
-void CFloat32VolumeData3DMemory::returnSliceY(int _iRowIndex, CFloat32VolumeData2D * _pSliceData)
-{
-	// TODO:
-	assert(false);
-}
-
-//----------------------------------------------------------------------------------------
-// Returns a specific value
-float32 CFloat32VolumeData3DMemory::getVoxelValue(int _iIndex)
-{
-	return m_pfData[_iIndex];
-}
-
-//----------------------------------------------------------------------------------------
-// Sets a specific value
-void CFloat32VolumeData3DMemory::setVoxelValue(int _iIndex, float32 _fValue)
-{
-	m_pfData[_iIndex] = _fValue;
-}
 //----------------------------------------------------------------------------------------
 
 CFloat32VolumeData3DMemory& CFloat32VolumeData3DMemory::operator=(const CFloat32VolumeData3DMemory& _dataIn)