diff --git a/Code/FeatureExtraction/otbLineRatioDetector.h b/Code/FeatureExtraction/otbLineRatioDetector.h index cb7596e151fc6afb7e3f91b3a505488bda98110a..4a638500b90e10ac2ffc778373bf9ef37f703989 100755 --- a/Code/FeatureExtraction/otbLineRatioDetector.h +++ b/Code/FeatureExtraction/otbLineRatioDetector.h @@ -26,7 +26,7 @@ namespace otb { -/** \class TupinEdgeDetector +/** \class LineRatioDetector * \brief Application of the filter of detection of linear features * * This class implements the detector D1 of Tupin which @@ -57,7 +57,7 @@ namespace otb template <class TInputImage, class TOutputImage, class InterpolatorType = itk::BSplineInterpolateImageFunction<TInputImage> > -class TupinEdgeDetector : public itk::ImageToImageFilter< TInputImage, TOutputImage > +class LineRatioDetector : public itk::ImageToImageFilter< TInputImage, TOutputImage > { public: /** Extract dimensions as well of the images of entry of exit. */ @@ -72,7 +72,7 @@ public: typedef TOutputImage OutputImageType; /** typedef for the classes standards. */ - typedef TupinEdgeDetector Self; + typedef LineRatioDetector Self; typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass; typedef itk::SmartPointer<Self> Pointer; typedef itk::SmartPointer<const Self> ConstPointer; @@ -81,7 +81,7 @@ public: itkNewMacro(Self); /** Return the nale of the class. */ - itkTypeMacro(TupinEdgeDetector, ImageToImageFilter); + itkTypeMacro(LineRatioDetector, ImageToImageFilter); /** Typedefs to describe and access Interpolator */ typedef typename InterpolatorType::Pointer InterpolatorPointer; @@ -123,12 +123,12 @@ public: virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError); protected: - TupinEdgeDetector(); - virtual ~TupinEdgeDetector() {}; + LineRatioDetector(); + virtual ~LineRatioDetector() {}; void PrintSelf(std::ostream& os, itk::Indent indent) const; - /** TupinEdgeDetector can be implemented for a treatment of filter multithreaded. + /** LineRatioDetector can be implemented for a treatment of filter multithreaded. * Thus, the ThreadedGenerateData() method is called for each thread process. * The data image are allocated automatically by the mother class by calling the * ThreadedGenerateData() method. ThreadedGenerateData can only write the portion @@ -140,7 +140,7 @@ protected: int threadId ); private: - TupinEdgeDetector(const Self&); //purposely not implemented + LineRatioDetector(const Self&); //purposely not implemented void operator=(const Self&); //purposely not implemented /** Length of the linear feature = 2*m_LengthLine+1 */ diff --git a/Code/FeatureExtraction/otbLineRatioDetector.txx b/Code/FeatureExtraction/otbLineRatioDetector.txx index 39f3e02288a3e5ed48f5b00a6177f2e5f9764667..bc9fa9a94b06e0ec5da140a947186ec70079b3dc 100755 --- a/Code/FeatureExtraction/otbLineRatioDetector.txx +++ b/Code/FeatureExtraction/otbLineRatioDetector.txx @@ -32,7 +32,7 @@ namespace otb * */ template <class TInputImage, class TOutputImage, class InterpolatorType > -TupinEdgeDetector<TInputImage, TOutputImage, InterpolatorType>::TupinEdgeDetector() +LineRatioDetector<TInputImage, TOutputImage, InterpolatorType>::LineRatioDetector() { m_Radius.Fill(1); m_LengthLine = 1; @@ -42,7 +42,7 @@ TupinEdgeDetector<TInputImage, TOutputImage, InterpolatorType>::TupinEdgeDetecto } template <class TInputImage, class TOutputImage, class InterpolatorType> -void TupinEdgeDetector<TInputImage, TOutputImage, InterpolatorType>::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError) +void LineRatioDetector<TInputImage, TOutputImage, InterpolatorType>::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError) { // call the superclass' implementation of this method Superclass::GenerateInputRequestedRegion(); @@ -91,7 +91,7 @@ void TupinEdgeDetector<TInputImage, TOutputImage, InterpolatorType>::GenerateInp } template< class TInputImage, class TOutputImage, class InterpolatorType> -void TupinEdgeDetector< TInputImage, TOutputImage, InterpolatorType> +void LineRatioDetector< TInputImage, TOutputImage, InterpolatorType> ::ThreadedGenerateData( const OutputImageRegionType& outputRegionForThread, int threadId @@ -310,7 +310,7 @@ void TupinEdgeDetector< TInputImage, TOutputImage, InterpolatorType> */ template <class TInputImage, class TOutput, class InterpolatorType> void -TupinEdgeDetector<TInputImage, TOutput, InterpolatorType>::PrintSelf(std::ostream& os, itk::Indent indent) const +LineRatioDetector<TInputImage, TOutput, InterpolatorType>::PrintSelf(std::ostream& os, itk::Indent indent) const { Superclass::PrintSelf( os, indent ); os << indent << "Radius: " << m_Radius << std::endl;