Skip to content
Snippets Groups Projects
Commit d8513c83 authored by Cyrille Valladeau's avatar Cyrille Valladeau
Browse files

ENH : add reference in function signature

parent 6ad6d5a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Code/FeatureExtraction/otbLineSegmentDetector.h
+ 10
− 8
View file @ d8513c83
......@@ -104,6 +104,7 @@ class ITK_EXPORT LineSegmentDetector :
typedef typename InputImageType::PixelType InputPixelType;
typedef typename InputImageType::IndexType InputIndexType;
typedef typename InputImageType::SizeType SizeType;
typedef typename InputImageType::RegionType RegionType;
/** Definition of the list of lines. */
typedef LineSpatialObjectList LineSpatialObjectListType;
......@@ -140,15 +141,16 @@ class ITK_EXPORT LineSegmentDetector :
typedef itk::UnaryFunctorImageFilter<GradientOutputImageType,OutputImageType,
Functor::MagnitudeFunctor<typename GradientOutputImageType::PixelType,TPrecision> > MagnitudeFilterType;
typedef typename MagnitudeFilterType::Pointer MagnitudeFilterPointerType;
typedef typename MagnitudeFilterType::OutputImageType::PixelType MagnitudePixelType;
typedef typename MagnitudeFilterType::OutputImageType MagnitudeImageType;
typedef typename MagnitudeFilterType::Pointer MagnitudeFilterPointerType;
typedef typename MagnitudeFilterType::OutputImageType::PixelType MagnitudePixelType;
typedef typename MagnitudeFilterType::OutputImageType MagnitudeImageType;
typedef typename MagnitudeImageType::Pointer MagnitudeImagePointerType;
typedef itk::UnaryFunctorImageFilter<GradientOutputImageType,OutputImageType,
Functor::OrientationFunctor<typename GradientOutputImageType::PixelType,TPrecision> > OrientationFilterType;
typedef typename OrientationFilterType::Pointer OrientationFilterPointerType;
typedef typename OrientationFilterType::OutputImageType OutputImageDirType;
typedef typename OutputImageDirType::RegionType OutputImageDirRegionType;
typedef typename OrientationFilterType::Pointer OrientationFilterPointerType;
typedef typename OrientationFilterType::OutputImageType OutputImageDirType;
typedef typename OutputImageDirType::RegionType OutputImageDirRegionType;
/** Create an image to store the label USED(1) or notUsed (0)*/
typedef otb::Image<unsigned char, 2> LabelImageType;
......@@ -177,13 +179,13 @@ protected:
* this method is used to determine the seeds where to begin the search segments
* Points with large gradient modulus are more able to belong to a segment
*/
virtual CoordinateHistogramType SortImageByModulusValue(OutputImageType * modulusImage);
virtual CoordinateHistogramType SortImageByModulusValue(MagnitudeImagePointerType modulusImage);
/** */
virtual void LineSegmentDetection(CoordinateHistogramType & CoordinateHistogram);
/** */
virtual bool IsUsed(InputIndexType index);
virtual bool IsUsed(InputIndexType & index);
/** Set Pixel flag to USED*/
virtual void SetPixelToUsed(InputIndexType index);
......
Code/FeatureExtraction/otbLineSegmentDetector.txx
+ 43
− 31
View file @ d8513c83
......@@ -23,6 +23,7 @@
#include "itkNumericTraits.h"
#include "itkMinimumMaximumImageCalculator.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkImageConstIterator.h"
#include "itkNeighborhoodIterator.h"
#include "otbPolygon.h"
#include "itkCastImageFilter.h"
......@@ -139,7 +140,7 @@ template <class TInputImage, class TPrecision >
typename LineSegmentDetector<TInputImage,TPrecision >
::CoordinateHistogramType
LineSegmentDetector<TInputImage,TPrecision >
::SortImageByModulusValue(OutputImageType * modulusImage)
::SortImageByModulusValue(MagnitudeImagePointerType modulusImage)
{
if(m_ImageSize[0]==0 && m_ImageSize[1]==0)
m_ImageSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
......@@ -178,17 +179,19 @@ LineSegmentDetector<TInputImage,TPrecision >
CoordinateHistogramType tempHisto(NbBin); /** Initializing the histogram */
itk::ImageRegionIterator<OutputImageType> it(modulusImage,
modulusImage->GetRequestedRegion());
itk::ImageRegionIterator<OutputImageType> it(modulusImage, modulusImage->GetLargestPossibleRegion()); //modulusImage->GetRequestedRegion());
InputIndexType indexRef = this->GetInput()->GetLargestPossibleRegion().GetIndex();
it.GoToBegin();
while(!it.IsAtEnd())
{
OutputIndexType index = it.GetIndex();
if(static_cast<int>(index[0]) > 0 && static_cast<int>(index[0]) < static_cast<int>(m_ImageSize[0])-1
&& static_cast<int>(index[1]) >0 && static_cast<int>(index[1]) < static_cast<int>(m_ImageSize[1])-1 )
// don't work with image boundaries
if(static_cast<int>(index[0]) > indexRef[0] && static_cast<int>(index[0]) < static_cast<int>(m_ImageSize[0]+indexRef[0])-1 &&
static_cast<int>(index[1]) > indexRef[1] && static_cast<int>(index[1]) < static_cast<int>(m_ImageSize[1]+indexRef[1])-1 )
{
unsigned int bin = static_cast<unsigned int> (it.Value()/lengthBin);
unsigned int bin = static_cast<unsigned int> (static_cast<double>(it.Value())/lengthBin);
if( it.Value()- m_Threshold >1e-10 )
tempHisto[NbBin-bin-1].push_back(it.GetIndex());
}
......@@ -211,24 +214,23 @@ LineSegmentDetector<TInputImage, TPrecision>
/** Begin the search of the segments*/
CoordinateHistogramIteratorType ItCoordinateList = CoordinateHistogram.begin();
while(ItCoordinateList != CoordinateHistogram.end())
{
typename IndexVectorType::iterator ItIndexVector = (*ItCoordinateList).begin();
while(ItIndexVector != (*ItCoordinateList).end())
{
InputIndexType index = *(ItIndexVector);
/** If the point is not yet computed */
if(!this->IsUsed(index))
{
this->GrowRegion(index);
}
{
this->GrowRegion(index);
}
++ItIndexVector;
}
++ItCoordinateList;
}
}
/**************************************************************************************************************/
......@@ -431,19 +433,26 @@ LineSegmentDetector<TInputImage, TPrecision>
template <class TInputImage, class TPrecision >
bool
LineSegmentDetector<TInputImage, TPrecision>
::IsUsed(InputIndexType index)
::IsUsed(InputIndexType & index)
{
bool isUsed = false;
typedef itk::NeighborhoodIterator<LabelImageType> NeighborhoodLabelIteratorType;
typename NeighborhoodLabelIteratorType::SizeType radiusLabel;
radiusLabel.Fill(0);
NeighborhoodLabelIteratorType itLabel(radiusLabel,m_UsedPointImage,
m_UsedPointImage->GetRequestedRegion());
itLabel.SetLocation(index);
if(*(itLabel.GetCenterValue()) == 1)
isUsed = true;
typedef itk::ImageConstIterator<LabelImageType> ImageIteratorType;
RegionType region = m_UsedPointImage->GetLargestPossibleRegion();
InputIndexType indexRef = region.GetIndex();
ImageIteratorType itLabel(m_UsedPointImage,region);
itLabel.GoToBegin();
if( m_UsedPointImage->GetLargestPossibleRegion().IsInside(index) )
{
itLabel.SetIndex(index);
if( itLabel.Get() == 1 )
isUsed = true;
}
else
{
itkExceptionMacro(<<"Can't access to index "<<index<<", outside the image largest region ("<<region.GetIndex()<<", "<<region.GetSize()<<")");
}
return isUsed;
}
......@@ -501,6 +510,7 @@ LineSegmentDetector<TInputImage, TPrecision>
double sumX = 0.;
double sumY = 0.;
/**
* Loop for searching regions
*/
......@@ -518,14 +528,16 @@ LineSegmentDetector<TInputImage, TPrecision>
InputIndexType NeighIndex = itNeigh.GetIndex(s);
double angleComp = itNeighDir.GetPixel(s);
if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
{
if(this->GetInput()->GetRequestedRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
{
this->SetPixelToUsed(NeighIndex);
reg.push_back(NeighIndex);
}
}
if(this->GetInput()->GetLargestPossibleRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
{
if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
{
this->SetPixelToUsed(NeighIndex);
reg.push_back(NeighIndex);
}
}
//}
s++;
}
}/** End Searching loop*/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment