From 1ef2516db1254083500d6136a5148c6204462fe7 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Wed, 25 Nov 2009 10:20:40 +0800
Subject: [PATCH] STYLE
---
.../otbVectorizationPathListFilter.h | 2 +-
.../otbVectorizationPathListFilter.txx | 391 +++++++++---------
2 files changed, 201 insertions(+), 192 deletions(-)
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.h b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
index a48cd2f146..a780ae9e46 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.h
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
index 28800682e0..24f549d3b5 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
@@ -35,6 +35,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
this->SetNumberOfInputs(2);
m_AmplitudeThreshold = 1.0;
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
@@ -42,6 +43,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
{
this->itk::ProcessObject::SetNthInput(0,const_cast<InputModulusType *>(inputModulus));
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
const typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::InputModulusType *
@@ -54,6 +56,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
}
return static_cast<const TInputModulus*>(this->itk::ProcessObject::GetInput(0));
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
@@ -61,6 +64,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
{
this->itk::ProcessObject::SetNthInput(1,const_cast<InputDirectionType *>(inputDirection));
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
const typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::InputDirectionType *
@@ -73,6 +77,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
}
return static_cast<const TInputDirection *>(this->itk::ProcessObject::GetInput(1));
}
+
/**
* Main computation method
*/
@@ -102,13 +107,13 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
DirRegionIteratorType dirIt(dirPtr,dirPtr->GetLargestPossibleRegion());
FlagRegionIteratorType flagIt(flagImage,flagImage->GetLargestPossibleRegion());
- for (modIt.GoToBegin(),dirIt.GoToBegin(),flagIt.GoToBegin();
+ for (modIt.GoToBegin(), dirIt.GoToBegin(), flagIt.GoToBegin();
(!modIt.IsAtEnd()) && (!dirIt.IsAtEnd()) && (!flagIt.IsAtEnd());
- ++modIt,++dirIt,++flagIt)
+ ++modIt, ++dirIt, ++flagIt)
{
if ((modIt.Get() > m_AmplitudeThreshold) && (!flagIt.Get()))
{
- //this is a begining, to follow in two directions
+ //this is a beginning, to follow in two directions
OutputPathPointerType pathTempDirect = OutputPathType::New();
OutputPathPointerType pathTempReverse = OutputPathType::New();
OutputPathPointerType path = OutputPathType::New();
@@ -117,9 +122,9 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
int flagReverse = 0;
double totalAmplitude = 0;
- ModNeighborhoodIteratorType nModIt(radius,modPtr,modPtr->GetLargestPossibleRegion());
- DirNeighborhoodIteratorType nDirIt(radius,dirPtr,dirPtr->GetLargestPossibleRegion());
- FlagNeighborhoodIteratorType nFlagIt(radius,flagImage,flagImage->GetLargestPossibleRegion());
+ ModNeighborhoodIteratorType nModIt(radius, modPtr, modPtr->GetLargestPossibleRegion());
+ DirNeighborhoodIteratorType nDirIt(radius, dirPtr, dirPtr->GetLargestPossibleRegion());
+ FlagNeighborhoodIteratorType nFlagIt(radius, flagImage, flagImage->GetLargestPossibleRegion());
for (flagReverse=0; flagReverse < 2; ++flagReverse)
{
@@ -145,7 +150,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
offsetVector =GetThreeNeighborOffsetFromDirection(nDirIt.GetCenterPixel(),flagReverse);
OffsetIteratorType vecIt = offsetVector.begin();
bool flagFound=false;
- while (vecIt!=offsetVector.end()&&!flagFound)
+ while (vecIt != offsetVector.end() && !flagFound)
{
flagFound = nModIt.GetPixel(*vecIt) > 0
&& !nFlagIt.GetPixel(*vecIt);
@@ -156,7 +161,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
point.Fill(0);
PointType tmpPoint;
totalAmplitude = 0;
- for (vecIt = offsetVector.begin();vecIt!=offsetVector.end();++vecIt)
+ for (vecIt = offsetVector.begin(); vecIt != offsetVector.end(); ++vecIt)
{
totalAmplitude += nModIt.GetPixel(*vecIt);
modPtr->TransformIndexToPhysicalPoint(nModIt.GetIndex(*vecIt),tmpPoint);
@@ -248,6 +253,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
}
}
}
+
/**
* Compute the 8 neighbors to explore from the direction and the type of search (forward or backward).
* \param direction The direction
@@ -283,237 +289,239 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
switch ( neighborhoodNumber )
{
case 0:
- tmpOffset[0]=1;
- tmpOffset[1]=0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=0;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
case 1:
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
case 2:
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=0;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 3:
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=0;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
break;
case 4:
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=0;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
break;
case 5:
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 0;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
break;
case 6:
- tmpOffset[0]= 0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 0;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 7:
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
}
return offset;
-}/**
- * Compute the 3 neighbors to explore from the direction and the type of search (forward or backward).
- * \param direction The direction
- * \param flagReverse The type of search
- * \return The neighborhood
- */
+}
+
+/**
+ * Compute the 3 neighbors to explore from the direction and the type of search (forward or backward).
+ * \param direction The direction
+ * \param flagReverse The type of search
+ * \return The neighborhood
+ */
template <class TInputModulus, class TInputDirection, class TOutputPath>
typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::OffsetVectorType
@@ -543,105 +551,105 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
switch ( neighborhoodNumber )
{
case 0:
- tmpOffset[0]=1;
- tmpOffset[1]=0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
break;
case 1:
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
break;
case 2:
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 3:
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
break;
case 4:
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
break;
case 5:
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
break;
case 6:
- tmpOffset[0]= 0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 7:
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
break;
@@ -659,5 +667,6 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
{
Superclass::PrintSelf(os, indent);
}
+
} // End namespace otb
#endif
--
GitLab