Commit 333c45d8 authored by Sylvain Thery's avatar Sylvain Thery

resolve some problems in marching-cube

parent 4f6dd032
......@@ -121,17 +121,17 @@ protected:
/**
* position of the first slice in image
*/
int32 m_lZpos;
int m_lZpos;
/**
* width of slice
*/
int32 m_lWidth;
int m_lWidth;
/**
* heigth of slice
*/
int32 m_lHeight;
int m_lHeight;
public:
......@@ -142,15 +142,15 @@ public:
* @param _lWidth the width of image to buffer
* @param _lHeight the height of image to buffer
*/
Buffer(int32 _lWidth, int32 _lHeight);
Buffer(int _lWidth, int _lHeight);
~Buffer();
/**
* @name Function to store the index of a point on edge O..11 of a cube
* @param int32 _lX coordinate of the cube
* @param int32 _lY coordinate of the cube
* @param int32 _lPoint the index of the point
* @param int _lX coordinate of the cube
* @param int _lY coordinate of the cube
* @param int _lPoint the index of the point
*/
//@{
/**
......@@ -159,26 +159,26 @@ public:
* @param _lY coordinate of the cube
* @param _lPoint the embedding
*/
void setPointEdge0 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge1 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge2 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge3 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge4 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge5 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge6 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge7 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge8 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge9 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge10(int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge11(int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge0 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge1 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge2 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge3 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge4 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge5 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge6 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge7 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge8 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge9 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge10(int _lX,int _lY, unsigned int _lPoint);
void setPointEdge11(int _lX,int _lY, unsigned int _lPoint);
//@}
/**
* @name Function to get the index of point store on edge O..11 of a cube
****************************************************
* @param int32 _lX coordinate of the cube
* @param int32 _lY coordinate of the cube
* @param int32 _lPoint the index of the point
* @param int _lX coordinate of the cube
* @param int _lY coordinate of the cube
* @param int _lPoint the index of the point
*/
//@{
/**
......@@ -188,18 +188,18 @@ public:
* @param _lY coordinate of the cube
* @return the index of the point
*/
unsigned int getPointEdge0 (int32 _lX,int32 _lY);
unsigned int getPointEdge1 (int32 _lX,int32 _lY);
unsigned int getPointEdge2 (int32 _lX,int32 _lY);
unsigned int getPointEdge3 (int32 _lX,int32 _lY);
unsigned int getPointEdge4 (int32 _lX,int32 _lY);
unsigned int getPointEdge5 (int32 _lX,int32 _lY);
unsigned int getPointEdge6 (int32 _lX,int32 _lY);
unsigned int getPointEdge7 (int32 _lX,int32 _lY);
unsigned int getPointEdge8 (int32 _lX,int32 _lY);
unsigned int getPointEdge9 (int32 _lX,int32 _lY);
unsigned int getPointEdge10(int32 _lX,int32 _lY);
unsigned int getPointEdge11(int32 _lX,int32 _lY);
unsigned int getPointEdge0 (int _lX,int _lY);
unsigned int getPointEdge1 (int _lX,int _lY);
unsigned int getPointEdge2 (int _lX,int _lY);
unsigned int getPointEdge3 (int _lX,int _lY);
unsigned int getPointEdge4 (int _lX,int _lY);
unsigned int getPointEdge5 (int _lX,int _lY);
unsigned int getPointEdge6 (int _lX,int _lY);
unsigned int getPointEdge7 (int _lX,int _lY);
unsigned int getPointEdge8 (int _lX,int _lY);
unsigned int getPointEdge9 (int _lX,int _lY);
unsigned int getPointEdge10(int _lX,int _lY);
unsigned int getPointEdge11(int _lX,int _lY);
//@}
/**
......@@ -209,7 +209,7 @@ public:
* @param _lY y coordinate of cube
* @return table of faces
*/
DART* getFacesCubeTableAdr(int32 _lX,int32 _lY);
DART* getFacesCubeTableAdr(int _lX,int _lY);
/**
* get dart table of faces stored on edge O..11 of a cube
......@@ -219,7 +219,7 @@ public:
* @param _lZ z coordinate of the cube
* @return table of faces
*/
const DART* getFacesCube(int32 _lX,int32 _lY,int32 _lZ) const;
const DART* getFacesCube(int _lX,int _lY,int _lZ) const;
/**
......@@ -229,7 +229,7 @@ public:
* @param _lY y coordinate of the cube
* @param _lFace table of faces index
*/
void setFacesCube(int32 _lX,int32 _lY, const DART* const _lFace);
void setFacesCube(int _lX,int _lY, const DART* const _lFace);
/**
......@@ -246,7 +246,7 @@ public:
* @param _lNeighbour neighbour to store
*/
void setExternalNeighbour(int8 _cEdge, int32 _lX, int32 _lY, DART _lNeighbour);
void setExternalNeighbour(char _cEdge, int _lX, int _lY, DART _lNeighbour);
/**
* get neighbour stored on edge O..11 of a cube
......@@ -256,7 +256,7 @@ public:
* @param _lY y coordinate of the cube
* @return the neighbour
*/
DART getExternalNeighbour(int8 _cEdge, int32 _lX, int32 _lY) const ;
DART getExternalNeighbour(char _cEdge, int _lX, int _lY) const ;
};
......
......@@ -35,7 +35,7 @@ namespace MC
* constructor
*/
template<typename DART>
Buffer<DART>::Buffer(int32 _lWidth, int32 _lHeight)
Buffer<DART>::Buffer(int _lWidth, int _lHeight)
{
m_lWidth = _lWidth+1;
m_lHeight = _lHeight+1;
......@@ -62,7 +62,7 @@ Buffer<DART>::~Buffer()
* get the face inside a cube of the buffer
*/
// template <typename DART>
// const DART* Buffer<DART>::getFacesCube(int32 _lX, int32 _lY, int32 _lZ) const
// const DART* Buffer<DART>::getFacesCube(int _lX, int _lY, int _lZ) const
// {
//
// if (_lZ == m_lZpos) // if current slice ..
......@@ -83,7 +83,7 @@ Buffer<DART>::~Buffer()
* set the face inside a cube of the buffer
*/
template <typename DART>
void Buffer<DART>::setFacesCube(int32 _lX,int32 _lY, const DART* const _lFace)
void Buffer<DART>::setFacesCube(int _lX,int _lY, const DART* const _lFace)
{
// get the address of cube's table
DART* lLocFaces = m_hcSlice1[_lX + _lY*m_lWidth].m_lFaceEdges;
......@@ -114,7 +114,7 @@ void Buffer<DART>::nextSlice()
* get address of face table for direct access
*/
template <typename DART>
DART* Buffer<DART>::getFacesCubeTableAdr(int32 _lX,int32 _lY)
DART* Buffer<DART>::getFacesCubeTableAdr(int _lX,int _lY)
{
return m_hcSlice0[_lX + _lY*m_lWidth].m_lFaceEdges;
}
......@@ -125,84 +125,84 @@ DART* Buffer<DART>::getFacesCubeTableAdr(int32 _lX,int32 _lY)
*/
template <typename DART>
void Buffer<DART>::setPointEdge0(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge0(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX + _lY*m_lWidth].m_lX = _lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge3(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge3(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX +(_lY-1)*m_lWidth].m_lY = _lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge8(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge8(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX + _lY*m_lWidth].m_lZ = _lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge2(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge2(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[(_lX-1) +_lY*m_lWidth].m_lX =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge11(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge11(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX + _lY*m_lWidth].m_lZ = _lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge1(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge1(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX +_lY*m_lWidth].m_lY =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge9(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge9(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX +_lY*m_lWidth].m_lZ =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge10(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge10(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice0[_lX +_lY*m_lWidth].m_lZ =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge7(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge7(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice1[_lX +(_lY-1)*m_lWidth].m_lY =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge4(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge4(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice1[_lX +_lY*m_lWidth].m_lX =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge6(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge6(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice1[(_lX-1) + _lY*m_lWidth].m_lX =_lPoint;
}
template <typename DART>
void Buffer<DART>::setPointEdge5(int32 _lX,int32 _lY, unsigned int _lPoint)
void Buffer<DART>::setPointEdge5(int _lX,int _lY, unsigned int _lPoint)
{
m_hcSlice1[_lX +_lY*m_lWidth].m_lY =_lPoint;
}
......@@ -213,91 +213,91 @@ void Buffer<DART>::setPointEdge5(int32 _lX,int32 _lY, unsigned int _lPoint)
*/
template <typename DART>
unsigned int Buffer<DART>::getPointEdge0(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge0(int _lX,int _lY)
{
return m_hcSlice0[_lX + _lY*m_lWidth].m_lX;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge3(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge3(int _lX,int _lY)
{
return m_hcSlice0[_lX +_lY*m_lWidth].m_lY;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge8(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge8(int _lX,int _lY)
{
return m_hcSlice0[_lX + _lY*m_lWidth].m_lZ;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge2(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge2(int _lX,int _lY)
{
return m_hcSlice0[_lX +(_lY+1)*m_lWidth].m_lX;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge11(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge11(int _lX,int _lY)
{
return m_hcSlice0[_lX + (_lY+1)*m_lWidth].m_lZ;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge1(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge1(int _lX,int _lY)
{
return m_hcSlice0[(_lX+1) +_lY*m_lWidth].m_lY;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge9(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge9(int _lX,int _lY)
{
return m_hcSlice0[(_lX+1) +_lY*m_lWidth].m_lZ;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge10(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge10(int _lX,int _lY)
{
return m_hcSlice0[(_lX+1) +(_lY+1)*m_lWidth].m_lZ;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge7(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge7(int _lX,int _lY)
{
return m_hcSlice1[_lX +_lY*m_lWidth].m_lY;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge4(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge4(int _lX,int _lY)
{
return m_hcSlice1[_lX +_lY*m_lWidth].m_lX;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge6(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge6(int _lX,int _lY)
{
return m_hcSlice1[_lX +(_lY+1)*m_lWidth].m_lX;
}
template <typename DART>
unsigned int Buffer<DART>::getPointEdge5(int32 _lX,int32 _lY)
unsigned int Buffer<DART>::getPointEdge5(int _lX,int _lY)
{
return m_hcSlice1[(_lX+1) +_lY*m_lWidth].m_lY;
}
template <typename DART>
DART Buffer<DART>::getExternalNeighbour(int8 _cEdge, int32 _lX, int32 _lY) const
DART Buffer<DART>::getExternalNeighbour(char _cEdge, int _lX, int _lY) const
{
switch(_cEdge)
......@@ -362,7 +362,7 @@ CGoGNerr << "ERROR"<<CGoGNendl;
template <typename DART>
void Buffer<DART>::setExternalNeighbour(int8 _cEdge, int32 _lX, int32 _lY, DART _lNeighbour)
void Buffer<DART>::setExternalNeighbour(char _cEdge, int _lX, int _lY, DART _lNeighbour)
{
switch(_cEdge)
{
......
......@@ -128,17 +128,17 @@ protected:
/**
* position of the first slice in image
*/
int32 m_lZpos;
int m_lZpos;
/**
* width of slice
*/
int32 m_lWidth;
int m_lWidth;
/**
* heigth of slice
*/
int32 m_lHeight;
int m_lHeight;
public:
......@@ -149,7 +149,7 @@ public:
* @param _lWidth the width of image to buffer
* @param _lHeight the height of image to buffer
*/
BufferGen(int32 _lWidth, int32 _lHeight);
BufferGen(int _lWidth, int _lHeight);
~BufferGen();
......@@ -159,9 +159,9 @@ public:
/**
* @name Function to store the index of a point on edge O..11 of a cube
* @param int32 _lX coordinate of the cube
* @param int32 _lY coordinate of the cube
* @param int32 _lPoint the index of the point
* @param int _lX coordinate of the cube
* @param int _lY coordinate of the cube
* @param int _lPoint the index of the point
*/
//@{
/**
......@@ -170,26 +170,26 @@ public:
* @param _lY coordinate of the cube
* @param _lPoint the embedding
*/
void setPointEdge0 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge1 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge2 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge3 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge4 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge5 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge6 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge7 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge8 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge9 (int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge10(int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge11(int32 _lX,int32 _lY, unsigned int _lPoint);
void setPointEdge0 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge1 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge2 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge3 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge4 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge5 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge6 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge7 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge8 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge9 (int _lX,int _lY, unsigned int _lPoint);
void setPointEdge10(int _lX,int _lY, unsigned int _lPoint);
void setPointEdge11(int _lX,int _lY, unsigned int _lPoint);
//@}
/**
* @name Function to get the index of point store on edge O..11 of a cube
****************************************************
* @param int32 _lX coordinate of the cube
* @param int32 _lY coordinate of the cube
* @param int32 _lPoint the index of the point
* @param int _lX coordinate of the cube
* @param int _lY coordinate of the cube
* @param int _lPoint the index of the point
*/
//@{
/**
......@@ -199,18 +199,18 @@ public:
* @param _lY coordinate of the cube
* @return the index of the point
*/
unsigned int getPointEdge0 (int32 _lX,int32 _lY);
unsigned int getPointEdge1 (int32 _lX,int32 _lY);
unsigned int getPointEdge2 (int32 _lX,int32 _lY);
unsigned int getPointEdge3 (int32 _lX,int32 _lY);
unsigned int getPointEdge4 (int32 _lX,int32 _lY);
unsigned int getPointEdge5 (int32 _lX,int32 _lY);
unsigned int getPointEdge6 (int32 _lX,int32 _lY);
unsigned int getPointEdge7 (int32 _lX,int32 _lY);
unsigned int getPointEdge8 (int32 _lX,int32 _lY);
unsigned int getPointEdge9 (int32 _lX,int32 _lY);
unsigned int getPointEdge10(int32 _lX,int32 _lY);
unsigned int getPointEdge11(int32 _lX,int32 _lY);
unsigned int getPointEdge0 (int _lX,int _lY);
unsigned int getPointEdge1 (int _lX,int _lY);
unsigned int getPointEdge2 (int _lX,int _lY);
unsigned int getPointEdge3 (int _lX,int _lY);
unsigned int getPointEdge4 (int _lX,int _lY);
unsigned int getPointEdge5 (int _lX,int _lY);
unsigned int getPointEdge6 (int _lX,int _lY);
unsigned int getPointEdge7 (int _lX,int _lY);
unsigned int getPointEdge8 (int _lX,int _lY);
unsigned int getPointEdge9 (int _lX,int _lY);
unsigned int getPointEdge10(int _lX,int _lY);
unsigned int getPointEdge11(int _lX,int _lY);
//@}
/**
......@@ -220,7 +220,7 @@ public:
* @param _lY y coordinate of cube
* @return table of faces
*/
DART* getFacesCubeTableAdr(int32 _lX,int32 _lY);
DART* getFacesCubeTableAdr(int _lX,int _lY);
/**
* get dart table of faces stored on edge O..11 of a cube
......@@ -230,7 +230,7 @@ public:
* @param _lZ z coordinate of the cube
* @return table of faces
*/
const DART* getFacesCube(int32 _lX,int32 _lY,int32 _lZ) const;
const DART* getFacesCube(int _lX,int _lY,int _lZ) const;
/**
......@@ -240,7 +240,7 @@ public:
* @param _lY y coordinate of the cube
* @param _lFace table of faces index
*/
void setFacesCube(int32 _lX,int32 _lY, const DART* const _lFace);
void setFacesCube(int _lX,int _lY, const DART* const _lFace);
/**
......@@ -257,7 +257,7 @@ public:
* @param _lNeighbour neighbour to store
*/
void setExternalNeighbour(int8 _cEdge, int32 _lX, int32 _lY, DART _lNeighbour);
void setExternalNeighbour(char _cEdge, int _lX, int _lY, DART _lNeighbour);
/**
* get neighbour stored on edge O..11 of a cube
......@@ -267,16 +267,16 @@ public:
* @param _lY y coordinate of the cube
* @return the neighbour
*/
DART getExternalNeighbour(int8 _cEdge, int32 _lX, int32 _lY) const ;
DART getExternalNeighbour(char _cEdge, int _lX, int _lY) const ;
void setData(int32 _lX, int32 _lY, DATATYPE data);
void setData(int _lX, int _lY, DATATYPE data);
DATATYPE getData(int32 _lX, int32 _lY);
DATATYPE getData(int _lX, int _lY);
void setData2(int32 _lX, int32 _lY, DATATYPE data);
void setData2(int _lX, int _lY, DATATYPE data);
DATATYPE getData2(int32 _lX, int32 _lY);
DATATYPE getData2(int _lX, int _lY);
DATATYPE* getDataPtr() { return m_dataSl0;}
DATATYPE* getData2Ptr() {return m_dataSl1;}
......
This diff is collapsed.
......@@ -27,7 +27,6 @@
#include "Geometry/vector_gen.h"
#include "Algo/MC/type.h"
#include "Utils/img3D_IO.h"
......@@ -76,23 +75,23 @@ protected:
/**
* slice size
*/
int32 m_WXY;
int m_WXY;
/**
* X origin
*/
int32 m_OX;
int m_OX;
/**
* Y origin
*/
int32 m_OY;
int m_OY;
/**
* Z origin
*/
int32 m_OZ;
int m_OZ;
/**
......@@ -171,7 +170,7 @@ public:
* @param sz voxel size in Z
* @param copy sets to true if data must be copying, false if data are used directly (and release by the destructor).
*/
Image(DataType *data, int32 wx, int32 wy, int32 wz, float sx, float sy, float sz, bool copy = false );
Image(DataType *data, int wx, int wy, int wz, float sx, float sy, float sz, bool copy = false );
/**
......@@ -193,22 +192,22 @@ public:
/**
* get the width along X axis
*/
int32 getWidthX() const { return m_WX;}
int getWidthX() const { return m_WX;}
/**
* get the width along Y axis
*/
int32 getWidthY() const { return m_WY;}
int getWidthY() const { return m_WY;}
/**
* get the width along Z axis
*/
int32 getWidthZ() const { return m_WZ;}
int getWidthZ() const { return m_WZ;}
/**
* get widthX*widthY (size of a slice)
*/
int32 getWidthXY() const { return m_WXY;}
int getWidthXY() const { return m_WXY;}
/** set the real size of voxel of image
* @param vx x size
......@@ -222,7 +221,7 @@ public:
* @param oy y size
* @param oz z size
*/
void setOrigin(int32 ox, int32 oy, int32 oz) {m_OX = ox; m_OY = oy; m_OZ = oz;}
void setOrigin(int ox, int oy, int oz) {m_OX = ox; m_OY = oy; m_OZ = oz;}
/**
* get the origin
......@@ -262,7 +261,7 @@ public:
* @param _lX,_lY,_lZ position
* @return the value of the voxel
*/
DataType getVoxel(int32 _lX,int32 _lY, int32 _lZ);
DataType getVoxel(int _lX,int _lY, int _lZ);
/**
* get the voxel address (const ptr)
......@@ -270,7 +269,7 @@ public:
* @param _lX,_lY,_lZ position
* @return the address of the voxel
*/
const DataType* getVoxelPtr(int32 _lX,int32 _lY, int32 _lZ) const;
const DataType* getVoxelPtr(int _lX,int _lY, int _lZ) const;
/**
* get the voxel address
......@@ -278,7 +277,7 @@ public:
* @param _lX,_lY,_lZ position
* @return the address of the voxel
*/
DataType* getVoxelPtr(int32 _lX,int32 _lY, int32 _lZ);
DataType* getVoxelPtr(int _lX,int _lY, int _lZ);
/**
......@@ -295,14 +294,14 @@ public:
* @param _lWidth width of filtering
* @return the new image
*/
Image<DataType>* filtering(int32 _lWidth);
Image<DataType>* filtering(int _lWidth);
/**
* add Frame of zero around the image
* @param _lWidth the width of frame to add
* @return the new image
*/
Image<DataType>* addFrame(int32 _lWidth);
Image<DataType>* addFrame(int _lWidth) const;
/**
* Get the lower corner of bounding AABB
......@@ -336,7 +335,7 @@ public:
void createMaskOffsetCylinders(std::vector<int>& tableX, std::vector<int>& tableY, std::vector<int>& tableZ, int _i32radius);