diff --git a/Code/Common/otbPathFunction.h b/Code/Common/otbPathFunction.h
index 07ead2cf2503a76f1c56d7abd3952de538cd2db8..e5429e6ee597ccfff71c06690430fed11c9b3d35 100644
--- a/Code/Common/otbPathFunction.h
+++ b/Code/Common/otbPathFunction.h
@@ -59,11 +59,21 @@ public:
/** OutputType typedef support. */
typedef typename Superclass::OutputType OutputType;
+ /** Set the input path. */
+ virtual void SetInputPath( const InputPathType * ptr );
+
+ /** Get the input path. */
+ const InputPathType * GetInputPath() const
+ { return m_Path.GetPointer(); }
+
protected:
PathFunction();
~PathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ //OTB-FA-00022-CS
+ InputPathConstPointer m_Path;
+
private:
PathFunction(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
diff --git a/Code/Common/otbPathFunction.txx b/Code/Common/otbPathFunction.txx
index 53c6dc18b57bfa2812d32bf74714cc16572ab410..4f224eede305520f67517ea7fe4a4ebf9164c2ee 100644
--- a/Code/Common/otbPathFunction.txx
+++ b/Code/Common/otbPathFunction.txx
@@ -24,7 +24,7 @@ template <class TInputPath, class TOutput>
PathFunction< TInputPath,TOutput>
::PathFunction()
{
-
+ m_Path = NULL;
}
@@ -37,8 +37,20 @@ PathFunction<TInputPath, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf( os, indent );
+ os << indent << "InputPath: " << m_Path.GetPointer() << std::endl;
}
+/**
+ * Initialize by setting the input image
+ */
+template <class TInputPath, class TOutput>
+void
+PathFunction<TInputPath, TOutput>
+::SetInputPath(const InputPathType * ptr )
+{
+ // set the input path
+ m_Path = ptr;
+}
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.h b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
index 2bde8f45cd9e621766ffe58a545ab8331f155174..528899ecf9ab4b790818d2474af6c8a3bbe088d5 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
@@ -69,7 +69,7 @@ public:
/** Evalulate the function at specified index */
virtual ComplexType EvaluateAtIndex( const IndexType& index ) const;
-
+
/** Evaluate the function at non-integer positions */
virtual ComplexType Evaluate( const PointType& point ) const
{
@@ -84,28 +84,24 @@ public:
this->ConvertContinuousIndexToNearestIndex( cindex, index );
return this->EvaluateAtIndex( index ) ;
}
+
itkSetMacro(P, unsigned int);
itkGetConstReferenceMacro(P, unsigned int);
itkSetMacro(Q, unsigned int);
itkGetConstReferenceMacro(Q, unsigned int);
- /** Get/Set the radius of the neighborhood over which the
- statistics are evaluated */
- itkSetMacro( NeighborhoodRadius, int );
- itkGetConstReferenceMacro( NeighborhoodRadius, int );
protected:
ComplexMomentImageFunction();
~ComplexMomentImageFunction(){};
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
+
private:
ComplexMomentImageFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
unsigned int m_P;
unsigned int m_Q;
- int m_NeighborhoodRadius;
};
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
index 8984cef88a032cfb056d2052ebc6db5d6b78f8f8..6017c41efd1a182d8df5efedd522f6473e45950d 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
@@ -34,7 +34,6 @@ ComplexMomentImageFunction<TInput,TOutput,TCoordRep>
{
m_P = 0;
m_Q = 0;
- m_NeighborhoodRadius = -1;
}
/**
@@ -48,7 +47,6 @@ ComplexMomentImageFunction<TInput,TOutput,TCoordRep>
this->Superclass::PrintSelf(os,indent);
os << indent << " p indice value : " << m_P << std::endl;
os << indent << " q indice value : " << m_Q << std::endl;
- os << indent << " m_NeighborhoodRadius: " << m_NeighborhoodRadius << std::endl;
}
@@ -65,23 +63,13 @@ ComplexMomentImageFunction<TInput,TOutput,TCoordRep>
IndexType indexPos = index;
typename TInput::SizeType kernelSize;
- std::cout << "Evaluate at index "<<index <<std::endl;
- std::cout << "ImageSize : " << this->GetInputImage()->GetBufferedRegion().GetSize() <<std::endl;
if( !this->GetInputImage() )
{
std::cout << "Pb with GetInputImage" << std::endl;
return ( std::complex<float>( itk::NumericTraits<float>::max(), itk::NumericTraits<float>::max() ) );
}
-
-// if ( !this->IsInsideBuffer( index ) )
-// {
-// std::cout << "Pbs with Is InsideBuffer " << std::endl;
-// return ( std::complex<float>( itk::NumericTraits<float>::max(), itk::NumericTraits<float>::max() ) );
-// }
-
- std::cout << "Neighborhood Radius : "<< m_NeighborhoodRadius <<std::endl;
- if(m_NeighborhoodRadius<0)
+ if(this->GetNeighborhoodRadius()<0)
{
ImageSize = this->GetInputImage()->GetBufferedRegion().GetSize();
@@ -93,12 +81,9 @@ ComplexMomentImageFunction<TInput,TOutput,TCoordRep>
}
else
{
- kernelSize.Fill( m_NeighborhoodRadius );
+ kernelSize.Fill( this->GetNeighborhoodRadius() );
}
- std::cout << "kernelSize : "<< kernelSize <<std::endl;
- std::cout << "indexPos : "<< indexPos <<std::endl;
-
itk::ConstNeighborhoodIterator<TInput>
it(kernelSize, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
@@ -125,13 +110,10 @@ ComplexMomentImageFunction<TInput,TOutput,TCoordRep>
ValQ *= std::complex<float>(IndexValue[0], -IndexValue[1]);
--q;
}
-// std::cout<< i <<"--> "<< IndexValue << " p:"<<ValP <<" Q: "<<ValQ;
Sum += ( ValP * ValQ * std::complex<float>(static_cast<float>(it.GetPixel(i)),0.0) );
-// std::cout<< "Val Pixel: " << static_cast<float>(it.GetPixel(i)) <<" Result :" << Sum<<std::endl;
}
- std::cout<<"Result dans la procedure: " <<Sum <<std::endl;
return (static_cast<ComplexType>(Sum) );
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.h b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
index 6c4e7b58e4b19afdaf28a50a272addf2ef2e6bee..c7e6b2d26652ec451e9779cabc9287f97a639364 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
@@ -66,12 +66,16 @@ public:
typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
typedef typename VertexListType::ConstPointer VertexListPointer;
- typedef typename Superclass::OutputType ComplexType;
+// typedef typename Superclass::OutputType ComplexType;
+ typedef std::complex<double> ComplexType;
+ typedef TOutput OutputType;
typedef float RealType;
/** Evalulate the function */
- virtual ComplexType Evaluate(const PathType& path) const;
+ //OTB-FA-00022-CS
+ virtual OutputType Evaluate(const PathType& path) const;
+ virtual OutputType Evaluate() const;
itkSetMacro(P, unsigned int);
itkGetConstReferenceMacro(P, unsigned int);
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
index 3ce234502f982cdb97611fc3c6e92b440f06f644..c5b05f17860b1b37a2b176a4382adbbc50d6ae27 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
@@ -54,6 +54,7 @@ ComplexMomentPathFunction<TInputPath,TOutput>
{
ComplexType ValP;
ComplexType ValQ;
+ ComplexType Result;
double PixelValue = 1.0;
ValP = std::complex<double>(1.0,0.0);
@@ -71,14 +72,15 @@ ComplexMomentPathFunction<TInputPath,TOutput>
--q;
}
- return ( static_cast<ComplexType>
- ( ValP * ValQ * std::complex<double>( static_cast<double>(PixelValue),0.0) ) );
+ //OTB-FA-00023-CS
+ Result = ValP * ValQ * std::complex<double>( static_cast<double>(PixelValue), 0.0);
+ return ( static_cast<ComplexType>(Result) );
}
template < class TInputPath, class TOutput>
typename ComplexMomentPathFunction<TInputPath,
- TOutput>::ComplexType
+ TOutput>::OutputType
ComplexMomentPathFunction<TInputPath,TOutput>
::Evaluate(const PathType& path) const
{
@@ -91,6 +93,7 @@ ComplexMomentPathFunction<TInputPath,TOutput>
int nbPath;
ComplexType Value;
+
Value = static_cast<ComplexType>(0.0);
vertexList = path.GetVertexList();
@@ -122,11 +125,28 @@ ComplexMomentPathFunction<TInputPath,TOutput>
}
} // FOR loop
} // IF loop
-
- return (static_cast<ComplexType>(Value) );
+ //OTB-FA-00023-CS
+ return (static_cast<OutputType>(Value) );
}
+template < class TInputPath, class TOutput>
+typename ComplexMomentPathFunction<TInputPath,
+ TOutput>::OutputType
+ComplexMomentPathFunction<TInputPath,TOutput>
+::Evaluate() const
+{
+ //OTB-FA-00022-CS
+ if( !this->GetInputPath() )
+ {
+ std::cout << "Pb with GetInputPath" << std::endl;
+ return static_cast<OutputType>(std::complex<float>( itk::NumericTraits<float>::max(), itk::NumericTraits<float>::max() ) );
+ }
+
+ OutputType Result = Evaluate( *(this->GetInputPath()) );
+
+ return Result;
+}
} // namespace otb
diff --git a/Code/FeatureExtraction/otbFlst.h b/Code/FeatureExtraction/otbFlst.h
index 68b017c772272d676cb8ae3c37e157f02ada41c5..31a9814054fec518a4387a85788a49621e31a406 100644
--- a/Code/FeatureExtraction/otbFlst.h
+++ b/Code/FeatureExtraction/otbFlst.h
@@ -15,9 +15,8 @@
#include "otbImageToTreeFilter.h"
#include "otbTreeNeighborhood.h"
#include "otbShape.h"
-//#include "otbTreeSource.h"
#include "itkPolyLineParametricPath.h"
-
+#include "itkTreeContainer.h"
namespace otb
{
@@ -26,10 +25,19 @@ namespace otb
* \brief Algorithme de Fast Level Sets Transform of an image
*
*/
-template < class TInputImage, class TOutputTree /*= itk::PolyLineParametricPath<2>*/ >
+template < class TInputImage,
+ class TOutputTree = itk::PolyLineParametricPath<2> >
class ITK_EXPORT Flst : public ImageToTreeFilter< TInputImage, TOutputTree >
{
public:
+
+ typedef itk::PolyLineParametricPath<2> PathType;
+ typedef typename PathType::Pointer PathPointer;
+
+ typedef itk::TreeContainer<PathPointer> TreeType;
+ typedef typename TreeType::Pointer TreePointer;
+
+
/** Standard class typedefs. */
typedef Flst Self;
typedef ImageToTreeFilter<TInputImage,TOutputTree> Superclass;
@@ -70,7 +78,8 @@ public:
typedef typename RealImageType::Pointer RealImagePointer;
typedef typename RealImageType::ConstPointer RealImageConstPointer;
typedef typename RealImageType::IndexType RealImageIndexType;
-
+
+
protected:
Flst();
virtual ~Flst();
@@ -146,6 +155,12 @@ tabPatterns[1]: set in 8-connectedness and complement in 4-connectedness. */
void scan(float** tabtabPixelsOutput,int** tabtabVisitedPixels,
Neighborhood* pNeighborhood,Connection* tabConnections);
+ void PrintTree(Shapes *pTree);
+ void print_PointsInShape();
+ void print_visited_pixels(int** ptabtabVisitedPixels);
+ void PrintPixelOutput(float **tabtabPixelsOutput);
+
+ void insert_children(Shape* pParent, Shape* pNewChildToInsert);
// itkSetMacro(MinArea, int);
// itkGetConstReferenceMacro(MinArea, int);
diff --git a/Code/FeatureExtraction/otbFlst.txx b/Code/FeatureExtraction/otbFlst.txx
index 4aca38c9b2fbcf28590b2a8edf84d525c6656a4d..41371738423574fc38053644aa3cf7a156e2c29b 100644
--- a/Code/FeatureExtraction/otbFlst.txx
+++ b/Code/FeatureExtraction/otbFlst.txx
@@ -91,6 +91,9 @@ const char Flst<TInputImage,TOutputTree>::tabPatterns[2][256] =
0, 0, 1, 0, 0,-1, 0,-1, 0, 0, 1, 0, 0,-1, 0,-1}};
+/* ------------------------------------------------------------------------
+ ---------
+ ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------
--------- Allocations of structures used in the algorithm --------------
@@ -113,6 +116,20 @@ Flst<TInputImage,TOutputTree>
}
}
+template< class TInputImage, class TOutputTree>
+void
+Flst<TInputImage,TOutputTree>
+::print_visited_pixels(int** ptabtabVisitedPixels)
+{
+ for (int i = 0 ; i < iHeight ; i++)
+ for (int j = 0 ; j < iWidth ; j++)
+ {
+ std::cout << " VisitedPixel[" <<i << "][" << j << "]=" << ptabtabVisitedPixels[i][j];
+ std::cout << " VisitedNeighbor["<<i << "][" << j << "]=" << tabtabVisitedNeighbors[i][j];
+ std::cout << std::endl;
+ }
+}
+
template< class TInputImage, class TOutputTree>
void
Flst<TInputImage,TOutputTree>
@@ -139,6 +156,17 @@ Flst<TInputImage,TOutputTree>
std::cerr << "init_region --> impossible to allocate the array" << std::endl;
}
+template< class TInputImage, class TOutputTree>
+void
+Flst<TInputImage,TOutputTree>
+::print_PointsInShape()
+{
+ for(int i = 0 ; i <iMaxArea ;i++)
+ {
+ std::cout << "tabPointsInShape["<<i<<"]= ("<< tabPointsInShape[i].x ;
+ std::cout << " , " << tabPointsInShape[i].y<<" )" << std::endl;
+ }
+}
/* Initialize the output image */
template< class TInputImage, class TOutputTree>
@@ -150,26 +178,11 @@ Flst<TInputImage,TOutputTree>
int j;
RealImageIndexType Index;
-#if 0
- *ptabtabPixelsOutput = (float**) malloc(iHeight * sizeof(float*));
- if(*ptabtabPixelsOutput == 0)
- mwerror(FATAL, 1, "init_output_image --> allocation error\n");
- for(i = 0; i < iHeight; i++)
- (*ptabtabPixelsOutput)[i] = tabPixelsIn + i * iWidth;
-#endif
*ptabtabPixelsOutput = new float*[iHeight];
for (i = 0 ; i < iHeight ; i++)
(*ptabtabPixelsOutput)[i] = new float[iWidth];
-#if 0
- for (i = 0 ; i < iHeight ; i++)
- for (j = 0 ; j < iWidth ; j++)
- {
- Index[0] = i;
- Index[0] = j;
- (*ptabtabPixelsOutput)[i][j] = ( static_cast<float>(image->GetPixel( Index )) );
- }
-#endif
+
}
template< class TInputImage, class TOutputTree>
@@ -202,6 +215,11 @@ Flst<TInputImage,TOutputTree>
{
Neighbor* pNewNeighbor;
+ std::cout << " add_neighbor() " << std::endl;
+ std::cout << " NeighborPosition (" <<x<<" , "<<y<<" )= "<<value << std::endl;
+ std::cout << " Before Adding: " << std::endl;
+
+ pNeighborhood->print_neighborhood();
/* 0) Tag the pixel as 'visited neighbor' */
tabtabVisitedNeighbors[y][x] = iExploration;
/* 1) Update the fields TYPE and OTHERBOUND of PNEIGHBORHOOD */
@@ -238,6 +256,11 @@ Flst<TInputImage,TOutputTree>
pNewNeighbor->point.y = y;
pNewNeighbor->value = value;
pNeighborhood->fix_up(); /* Update the heap of neighbors */
+
+ std::cout << " After Adding: " << std::endl;
+ pNeighborhood->print_neighborhood();
+ std::cout << " add_neighbor() END" << std::endl;
+
}
/* Remove the neighbor at the top of the heap, that is the root of the tree. */
@@ -249,6 +272,10 @@ Flst<TInputImage,TOutputTree>
Neighbor* pTop = &pNeighborhood->tabPoints[1];
float value = pTop->value;
+ std::cout << " remove_neighbor() " << std::endl;
+ std::cout << " Before Removing : " << std::endl;
+ pNeighborhood->print_neighborhood();
+
if(pNeighborhood->type == Neighborhood::INVALID)
return;
*pTop = pNeighborhood->tabPoints[pNeighborhood->iNbPoints--];
@@ -257,6 +284,11 @@ Flst<TInputImage,TOutputTree>
pNeighborhood->fix_down();
if(value != pTop->value && pTop->value == pNeighborhood->otherBound)
pNeighborhood->type = Neighborhood::AMBIGUOUS;
+
+ std::cout << " After Removing : " << std::endl;
+ pNeighborhood->print_neighborhood();
+ std::cout << " add_neighbor() END" << std::endl;
+
}
template< class TInputImage, class TOutputTree>
@@ -310,9 +342,22 @@ Flst<TInputImage,TOutputTree>
::levelize(float** tabtabPixelsOutput,Point_plane* tabPoints,
int iNbPoints,float newGray)
{
- int i;
- for(i = iNbPoints - 1; i >= 0; i--)
+ std::cout << "Levelize()" << std::endl;
+
+ std::cout << " iNbPoints : " << iNbPoints;
+ std::cout << " NewGray : " << newGray;
+ std::cout << std::endl;
+
+ PrintPixelOutput(tabtabPixelsOutput);
+ print_PointsInShape();
+
+ for(int i = iNbPoints - 1; i >= 0; i--)
tabtabPixelsOutput[tabPoints[i].y][tabPoints[i].x] = newGray;
+
+ PrintPixelOutput(tabtabPixelsOutput);
+
+ std::cout << "Levelize() END" << std::endl;
+
}
/* Return, coded in one byte, the local configuration around the pixel (x,y) */
@@ -365,10 +410,17 @@ Flst<TInputImage,TOutputTree>
::new_shape(int iCurrentArea,float currentGrayLevel,
char bOfInferiorType,Shape* pChild)
{
- std::cout << "NewShape " << pGlobalTree->nb_shapes << std::endl;
+ std::cout << "Flst::new_shape() " << std::endl;
+ std::cout << " iCurrentArea : " << iCurrentArea;
+ std::cout << " currentGrayLevel : " << currentGrayLevel;
+ std::cout << " pChild : " << pChild ;
+ std::cout << std::endl;
+ std::cout << " NbShapes: " << pGlobalTree->nb_shapes << std::endl;
+
+ PrintTree(pGlobalTree);
+
Shape* pNewShape = &pGlobalTree->the_shapes[pGlobalTree->nb_shapes++];
- std::cout << "NewShape modif" << pGlobalTree->nb_shapes << std::endl;
-
+
pNewShape->inferior_type = bOfInferiorType;
pNewShape->value = currentGrayLevel;
pNewShape->open = (char)(iAtBorder != 0);
@@ -418,6 +470,7 @@ Flst<TInputImage,TOutputTree>
Shape* pParent;
float level;
+
for(i = iNbPoints-1; i >= 0; i--) {
iIndex = tabPoints[i].y * iWidth + tabPoints[i].x;
pShape = tabConnections[iIndex].shape;
@@ -428,7 +481,7 @@ Flst<TInputImage,TOutputTree>
assert(pParent != &pGlobalTree->the_shapes[pGlobalTree->nb_shapes-1]);
pParent = pParent->parent;
}
- pParent->insert_children( pShape);
+ insert_children(pParent, pShape);
tabConnections[iIndex].shape = NULL;
}
}
@@ -444,7 +497,8 @@ Flst<TInputImage,TOutputTree>
Shape* pSibling;
Shape* pShape = &pGlobalTree->the_shapes[pGlobalTree->nb_shapes-1];
- std::cout << "New Connection" << std::endl;
+ std::cout << "New Connection()" << std::endl;
+
iIndex = pPoint->y*iWidth + pPoint->x;
if(tabConnections[iIndex].shape == NULL) {
tabConnections[iIndex].shape = pShape;
@@ -513,9 +567,13 @@ Flst<TInputImage,TOutputTree>
int iCurrentArea, iNbHoles;
unsigned char cPattern;
- std::cout << "AddIsoLevel" << std::endl;
-
-
+ std::cout << "AddIsoLevel()" << std::endl;
+ std::cout << " pCurrentArea :" << *pCurrentArea;
+ std::cout << " currentGrayLevel :" << currentGrayLevel;
+ std::cout << std::endl;
+
+ pNeighborhood->print_neighborhood();
+
iNbHoles = 0;
iCurrentArea = *pCurrentArea;
pNeighbor = &pNeighborhood->tabPoints[1];
@@ -551,6 +609,7 @@ Flst<TInputImage,TOutputTree>
*pCurrentArea = iCurrentArea;
return (char)1;
}
+
return 0;
}
@@ -570,7 +629,9 @@ Flst<TInputImage,TOutputTree>
Shape* pSmallestShape;
Shape* pLastShape;
- std::cout << "find terminal branch" <<std::endl;
+ std::cout << "find terminal branch() ";
+ std::cout << " Location : ("<<x<<" , "<< y <<" )";
+ std::cout << std::endl;
restart_branch:
++ iExploration;
@@ -578,8 +639,19 @@ Flst<TInputImage,TOutputTree>
bUnknownHoles = 0;
pSmallestShape = pLastShape = NULL;
level = ou[y][x];
+ std::cout << "before reinit_neighbor()"<<std::endl;
+ pNeighborhood->print_neighborhood();
+
pNeighborhood->reinit_neighborhood(b8Connected ? Neighborhood::MAX : Neighborhood::MIN);
+
+ std::cout << "after reinit_neighbor()"<<std::endl;
+ pNeighborhood->print_neighborhood();
+
add_neighbor(pNeighborhood, x, y, level);
+
+ std::cout << "after add_neighbor()"<<std::endl;
+ pNeighborhood->print_neighborhood();
+
while(add_iso_level(tabPointsInShape, &iArea,
level, pNeighborhood, ou, tabtabVisitedPixels,
&b8Connected, &bUnknownHoles) != 0)
@@ -590,7 +662,8 @@ Flst<TInputImage,TOutputTree>
assert(iArea != 0);
if(pLastShape != NULL) {
iArea = pLastShape->area;
- std::cout << "Connect--------------->>>" << std::endl;
+ std::cout << "Connect--------------->>>"<<iArea << std::endl;
+
connect(tabPointsInShape, iArea, tabConnections, pSmallestShape);
new_connection(&tabPointsInShape[iArea], level, tabConnections);
}
@@ -616,11 +689,14 @@ Flst<TInputImage,TOutputTree>
if(pLastShape != NULL) {
connect(tabPointsInShape, iArea, tabConnections, pSmallestShape);
if(iAtBorder && iArea == iHalfAreaImage)
- pGlobalTree->the_shapes->insert_children( pLastShape);
+ insert_children(pGlobalTree->the_shapes, pLastShape);
else if(iArea != 0)
new_connection(&tabPointsInShape[iArea], level, tabConnections);
}
levelize(ou, tabPointsInShape, iArea, level);
+
+ std::cout << "find terminal branch() END "<< std::endl;
+
}
/* Scan the image, calling a procedure to extract terminal branch at each
@@ -642,12 +718,6 @@ Flst<TInputImage,TOutputTree>
for(j = 0; j < iWidth; j++)
{
- // std::cout << "i: " <<i<<" j: "<< j <<" visitedPix : " << tabtabVisitedPixels[i][j];
- // std::cout << " | iExplorationInit : " << iExplorationInit ;
- // std::cout << " PixelValue : " << tabtabPixelsOutput[i][j];
- // std::cout << " localMin : " << is_local_min(tabtabPixelsOutput, j, i, (char)0 );
- // std::cout << " localMax : " << is_local_max(tabtabPixelsOutput,j,i,(char)1 );
- // std::cout << std::endl;
if(tabtabVisitedPixels[i][j] <= iExplorationInit &&
(is_local_min(tabtabPixelsOutput, j, i, (char)0) ||
@@ -675,6 +745,56 @@ Flst<TInputImage,TOutputTree>
}
+
+template<class TInputImage, class TOutputTree>
+void
+Flst<TInputImage,TOutputTree>
+::PrintTree(Shapes* pTree)
+{
+ std::cout <<std::endl;
+ std::cout << "NbShapes : " << pTree->nb_shapes;
+ std::cout << " Nb col : " << pTree->ncol;
+ std::cout << " Nb lig : " << pTree->nrow << std::endl;
+
+ for(int lig = 0 ; lig < pTree->nrow;lig++)
+ for(int col = 0 ; col < pTree->ncol;col++)
+ {
+ std::cout <<" smallest_shape("<< lig << " , "<< col <<" ) = " ;
+ std::cout << pTree->smallest_shape[lig*pTree->ncol+col] <<std::endl;
+ }
+
+ for (int NoShape = 0 ; NoShape < pTree->nb_shapes ; NoShape++ )
+ {
+ std::cout <<" NoShape :" <<NoShape;
+ std::cout << " Shape Adress :" << &pTree->the_shapes[NoShape];
+ std::cout <<" Parent : " << pTree->the_shapes[NoShape].parent;
+ std::cout <<" Child : " << pTree->the_shapes[NoShape].child;
+ std::cout <<" next_sibling "<< pTree->the_shapes[NoShape].next_sibling;
+ std::cout <<" pixels : " << pTree->the_shapes[NoShape].pixels;
+ std::cout <<" value : " << pTree->the_shapes[NoShape].value;
+ std::cout <<" open : " << int(pTree->the_shapes[NoShape].open);
+ std::cout <<" area : " << pTree->the_shapes[NoShape].area;
+ std::cout <<" removed : " << int(pTree->the_shapes[NoShape].removed);
+
+ std::cout << std::endl;
+ }
+}
+
+template<class TInputImage, class TOutputTree>
+void
+Flst<TInputImage,TOutputTree>
+::PrintPixelOutput(float **tabtabPixelsOutput)
+{
+ for (int i = 0 ; i < iHeight ; i++)
+ for (int j = 0 ; j < iWidth ; j++)
+ {
+ std::cout << " tabtabPixelsOutput[" << i << "][" << j << "]=" << tabtabPixelsOutput[i][j];
+ std::cout << std::endl;
+ }
+
+}
+
+
/* The "Fast Level Set Transform" gives the tree of interiors of level lines
(named 'shapes') representing the image.
Only shapes of area >= *pMinArea are put in the tree. pMinArea==NULL means 1.
@@ -703,6 +823,9 @@ Flst<TInputImage,TOutputTree>
std::cout << "Generate data FLST" <<std::endl;
const InputImageType* InputImage = this->GetInput();
+
+
+
itkDebugMacro(<< "FLST::GenerateData() called");
pTree = new Shapes;
@@ -732,21 +855,45 @@ Flst<TInputImage,TOutputTree>
pGlobalTree->mw_change_shapes( iHeight, iWidth, gray);
pGlobalTree->interpolation = 0;
+ PrintTree(pGlobalTree);
+ PrintTree(pTree);
+
+
tabConnections = new Connection[iAreaImage];
if(tabConnections == NULL)
std::cerr << "Image of largest shapes: allocation error" << std::endl;
for(i = iAreaImage-1; i >= 0; i--)
tabConnections[i].shape = NULL;
+
init_output_image(InputImage, &tabtabPixelsOutput);
+
+/*
+ tabtabPixelsOutput[0][0] = 255.;
+ tabtabPixelsOutput[0][1] = 255.;
+ tabtabPixelsOutput[0][2] = 255.;
+ tabtabPixelsOutput[0][3] = 255.;
+
+ tabtabPixelsOutput[1][0] = 255.;
+ tabtabPixelsOutput[1][1] = 0.;
+ tabtabPixelsOutput[1][2] = 0.;
+ tabtabPixelsOutput[1][3] = 255.;
+
+ tabtabPixelsOutput[2][0] = 255.;
+ tabtabPixelsOutput[2][1] = 255.;
+ tabtabPixelsOutput[2][2] = 255.;
+ tabtabPixelsOutput[2][3] = 255.;
+*/
+
for (i = 0 ; i < iHeight ; i++)
for (j = 0 ; j < iWidth ; j++)
{
- Index[0] = i;
- Index[1] = j;
+ Index[0] = j;
+ Index[1] = i;
+
tabtabPixelsOutput[i][j] = ( static_cast<float>(InputImage->GetPixel( Index )) );
-// std::cout << "PixelOut [" << i << "][" << j << "] = " << tabtabPixelsOutput[i][j] << std::endl;
+ std::cout << "PixelOut [" << i << "][" << j << "] = " << tabtabPixelsOutput[i][j] << std::endl;
}
@@ -766,26 +913,50 @@ Flst<TInputImage,TOutputTree>
if(iMaxArea == 0 || iMaxArea >= iHalfAreaImage) /* iMaxArea==0: overflow */
iMaxArea = iAreaImage-1;
scan(tabtabPixelsOutput, tabtabVisitedPixels,&neighborhood,tabConnections);
+ std::cout << " ScanResult:" <<std::endl;
+ PrintTree(pGlobalTree);
+
} while(iMaxArea+1 < iAreaImage);
+
+
+
/* Make connections with root */
std::cout << " NbShapes : " << pTree->nb_shapes << std::endl;
pTree->the_shapes[0].value = tabtabPixelsOutput[0][0];
std::cout << "iAreaImage = " << iAreaImage <<std::endl;
for(i = iAreaImage-1; i >= 0; i--)
+ {
+ std::cout << " Connections["<<i<<"]: " << tabConnections[i].shape<< std::endl;
+
if(tabConnections[i].shape != NULL)
{
- std::cout << "i : " << i << " Connections: " << tabConnections[i].shape<< std::endl;
+ std::cout << "i : " << i << " Connections INSERT CHILDREN: " << std::endl;
assert(tabConnections[i].level == pTree->the_shapes[0].value);
- pTree->the_shapes->insert_children( tabConnections[i].shape);
+ insert_children(pTree->the_shapes, tabConnections[i].shape);
}
+ }
- std::cout << " NbShapes : " << pGlobalTree->nb_shapes << std::endl;
- for (int NoShape = 0 ; NoShape <= pGlobalTree->nb_shapes ; NoShape++)
+
+// pGlobalTree->flst_pixels();
+
+ TreePointer TreePath = TreeType::New();
+
+ for (int NoShape = 0 ; NoShape <=pTree->nb_shapes ; NoShape++ )
{
- std::cout << "Shape Area: "<<NoShape <<" -->" << pGlobalTree->the_shapes[NoShape].area << std::endl;
+ std::cout << "Shape Area : "<<NoShape <<" -->" << pTree->the_shapes[NoShape].area << std::endl;
+ std::cout << "Shape value: "<<NoShape <<" -->" << pTree->the_shapes[NoShape].value << std::endl;
+ std::cout << "Shape open : "<<NoShape <<" -->" << pTree->the_shapes[NoShape].open << std::endl;
+ std::cout << "Shape pixel: "<<NoShape <<" -->" << pTree->the_shapes[NoShape].pixels<< std::endl;
+
+ PathPointer pathList = PathType::New();
+ pathList = pTree->flst_shape_boundary(&pTree->the_shapes[NoShape]);
+
+
+
+
}
delete[] tabConnections;
@@ -794,10 +965,8 @@ Flst<TInputImage,TOutputTree>
free_region();
free_output_image(tabtabPixelsOutput);
- pGlobalTree->flst_pixels();
-
std::cout << "GenerateData() FINI !!" << std::endl;
- delete pGlobalTree;
+// delete pGlobalTree;
}
/**
@@ -811,6 +980,22 @@ Flst<TInputImage,TOutputTree>
Superclass::PrintSelf( os, indent );
// os << indent << "MinArea: " << m_MinArea << std::endl;
}
+/* Insert a new shape and its siblings in the tree, with parent pParent */
+
+template< class TInputImage, class TOutputTree>
+void
+Flst<TInputImage,TOutputTree>
+::insert_children(Shape* pParent, Shape* pNewChildToInsert)
+{
+ Shape* pSibling = pNewChildToInsert;
+ while(pSibling->next_sibling != NULL) {
+ pSibling->parent = pParent;
+ pSibling = pSibling->next_sibling;
+ }
+ pSibling->parent = pParent;
+ pSibling->next_sibling = pParent->child;
+ pParent->child = pNewChildToInsert;
+}
}; // end namespace otb
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.h b/Code/FeatureExtraction/otbFlusserImageFunction.h
index 8cc8efc9b4b796157714922aea8405caea5485db..801d8d7dba221a7497faf43b21905f2539c9a40c 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.h
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.h
@@ -6,7 +6,7 @@
Date : 20 mars 2006
Version :
Role : Flusser's invariant Class of images
- $Id:$
+ $Id$
=========================================================================*/
#ifndef _otbFlusserImageFunction_h
@@ -88,7 +88,7 @@ public:
/** Evalulate the function at specified index */
virtual RealType EvaluateAtIndex( const IndexType& index ) const;
-
+
/** Evaluate the function at non-integer positions */
virtual RealType Evaluate( const PointType& point ) const
{
@@ -103,11 +103,13 @@ public:
this->ConvertContinuousIndexToNearestIndex( cindex, index );
return this->EvaluateAtIndex( index ) ;
}
+
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetClampMacro(Number,short,1,11);
- itkGetConstReferenceMacro( Number, short );
+ //OTB-FA-00024-CS
+ itkSetClampMacro(MomentNumber,short,1,11);
+ itkGetConstReferenceMacro( MomentNumber, short );
protected:
FlusserImageFunction();
@@ -118,7 +120,8 @@ private:
FlusserImageFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
- short m_Number;
+ //OTB-FA-00024-CS
+ short m_MomentNumber;
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.txx b/Code/FeatureExtraction/otbFlusserImageFunction.txx
index c98cfb74693bccdbe0971eecf19d05dd99ac2386..d7146ecfb816ae70c53971e3cd897a5ca4c73459 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.txx
@@ -28,7 +28,8 @@ template < class TInput, class TOutput, class TCoordRep>
FlusserImageFunction<TInput,TOutput,TCoordRep>
::FlusserImageFunction()
{
- m_Number =-1;
+ //OTB-FA-00024-CS
+ m_MomentNumber =-1;
}
/**
@@ -40,7 +41,8 @@ FlusserImageFunction<TInput,TOutput,TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
this->Superclass::PrintSelf(os,indent);
- os << indent << " m_Number : " << m_Number << std::endl;
+ //OTB-FA-00024-CS
+ os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
@@ -66,13 +68,15 @@ FlusserImageFunction<TInput,TOutput,TCoordRep>
return ( itk::NumericTraits<RealType>::max() );
}
- assert(m_Number > 0);
- assert(m_Number < 12);
+ assert(m_MomentNumber > 0);
+ assert(m_MomentNumber < 12);
function->SetInputImage( this->GetInputImage() );
+//OTB-FA-00025-CS
+ function->SetNeighborhoodRadius(this->GetNeighborhoodRadius() );
-
- switch(m_Number)
+ //OTB-FA-00024-CS
+ switch(m_MomentNumber)
{
case 1 :
{
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.h b/Code/FeatureExtraction/otbFlusserPathFunction.h
index 80535a9fb237d15f6f45c10e7938ec22fae35959..0a3ddcac4711fd2e15c027c70f30187eec5126d3 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.h
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.h
@@ -81,10 +81,11 @@ public:
/** Evaluate the function at non-integer positions */
virtual RealType Evaluate( const PathType& path) const;
+ virtual RealType Evaluate( ) const;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro(Number,short);
- itkGetConstReferenceMacro( Number, short );
+ itkSetMacro(MomentNumber,short);
+ itkGetConstReferenceMacro( MomentNumber, short );
protected:
FlusserPathFunction();
@@ -95,7 +96,7 @@ private:
FlusserPathFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
- short m_Number;
+ short m_MomentNumber;
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.txx b/Code/FeatureExtraction/otbFlusserPathFunction.txx
index cfb40005535dfd8ba89a67078383afe7d1d06ad4..ec2f95011042e2406cb9f162414b755c308958f9 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.txx
@@ -26,7 +26,8 @@ template < class TInputPath, class TOutput>
FlusserPathFunction<TInputPath, TOutput >
::FlusserPathFunction()
{
- m_Number =-1;
+ //OTB-FA-00024-CS
+ m_MomentNumber =-1;
}
/**
@@ -38,7 +39,8 @@ FlusserPathFunction< TInputPath, TOutput >
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
this->Superclass::PrintSelf(os,indent);
- os << indent << " m_Number : " << m_Number << std::endl;
+ //OTB-FA-00024-CS
+ os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
@@ -56,15 +58,18 @@ FlusserPathFunction<TInputPath, TOutput >
typename FunctionType::Pointer function =FunctionType::New();
function->SetStep( this->GetStep() );
-
- switch(m_Number)
+ //OTB-FA-00023-CS
+ function->SetInputPath( this->GetInputPath() );
+
+ //OTB-FA-00024-CS
+ switch(m_MomentNumber)
{
case 1 :
{
ComplexType C11;
function->SetP(1);
function->SetQ(1);
- C11 = function->Evaluate( path );
+ C11 = function->Evaluate( );
FlusserValue = C11.real() ;
}
break;
@@ -73,10 +78,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C21,C12;
function->SetP(2);
function->SetQ(1);
- C21 = function->Evaluate( path );
+ C21 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValue = abs( C21 * C12 ) ;
}
@@ -86,10 +91,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C20,C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( path );
+ C20 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C20 * pow(C12,2);
FlusserValue = FlusserValueComplex.real();
}
@@ -99,10 +104,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C20,C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( path );
+ C20 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C20 * pow(C12,2);
FlusserValue = FlusserValueComplex.imag();
}
@@ -112,10 +117,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C30,C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( path );
+ C30 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C30 * pow(C12,3) ;
FlusserValue = FlusserValueComplex.real();
@@ -126,10 +131,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C30,C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( path );
+ C30 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C30 * pow(C12,3) ;
FlusserValue = FlusserValueComplex.real();
@@ -140,7 +145,7 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C22;
function->SetP(2);
function->SetQ(2);
- C22 = function->Evaluate( path );
+ C22 = function->Evaluate( );
FlusserValue = C22.real() ;
}
break;
@@ -149,10 +154,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C31,C12;
function->SetP(3);
function->SetQ(1);
- C31 = function->Evaluate( path );
+ C31 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C31 * pow(C12,2);
FlusserValue = FlusserValueComplex.real();
}
@@ -162,10 +167,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C31,C12;
function->SetP(3);
function->SetQ(1);
- C31 = function->Evaluate( path );
+ C31 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C31 * pow(C12,2);
FlusserValue = FlusserValueComplex.imag();
}
@@ -175,10 +180,10 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C40,C12;
function->SetP(4);
function->SetQ(0);
- C40 = function->Evaluate( path );
+ C40 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C40 * pow(C12,4);
FlusserValue = FlusserValueComplex.real();
}
@@ -188,17 +193,17 @@ FlusserPathFunction<TInputPath, TOutput >
ComplexType C40,C12;
function->SetP(4);
function->SetQ(0);
- C40 = function->Evaluate( path );
+ C40 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
FlusserValueComplex = C40 * pow(C12,4);
FlusserValue = FlusserValueComplex.imag();
}
break;
default:
- itkWarningMacro("Hu's invariant parameters are between 1 and 7");
+ itkWarningMacro("Flusser's invariant parameters are between 1 and 11");
}
@@ -206,6 +211,24 @@ FlusserPathFunction<TInputPath, TOutput >
}
+template < class TInputPath, class TOutput>
+typename FlusserPathFunction<TInputPath, TOutput>::RealType
+FlusserPathFunction<TInputPath, TOutput >
+::Evaluate() const
+{
+ //OTB-FA-00022-CS
+ if( !this->GetInputPath() )
+ {
+ std::cout << "Pb with GetInputPath" << std::endl;
+ return static_cast<RealType>( itk::NumericTraits<float>::max());
+ }
+
+ RealType Result = Evaluate( *(this->GetInputPath()) );
+
+ return Result;
+
+}
+
} // namespace otb
diff --git a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
index 980dc0671fb4db715a44515f79ddc98365ff327d..00fafd6806994163914710c8130aa56f2e80d4cb 100644
--- a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
@@ -51,17 +51,34 @@ public:
typedef TOutput OutputType;
+ /** Get/Set the radius of the neighborhood over which the
+ statistics are evaluated */
+ //OTB-FA-00025-CS
+ itkSetMacro( NeighborhoodRadius, int );
+ itkGetConstReferenceMacro( NeighborhoodRadius, int );
+
protected:
- GeometricMomentImageFunction() {};
+ GeometricMomentImageFunction()
+ {
+ //OTB-FA-00025-CS
+ m_NeighborhoodRadius = -1;
+ };
+
~GeometricMomentImageFunction(){};
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf( os, indent );
+ os << indent << " m_NeighborhoodRadius: " << m_NeighborhoodRadius << std::endl;
}
private:
GeometricMomentImageFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
+
+//OTB-FA-00025-CS
+ int m_NeighborhoodRadius;
+
+
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbHuImageFunction.h b/Code/FeatureExtraction/otbHuImageFunction.h
index 58f6e4d6e8dda7a35bb214b5fd05fe4f0ca9d7dc..02cd3d024ee80e906f21aa93e779d51914886998 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.h
+++ b/Code/FeatureExtraction/otbHuImageFunction.h
@@ -6,7 +6,7 @@
Date : 20 mars 2006
Version :
Role : Hu's invariant Class of images
- $Id:$
+ $Id$
=========================================================================*/
#ifndef _otbHuImageFunction_h
@@ -82,8 +82,8 @@ public:
/** Evalulate the function at specified index */
virtual RealType EvaluateAtIndex( const IndexType& index ) const;
-
- /** Evaluate the function at non-integer positions */
+
+ /** Evaluate the function at non-integer positions */
virtual RealType Evaluate( const PointType& point ) const
{
IndexType index;
@@ -97,11 +97,13 @@ public:
this->ConvertContinuousIndexToNearestIndex( cindex, index );
return this->EvaluateAtIndex( index ) ;
}
+
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetClampMacro(Number,short,1,7);
- itkGetConstReferenceMacro( Number, short );
+ //OTB-FA-00024-CS
+ itkSetClampMacro(MomentNumber,short,1,7);
+ itkGetConstReferenceMacro( MomentNumber, short );
protected:
HuImageFunction();
@@ -112,7 +114,8 @@ private:
HuImageFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
- short m_Number;
+ //OTB-FA-00024-CS
+ short m_MomentNumber;
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbHuImageFunction.txx b/Code/FeatureExtraction/otbHuImageFunction.txx
index d7e7b0a76ac9447af40066d854b77ffd4ccadbfb..62b24cc4ab89488091e7241b54dc170aa7979653 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.txx
+++ b/Code/FeatureExtraction/otbHuImageFunction.txx
@@ -28,7 +28,8 @@ template < class TInput, class TOutput, class TCoordRep>
HuImageFunction<TInput,TOutput,TCoordRep>
::HuImageFunction()
{
- m_Number =-1;
+ //OTB-FA-00024-CS
+ m_MomentNumber =-1;
}
/**
@@ -40,7 +41,8 @@ HuImageFunction<TInput,TOutput,TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
this->Superclass::PrintSelf(os,indent);
- os << indent << " m_Number : " << m_Number << std::endl;
+ //OTB-FA-00024-CS
+ os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
@@ -58,23 +60,24 @@ HuImageFunction<TInput,TOutput,TCoordRep>
if( !this->GetInputImage() )
{
-// return std::complex<float>(0.,0.); // A modifier
return ( itk::NumericTraits<RealType>::max() );
}
if ( !this->IsInsideBuffer( index ) )
{
-// return std::complex<float>(0.,0.); // A modifier
return ( itk::NumericTraits<RealType>::max() );
}
- assert(m_Number > 0);
- assert(m_Number < 8);
+ assert(m_MomentNumber > 0);
+ assert(m_MomentNumber < 8);
function->SetInputImage( this->GetInputImage() );
+//OTB-FA-00025-CS
+ std::cout << "Neighbor " <<this->GetNeighborhoodRadius()<<std::endl;
+ function->SetNeighborhoodRadius(this->GetNeighborhoodRadius() );
-
- switch(m_Number)
+ //OTB-FA-00024-CS
+ switch(m_MomentNumber)
{
case 1 :
{
@@ -89,7 +92,7 @@ HuImageFunction<TInput,TOutput,TCoordRep>
{
ComplexType C20,C02;
function->SetP(2);
- function->SetQ(0);
+ function->SetQ(0);
C20 = function->EvaluateAtIndex( index );
function->SetP(0);
function->SetQ(2);
diff --git a/Code/FeatureExtraction/otbHuPathFunction.h b/Code/FeatureExtraction/otbHuPathFunction.h
index c942dfd59111a6e380a330682fedcfd4c302acb3..488694d5ad60cb8786217b55312c9106d27a7e43 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.h
+++ b/Code/FeatureExtraction/otbHuPathFunction.h
@@ -75,11 +75,15 @@ public:
typedef typename Superclass::RealType RealType;
/** Evaluate the function at non-integer positions */
+ //OTB-FA-00023-CS
virtual RealType Evaluate( const PathType& path) const;
+ //OTB-FA-00022-CS
+ virtual RealType Evaluate( ) const;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro(Number,short);
- itkGetConstReferenceMacro( Number, short );
+ //OTB-FA-00024-CS
+ itkSetMacro(MomentNumber,short);
+ itkGetConstReferenceMacro( MomentNumber, short );
protected:
HuPathFunction();
@@ -90,7 +94,8 @@ private:
HuPathFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
- short m_Number;
+ //OTB-FA-00024-CS
+ short m_MomentNumber;
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbHuPathFunction.txx b/Code/FeatureExtraction/otbHuPathFunction.txx
index 92ba258dda8fcaf57503b97bdec0b018b1cda8dc..96ef017f809ca70177e22fec1ccc5fe874603076 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.txx
+++ b/Code/FeatureExtraction/otbHuPathFunction.txx
@@ -27,7 +27,8 @@ template < class TInputPath, class TOutput>
HuPathFunction< TInputPath, TOutput >
::HuPathFunction()
{
- m_Number =-1;
+ //OTB-FA-00024-CS
+ m_MomentNumber =-1;
}
/**
@@ -39,7 +40,8 @@ HuPathFunction< TInputPath, TOutput >
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
this->Superclass::PrintSelf(os,indent);
- os << indent << " m_Number : " << m_Number << std::endl;
+ //OTB-FA-00024-CS
+ os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
@@ -57,15 +59,18 @@ HuPathFunction<TInputPath, TOutput >
typename FunctionType::Pointer function =FunctionType::New();
function->SetStep( this->GetStep() );
+ //OTB-FA-00023-CS
+ function->SetInputPath( this->GetInputPath() );
- switch(m_Number)
+ //OTB-FA-00024-CS
+ switch(m_MomentNumber)
{
case 1 :
{
ComplexType C11;
function->SetP(1);
function->SetQ(1);
- C11 = function->Evaluate( path );
+ C11 = function->Evaluate( );
HuValue = C11.real() ;
}
break;
@@ -74,10 +79,10 @@ HuPathFunction<TInputPath, TOutput >
ComplexType C20,C02;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( path );
+ C20 = function->Evaluate( );
function->SetP(0);
function->SetQ(2);
- C02 = function->Evaluate( path );
+ C02 = function->Evaluate( );
HuValue = abs( C20 * C02 ) ;
@@ -88,10 +93,10 @@ HuPathFunction<TInputPath, TOutput >
ComplexType C30,C03;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( path );
+ C30 = function->Evaluate( );
function->SetP(0);
function->SetQ(3);
- C03 = function->Evaluate( path );
+ C03 = function->Evaluate( );
HuValue = abs( C30 * C03 );
}
@@ -101,10 +106,10 @@ HuPathFunction<TInputPath, TOutput >
ComplexType C21,C12;
function->SetP(2);
function->SetQ(1);
- C21 = function->Evaluate( path );
+ C21 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
HuValue = abs( C21 * C12 );
}
@@ -115,10 +120,10 @@ HuPathFunction<TInputPath, TOutput >
ComplexType C30,C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( path );
+ C30 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
HuValueComplex = C30 * pow(C12,3) ;
HuValue = HuValueComplex.real();
@@ -130,10 +135,10 @@ HuPathFunction<TInputPath, TOutput >
ComplexType C20,C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( path );
+ C20 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
HuValueComplex = C20 * pow( C12 ,2 );
HuValue = HuValueComplex.real();
@@ -145,10 +150,10 @@ HuPathFunction<TInputPath, TOutput >
ComplexType C30,C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( path );
+ C30 = function->Evaluate( );
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( path );
+ C12 = function->Evaluate( );
HuValueComplex = C30 * pow( C12 , 3);
HuValue = HuValueComplex.imag();
@@ -163,6 +168,23 @@ HuPathFunction<TInputPath, TOutput >
}
+template < class TInputPath, class TOutput>
+typename HuPathFunction<TInputPath, TOutput >::RealType
+HuPathFunction<TInputPath, TOutput >
+::Evaluate( ) const
+{
+ //OTB-FA-00022-CS
+ if( !this->GetInputPath() )
+ {
+ std::cout << "Pb with GetInputPath" << std::endl;
+ return static_cast<RealType>( itk::NumericTraits<float>::max());
+ }
+
+ RealType Result = Evaluate( *(this->GetInputPath()) );
+
+ return Result;
+
+}
} // namespace otb
diff --git a/Code/FeatureExtraction/otbRealMomentImageFunction.h b/Code/FeatureExtraction/otbRealMomentImageFunction.h
index 4eb0adf71d6a11b1f2b70c7fd98438c490dd7265..7d33c7a8180a06c1db7cb305f02b38b1052ba362 100644
--- a/Code/FeatureExtraction/otbRealMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentImageFunction.h
@@ -49,8 +49,11 @@ public:
typedef typename Superclass::PointType PointType;
typedef TOutput OutputType;
+ typedef TOutput RealType;
+
+
protected:
RealMomentImageFunction() {};
~RealMomentImageFunction(){};
@@ -62,6 +65,7 @@ protected:
private:
RealMomentImageFunction( const Self& ); //purposely not implemented
void operator=( const Self& ); //purposely not implemented
+
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbShape.h b/Code/FeatureExtraction/otbShape.h
index 9ed9375aa3559e8f74b753e2541bf3a49a3582fc..4151c42dedfb90d2ca72afe5206de50c264bba8b 100644
--- a/Code/FeatureExtraction/otbShape.h
+++ b/Code/FeatureExtraction/otbShape.h
@@ -12,6 +12,8 @@
#ifndef __otbShape_h
#define __otbShape_h
+#include "itkPolyLineParametricPath.h"
+
/** \class Shape
* Internal Input/Output for the following FLST (Fast Level Set Transform)
* structures
@@ -74,8 +76,6 @@ public:
Shape* mw_get_first_child_shape(Shape *sh);
Shape* mw_get_next_sibling_shape(Shape *sh);
- void insert_children(Shape* pNewChildToInsert);
-
Shape()
{
inferior_type = 0;
@@ -111,6 +111,10 @@ private:
class Shapes
{
public:
+ typedef itk::PolyLineParametricPath<2> PathType;
+ typedef PathType::Pointer PathPointer;
+ typedef PathType::VertexType VertexType;
+
int nrow; /* Number of rows (dy) of the image */
int ncol; /* Number of columns (dx) of the image */
int interpolation; /* Interpolation used for the level lines:
@@ -123,8 +127,8 @@ public:
// Shapes* mw_new_shapes();
- void mw_alloc_shapes( int nrow, int ncol, float value);
- void mw_change_shapes(int nrow,int ncol,float value);
+ void mw_alloc_shapes( int inrow, int incol, float value);
+ void mw_change_shapes(int inrow, int incol, float value);
Shape* mw_get_smallest_shape(int iX,int iY);
@@ -141,7 +145,27 @@ the tree structure. From the command line, this function has no interest,
since that field is not saved to the file. It is meant to be called from
another module, when this field is needed */
void flst_pixels();
-
+
+
+ static const int EAST;
+ static const int NORTH;
+ static const int WEST;
+ static const int SOUTH;
+
+ void TURN_LEFT(int *dir);
+ void TURN_RIGHT(int *dir);
+/* Is the point in the shape? */
+ char point_in_shape(int x,int y,Shape *pShape);
+ void find_next_dual_point(Point_plane *pDualPoint,
+ int *cDirection,
+ Shape *pShape);
+ int find_closed_boundary(Shape *pShape,PathPointer pBoundary);
+/* Find an initial point (to follow the boundary) at the border of the image */
+ void initial_point_border(Point_plane *pDualPoint,
+ int *cDirection,Shape *pShape);
+/* Find an open boundary */
+ void find_open_boundary(Shape *pShape,PathPointer pBoundary);
+ PathPointer flst_shape_boundary(Shape *pShape);
Shapes()
{
the_shapes = NULL;
diff --git a/Code/FeatureExtraction/otbShape.txx b/Code/FeatureExtraction/otbShape.txx
index 119a45611a60bab581f15b3ea47bfb33272d6be3..0c006692e4296a93ee9f2bc803b61da8d4a2904e 100644
--- a/Code/FeatureExtraction/otbShape.txx
+++ b/Code/FeatureExtraction/otbShape.txx
@@ -118,20 +118,6 @@ Shape::mw_get_next_sibling_shape(Shape *sh)
-/* Insert a new shape and its siblings in the tree, with parent pParent */
-void
-Shape::insert_children(Shape* pNewChildToInsert)
-{
-
- Shape* pSibling = pNewChildToInsert;
- while(pSibling->next_sibling != NULL) {
- pSibling->parent = parent;
- pSibling = pSibling->next_sibling;
- }
- pSibling->parent = parent;
- pSibling->next_sibling = child;
- child = pNewChildToInsert;
-}
/*-- Shapes --*/
@@ -139,13 +125,14 @@ Shape::insert_children(Shape* pNewChildToInsert)
/* Allocate the root of the shapes */
void
-Shapes::mw_alloc_shapes( int nrow, int ncol, float value)
+Shapes::mw_alloc_shapes( int inrow, int incol, float value)
{
int size,i;
Shape *root;
+ std::cout << "mw_alloc_shapes () " << std::endl;
- size = nrow*ncol;
+ size = inrow*incol;
if (size <= 0)
{
std::cerr << "[mw_alloc_shapes] Attempts to alloc shapes with null size" << std::endl;
@@ -166,13 +153,14 @@ Shapes::mw_alloc_shapes( int nrow, int ncol, float value)
root->area = size;
root->removed = 0;
root->pixels = NULL;
- root->parent = NULL;
- root->next_sibling = NULL;
+ root->parent = root->next_sibling;
+ root->next_sibling = root->child;
root->child = NULL;
nb_shapes = 1;
- nrow = nrow;
- ncol = ncol;
+ nrow = inrow;
+ ncol = incol;
+
typedef Shape* ShapePtr;
smallest_shape = new ShapePtr[size];
@@ -188,23 +176,20 @@ Shapes::mw_alloc_shapes( int nrow, int ncol, float value)
/* Allocate the struct and the root if they are not defined */
void
-Shapes::mw_change_shapes(int nrow,int ncol,float value)
+Shapes::mw_change_shapes(int inrow,int incol,float value)
{
int size,i;
/* Deallocate the shapes but the structure itself */
- std::cout << "mw_change_shapes 1 " << std::endl;
- std::cout << "nb shapes : " <<this->nb_shapes << std::endl;
- std::cout << "the shapes : " <<the_shapes << std::endl;
+ std::cout << "mw_change_shapes () " << std::endl;
+ std::cout << " nb shapes : " <<this->nb_shapes;
+ std::cout << " the shapes : " <<the_shapes << std::endl;
if((the_shapes != NULL) && (nb_shapes > 0))
delete[] the_shapes[0].pixels;
- std::cout << "mw_change_shapes 2 " << std::endl;
if (the_shapes != NULL) delete[] the_shapes;
- std::cout << "mw_change_shapes 3 " << std::endl;
- if (smallest_shape != NULL) delete[] smallest_shape;
- std::cout << "mw_change_shapes 4 " << std::endl;
-
- mw_alloc_shapes(nrow, ncol, value);
+ if (smallest_shape != NULL) delete[] smallest_shape;
+
+ mw_alloc_shapes(inrow, incol, value);
}
@@ -296,14 +281,19 @@ Shapes::flst_pixels()
int j;
int iIndex;
+ std::cout << "flst_pixel () 1" << std::endl;
+
/* 1) Compute nb of proper pixels in each shape */
tabNbOfProperPixels = new int[nb_shapes];
if(tabNbOfProperPixels ==NULL)
std::cerr << "Allocation of array error" << std::endl;
compute_proper_pixels(tabNbOfProperPixels);
+ std::cout << "flst_pixel () 2" << std::endl;
+
/* 2) Allocate array for the root and make others sub-arrays */
allocate_pixels(tabNbOfProperPixels);
+ std::cout << "flst_pixel () 3" << std::endl;
/* 3) Fill the array */
ppShape = smallest_shape + ncol*nrow-1;
@@ -314,10 +304,300 @@ Shapes::flst_pixels()
pCurrentPoint = &(*ppShape)->pixels[--tabNbOfProperPixels[iIndex]];
pCurrentPoint->x = j; pCurrentPoint->y = i;
}
+ std::cout << "flst_pixel () 4" << std::endl;
+
delete[] tabNbOfProperPixels;
}
+const int Shapes::EAST = 0;
+const int Shapes::NORTH = 1;
+const int Shapes::WEST = 2;
+const int Shapes::SOUTH = 3;
+
+
+void
+Shapes::TURN_LEFT(int *dir)
+{
+ *dir = (*dir==NORTH ? WEST :(*dir==WEST ? SOUTH :(*dir==SOUTH ? EAST : NORTH)));
+}
+
+void
+Shapes::TURN_RIGHT(int *dir)
+{
+ *dir = (*dir==NORTH ? EAST :(*dir==EAST ? SOUTH :(*dir==SOUTH ? WEST : NORTH)));
+}
+
+
+/* Is the point in the shape? */
+char
+Shapes::point_in_shape(int x,int y,Shape *pShape)
+{
+ char result;
+
+ Shape *pShapePoint = smallest_shape[y*ncol+x];
+ result = (pShape->pixels <= pShapePoint->pixels &&
+ pShapePoint->pixels < pShape->pixels+pShape->area);
+
+ std::cout << "PointInShape() -->"<<x<<" "<<y<<" " << pShape->value;
+ std::cout << " Result : "<< int(result) <<std::endl;
+
+ return (pShape->pixels <= pShapePoint->pixels &&
+ pShapePoint->pixels < pShape->pixels+pShape->area);
+}
+
+/* Find the dual point following pDualPoint as we follow the shape boundary */
+void
+Shapes::find_next_dual_point(Point_plane *pDualPoint,int *cDirection,Shape *pShape)
+{
+ char bLeftIn, bRightIn;
+ std::cout << "Shapes::find_next_dual_point()" << std::endl;
+ std::cout << " pDualPoint : ( "<<pDualPoint->x << " , " << pDualPoint->y << " )";
+ std::cout << " Direction :" << cDirection ;
+ std::cout << std::endl;
+
+ switch(*cDirection) {
+ case NORTH:
+ bLeftIn = point_in_shape(pDualPoint->x-1, pDualPoint->y-1, pShape);
+ bRightIn = point_in_shape(pDualPoint->x, pDualPoint->y-1, pShape);
+ if(bLeftIn && ! bRightIn)
+ -- pDualPoint->y;
+ else if(! bLeftIn && (! bRightIn || pShape->inferior_type)) {
+ -- pDualPoint->x;
+ TURN_LEFT(cDirection);
+ } else {
+ ++ pDualPoint->x;
+ TURN_RIGHT(cDirection);
+ }
+ break;
+ case WEST:
+ bLeftIn = point_in_shape(pDualPoint->x-1, pDualPoint->y, pShape);
+ bRightIn = point_in_shape(pDualPoint->x-1, pDualPoint->y-1, pShape);
+ if(bLeftIn && ! bRightIn)
+ -- pDualPoint->x;
+ else if(! bLeftIn && (! bRightIn || pShape->inferior_type)) {
+ ++ pDualPoint->y;
+ TURN_LEFT(cDirection);
+ } else {
+ -- pDualPoint->y;
+ TURN_RIGHT(cDirection);
+ }
+ break;
+ case SOUTH:
+ bLeftIn = point_in_shape(pDualPoint->x, pDualPoint->y, pShape);
+ bRightIn = point_in_shape(pDualPoint->x-1, pDualPoint->y, pShape);
+ if(bLeftIn && ! bRightIn)
+ ++ pDualPoint->y;
+ else if(! bLeftIn && (! bRightIn || pShape->inferior_type)) {
+ ++ pDualPoint->x;
+ TURN_LEFT(cDirection);
+ } else {
+ -- pDualPoint->x;
+ TURN_RIGHT(cDirection);
+ }
+ break;
+ case EAST:
+ bLeftIn = point_in_shape(pDualPoint->x, pDualPoint->y-1, pShape);
+ bRightIn = point_in_shape(pDualPoint->x, pDualPoint->y, pShape);
+ if(bLeftIn && ! bRightIn)
+ ++ pDualPoint->x;
+ else if(! bLeftIn && (! bRightIn || pShape->inferior_type)) {
+ -- pDualPoint->y;
+ TURN_LEFT(cDirection);
+ } else {
+ ++ pDualPoint->y;
+ TURN_RIGHT(cDirection);
+ }
+ break;
+ }
+}
+
+int
+Shapes::find_closed_boundary(Shape *pShape,PathPointer pBoundary)
+{
+ short int x0;
+ short int y0;
+ Point_plane dualPoint;
+ int cDirection;
+ short int iWidth = (short int)ncol;
+ short int iHeight = (short int)nrow;
+ PathType::ContinuousIndexType cindex;
+
+ std::cout << " find_closed_boundary 0" << std::endl;
+ /* 1) Find initial point, with NORTH direction */
+ std::cout << "pixel : " << pShape->pixels << std::endl;
+
+ dualPoint.x = pShape->pixels[0].x;
+ dualPoint.y = pShape->pixels[0].y;
+ cDirection = NORTH;
+
+ std::cout << " find_closed_boundary 1" << std::endl;
+
+ do ++ dualPoint.x;
+ while(point_in_shape(dualPoint.x, dualPoint.y, pShape));
+
+ std::cout << " find_closed_boundary 2" << std::endl;
+
+ /* 2) Follow the boundary */
+ x0 = dualPoint.x;
+ y0 = dualPoint.y;
+ do {
+ std::cout << " find_closed_boundary 3" << std::endl;
+ cindex[0] = dualPoint.x;
+ cindex[1] = dualPoint.y;
+
+ pBoundary->AddVertex(cindex);
+
+ find_next_dual_point(&dualPoint,&cDirection, pShape);
+ } while(dualPoint.x != x0 || dualPoint.y != y0 || cDirection != NORTH);
+ /* Close the boundary */
+
+ cindex[0] = dualPoint.x;
+ cindex[1] = dualPoint.y;
+
+ pBoundary->AddVertex(cindex);
+
+ std::cout << " find_closed_boundary 4" << std::endl;
+
+}
+
+
+/* Find an initial point (to follow the boundary) at the border of the image */
+void
+Shapes::initial_point_border(Point_plane *pDualPoint,int *cDirection,Shape *pShape)
+{
+ short int iWidth = (short int)ncol;
+ short int iHeight = (short int)nrow;
+ short int x, y;
+
+ std::cout << "initial_point_border() --> " ;
+ std::cout << " pDualPoint x: " <<pDualPoint->x ;
+ std::cout << " pDualPoint y: " <<pDualPoint->y ;
+ std::cout << " Direction :" << int(*cDirection) << std::endl;
+
+ /* Right border */
+ *cDirection = WEST;
+ std::cout << " Direction (WEST) :" << int(*cDirection) << std::endl;
+ x = iWidth-1;
+ y = 0;
+ if(point_in_shape(x, y++, pShape))
+ while(y < iHeight && point_in_shape(x, y++, pShape));
+ while(y < iHeight && ! point_in_shape(x, y, pShape))
+ ++ y;
+ if(y < iHeight) {
+ pDualPoint->x = iWidth;
+ pDualPoint->y = y;
+ return;
+ }
+ /* Top border */
+ *cDirection = SOUTH;
+ x = 0;
+ y = 0;
+ if(point_in_shape(x++, y, pShape))
+ while(x < iWidth && point_in_shape(x++, y, pShape));
+ while(x < iWidth && ! point_in_shape(x, y, pShape))
+ ++ x;
+ if(x < iWidth) {
+ pDualPoint->x = x;
+ pDualPoint->y = 0;
+ return;
+ }
+ /* Left border */
+ *cDirection = EAST;
+ x = 0;
+ y = iHeight-1;
+ if(point_in_shape(x, y--, pShape))
+ while(y >= 0 && point_in_shape(x, y--, pShape));
+ while(y >= 0 && ! point_in_shape(x, y, pShape))
+ -- y;
+ if(y >= 0) {
+ pDualPoint->x = 0;
+ pDualPoint->y = y+1;
+ return;
+ }
+ /* Bottom border */
+ *cDirection = NORTH;
+ x = iWidth-1;
+ y = iHeight-1;
+ if(point_in_shape(x--, y, pShape))
+ while(x >= 0 && point_in_shape(x--, y, pShape));
+ while(x >= 0 && ! point_in_shape(x, y, pShape))
+ -- x;
+ if(x >= 0) {
+ pDualPoint->x = x+1;
+ pDualPoint->y = iHeight;
+ return;
+ }
+ std::cerr << "initial_point_border --> Coherency?"<<std::endl;
+}
+
+/* Find an open boundary */
+void
+Shapes::find_open_boundary(Shape *pShape,PathPointer pBoundary)
+{
+ Point_plane dualPoint;
+ int cDirection;
+ Point_plane *pPoint;
+ short int iWidth = (short int)ncol;
+ short int iHeight = (short int)nrow;
+ PathType::ContinuousIndexType cindex;
+
+ std::cout << "Shapes::find_open_boundary()" << std::endl;
+ initial_point_border(&dualPoint,&cDirection, pShape);
+ do {
+ cindex[0] = dualPoint.x;
+ cindex[1] = dualPoint.y;
+
+ pBoundary->AddVertex(cindex);
+
+ std::cout << "Shapes::find_open_boundary() DO WHILE" << std::endl;
+ find_next_dual_point(&dualPoint, &cDirection,pShape);
+ } while(0 < dualPoint.x && dualPoint.x < iWidth &&
+ 0 < dualPoint.y && dualPoint.y < iHeight);
+
+ /* We store the exit */
+
+ cindex[0] = dualPoint.x;
+ cindex[1] = dualPoint.y;
+
+ pBoundary->AddVertex(cindex);
+
+ std::cout << "Shapes::find_open_boundary() END" << std::endl;
+
+}
+
+
+/* Find boundary of the shape */
+Shapes::PathPointer
+Shapes::flst_shape_boundary(Shape *pShape)
+{
+ std::cout << " FLST Shape Boundary " << std::endl;
+ std::cout << "Nb ncol : " << ncol << std::endl;
+
+ PathPointer pBoundary = PathType::New();
+
+ std::cout << " FLST Shape Boundary ....New" << std::endl;
+
+ if(the_shapes[0].pixels == NULL)
+ flst_pixels();
+ std::cout << " FLST Shape Boundary ....Pixel" << std::endl;
+
+ std::cout << " FLST Shape Boundary ....pShape->open " <<int(pShape->open) << std::endl;
+
+ pBoundary->Initialize();
+
+ if(pShape->open)
+ find_open_boundary( pShape, pBoundary);
+ else
+ find_closed_boundary(pShape, pBoundary);
+
+ std::cout << " FLST Shpae Boundary ....Find OK" << std::endl;
+
+ return(pBoundary);
+}
+
+
+
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbTreeNeighborhood.h b/Code/FeatureExtraction/otbTreeNeighborhood.h
index 3cc2368cef530ba021bb66b8fa1cc8b9b435cb91..f3dacfd57fb879d49a39d3358825b555404f1661 100644
--- a/Code/FeatureExtraction/otbTreeNeighborhood.h
+++ b/Code/FeatureExtraction/otbTreeNeighborhood.h
@@ -57,6 +57,8 @@ public:
void init_neighborhood(int iMaxArea,int iWidth,int iHeight);
void free_neighborhood();
+ void print_neighborhood();
+
int ORDER_MAX(int k,int l) { return (tabPoints[k].value > tabPoints[l].value); };
int ORDER_MIN(int k,int l) { return (tabPoints[k].value < tabPoints[l].value); };
int ORDER_MAX2(int k,int l) { return (tabPoints[k].value >= tabPoints[l].value); };
diff --git a/Code/FeatureExtraction/otbTreeNeighborhood.txx b/Code/FeatureExtraction/otbTreeNeighborhood.txx
index 50ff0949031de39283ae7fcc5fcf0199eb5dbda0..58dfc9f86f69870aee1c6fce4630d04a0be8b89a 100644
--- a/Code/FeatureExtraction/otbTreeNeighborhood.txx
+++ b/Code/FeatureExtraction/otbTreeNeighborhood.txx
@@ -104,6 +104,20 @@ Neighborhood::fix_down()
}
+void
+Neighborhood::print_neighborhood()
+{
+ std::cout << "pNeighborhood : " << std::endl;
+ std::cout << " iNbPoints : " << iNbPoints << std::endl;
+ for(int i= 0 ; i<=iNbPoints ; i++)
+ {
+ std::cout << "tabPoints["<<i <<"] =" << tabPoints[i].value ;
+ std::cout << " Position: (" << tabPoints[i].point.x;
+ std::cout << " , " << tabPoints[i].point.y << ")" ;
+ std::cout << std::endl;
+ }
+
+}
diff --git a/Code/FeatureExtraction/otbTreeSource.txx b/Code/FeatureExtraction/otbTreeSource.txx
index 9bd9230d07e8a5d6051c3858e057f263b332e163..32682b488d1b492ba58451932dd2066964b381ac 100644
--- a/Code/FeatureExtraction/otbTreeSource.txx
+++ b/Code/FeatureExtraction/otbTreeSource.txx
@@ -83,7 +83,7 @@ TreeSource<TOutputTree>
template<class TOutputTree>
void
TreeSource<TOutputTree>
-::SetOutput(OutputTreeType *output)
+::SetOutput(TOutputTree *output)
{
itkWarningMacro(<< "SetOutput(): This method is slated to be removed from ITK. Please use GraftOutput() in possible combination with DisconnectPipeline() instead." );
this->itk::ProcessObject::SetNthOutput(0, output);
diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index af7330b60fe11a2100314df3e406fe284fb6ad26..59e2eadbc182180591bfc734f7b061c6fd4b19d4 100755
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -52,7 +52,7 @@ ADD_TEST(feTuDrawPathTestAlign ${FEATUREEXTRACTION_TESTS}
ADD_TEST(feTuTestFLST ${FEATUREEXTRACTION_TESTS}
otbTestFlst
${INPUTDATA}/TeteAToto.png
- ${TEMP}/feFLST.png)
+ ${TEMP}/feFLSTsegment.txt)
ADD_TEST(feTuComplexMomentImage ${FEATUREEXTRACTION_TESTS}
otbComplexMomentImage
@@ -72,6 +72,9 @@ ADD_TEST(feTuComplexMomentPathNew ${FEATUREEXTRACTION_TESTS}
ADD_TEST(feTuComplexMomentPath ${FEATUREEXTRACTION_TESTS}
otbComplexMomentPath 1 1)
+ADD_TEST(feTuComplexMomentPathFloat ${FEATUREEXTRACTION_TESTS}
+ otbComplexMomentPath 1 1)
+
ADD_TEST(feTuHuPathNew ${FEATUREEXTRACTION_TESTS}
otbHuPathNew)
@@ -219,6 +222,7 @@ otbHuImage.cxx
otbFlusserImage.cxx
otbComplexMomentPathNew.cxx
otbComplexMomentPath.cxx
+otbComplexMomentPathFloat.cxx
otbHuPathNew.cxx
otbHuPath.cxx
otbFlusserPathNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1908d42417e520b0d8bee6d4578311de8b601a24
--- /dev/null
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
@@ -0,0 +1,76 @@
+/*=========================================================================
+
+ Programme : OTB (ORFEO ToolBox)
+ Auteurs : CS - P.Imbo
+ Language : C++
+ Date : 20 mars 2006
+ Version :
+ Role :
+ $Id$
+
+=========================================================================*/
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+#include "otbImageFileReader.h"
+#include "otbComplexMomentPathFunction.h"
+#include "itkExceptionObject.h"
+#include "itkPolyLineParametricPath.h"
+
+int otbComplexMomentPathFloat( int argc, char ** argv )
+{
+ try
+ {
+ unsigned int p((unsigned int)::atoi(argv[1]));
+ unsigned int q((unsigned int)::atoi(argv[2]));
+
+ const unsigned int Dimension = 2;
+
+ typedef itk::PolyLineParametricPath< Dimension > PathType;
+ typedef std::complex<float> ComplexType;
+ typedef otb::ComplexMomentPathFunction< PathType,ComplexType > CMType;
+
+ // Dessiner un carré:
+ PathType::ContinuousIndexType cindex;
+ PathType::Pointer pathElt = PathType::New();
+
+ pathElt->Initialize();
+
+ cindex[0]=30;
+ cindex[1]=30;
+ pathElt->AddVertex(cindex);
+ cindex[0]= 30;
+ cindex[1]=130;
+ pathElt->AddVertex(cindex);
+ cindex[0]=130;
+ cindex[1]=130;
+ pathElt->AddVertex(cindex);
+ cindex[0]=130;
+ cindex[1]= 30;
+ pathElt->AddVertex(cindex);
+
+ CMType::Pointer function =CMType::New();
+
+ function->SetQ(q);
+ function->SetP(p);
+
+ ComplexType Result;
+
+ Result = function->Evaluate( *pathElt);
+ std::cout << "function->Evaluate(Path)"<< Result << std::endl;
+ }
+ catch( itk::ExceptionObject & err )
+ {
+ std::cout << "Exception itk::ExceptionObject levee !" << std::endl;
+ std::cout << err << std::endl;
+ return EXIT_FAILURE;
+ }
+ catch( ... )
+ {
+ std::cout << "Exception levee inconnue !" << std::endl;
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
+}
+
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
index 942b7392ce54bb3c6b0838b5324052fa161b8b1c..b3d51c665181f21c2034902bfd44e13178fed3dd 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
@@ -26,7 +26,7 @@ int otbComplexMomentPathNew( int argc, char ** argv )
typedef itk::PolyLineParametricPath< Dimension > PathType;
typedef otb::ComplexMomentPathFunction<PathType> CMType;
- CMType::Pointer function =CMType::New();
+ CMType::Pointer function = CMType::New();
}
catch( itk::ExceptionObject & err )
{
diff --git a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx
index cbfdb8253ce61f8f87336d628db3172a533637e4..e3deecdc59f6ec2b8f20b8d3e211f1e1cf7b50b3 100755
--- a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx
+++ b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx
@@ -20,6 +20,7 @@ REGISTER_TEST(otbHuImage);
REGISTER_TEST(otbFlusserImage);
REGISTER_TEST(otbComplexMomentPathNew);
REGISTER_TEST(otbComplexMomentPath);
+REGISTER_TEST(otbComplexMomentPathFloat);
REGISTER_TEST(otbHuPathNew);
REGISTER_TEST(otbHuPath);
REGISTER_TEST(otbFlusserPathNew);
diff --git a/Testing/Code/FeatureExtraction/otbFlstTest.cxx b/Testing/Code/FeatureExtraction/otbFlstTest.cxx
index a7eec2738d1afedcfb7fcb824014daa6af47227a..05bfb3631b8e48bc27280d873c9b80dc87944487 100644
--- a/Testing/Code/FeatureExtraction/otbFlstTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlstTest.cxx
@@ -53,10 +53,10 @@ int otbFlstTest( int argc, char ** argv )
typedef otb::TreeSource<PathType> TreeSourceType;
- typedef otb::ImageToTreeFilter<InputImageType,PathType> TreeFilterType;
typedef otb::Flst<InputImageType,PathType> FlstType;
-
- typedef itk::TreeContainer< PathType > OutputTreeType;
+// typedef FlstType::OutputTreeType OutputTreeType;
+ typedef FlstType::TreeType OutputTreeType;
+
typedef OutputTreeType::Pointer OutputTreePointerType;
@@ -75,6 +75,15 @@ int otbFlstTest( int argc, char ** argv )
FlstTest->Update();
+// OutputTreeType *sortieTree = FlstTest->GetOutput();
+
+ std::cout << "Phase d'écriture:"<<std::endl;
+
+ FILE *file = fopen(outputFilename,"w");
+ if (file == NULL) {
+ std::cerr<<"Erreur dans l'ouverture du fichier"<<std::endl;
+ }
+
}
catch( itk::ExceptionObject & err )
diff --git a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
index 1bc1b738749a0a49a04e35537457811c57d9ead4..d7b20690d3dfa7f1b7f0e100a3225a4cf13326fd 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
@@ -65,7 +65,10 @@ int otbFlusserImage( int argc, char ** argv )
for (Number = 1 ;Number<12;Number++)
{
- function->SetNumber(Number);
+ //OTB-FA-00024-CS
+ function->SetMomentNumber(Number);
+ //OTB-FA-00025-CS
+ function->SetNeighborhoodRadius(3);
Result = function->EvaluateAtIndex( index );
std::cout << "Flusser("<<Number<<") = "<< Result <<std::endl;
}
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
index 3a619a791a1babfe5f85d293dba91652b3912379..8d946027af904f18a04a6e1aba1e5ef01e5cb370 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
@@ -49,13 +49,16 @@ int otbFlusserPath( int argc, char ** argv )
FunctionType::Pointer function =FunctionType::New();
function->SetStep(2.0);
+ //OTB-FA-00022-CS
+ function->SetInputPath( pathElt );
RealType Result;
for (Number = 1 ;Number<12;Number++)
{
- function->SetNumber(Number);
- Result = function->Evaluate( *pathElt );
+ //OTB-FA-00024-CS
+ function->SetMomentNumber(Number);
+ Result = function->Evaluate( );
std::cout << "Flusser("<<Number<<") = "<< Result <<std::endl;
}
}
diff --git a/Testing/Code/FeatureExtraction/otbHuImage.cxx b/Testing/Code/FeatureExtraction/otbHuImage.cxx
index eb46acec44517711d28b2fee7d5bffbfeacff7c5..73e2c9c812aeb944fab6dbe9d319838f5caeef23 100644
--- a/Testing/Code/FeatureExtraction/otbHuImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuImage.cxx
@@ -65,7 +65,10 @@ int otbHuImage( int argc, char ** argv )
for (Number = 1 ;Number<10;Number++)
{
- function->SetNumber(Number);
+ //OTB-FA-00024-CS
+ function->SetMomentNumber(Number);
+ //OTB-FA-00025-CS
+ function->SetNeighborhoodRadius(3);
Result = function->EvaluateAtIndex( index );
std::cout << "Hu("<<Number<<") = "<< Result <<std::endl;
}
diff --git a/Testing/Code/FeatureExtraction/otbHuPath.cxx b/Testing/Code/FeatureExtraction/otbHuPath.cxx
index f5204a45603f8b6dac64b9b2f2196c5425d49798..b35a866effee792e34418f5f594464c58b0b27f7 100644
--- a/Testing/Code/FeatureExtraction/otbHuPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPath.cxx
@@ -51,11 +51,13 @@ int otbHuPath( int argc, char ** argv )
FunctionType::Pointer function =FunctionType::New();
RealType Result;
+ function->SetInputPath( pathElt );
for (Number = 1 ;Number<8;Number++)
{
- function->SetNumber(Number);
- Result = function->Evaluate( *pathElt );
+ //OTB-FA-00024-CS
+ function->SetMomentNumber(Number);
+ Result = function->Evaluate();
std::cout << "Hu("<<Number<<") = "<< Result <<std::endl;
}
}