ENH: A method prototype modification in...

ENH: A method prototype modification in LSDCode/FeatureExtraction/otbLineSegmentDetector.txx Code/FeatureExtraction/otbLineSegmentDetector.h

Code/FeatureExtraction/otbLineSegmentDetector.h

@@ -204,7 +204,7 @@ protected:
   virtual float ComputeRectNFA(RectangleType  rec);
 
   /** */
-  virtual float ImproveRectangle(RectangleType  * rec , float NFA);
+  virtual float ImproveRectangle(RectangleType  * rec);
 
   /** NFA For a rectangle*/
   virtual float NFA(int n, int k, double p, double logNT);

Code/FeatureExtraction/otbLineSegmentDetector.txx

@@ -83,7 +83,7 @@ LineSegmentDetector<TInputImage,TPrecision >
 
   /** Compute the modulus and the orientation gradient image*/
   m_GradientFilter->SetInput(this->GetInput());
-  m_GradientFilter->SetSigma(2.);
+  m_GradientFilter->SetSigma(1.4);
   m_MagnitudeFilter->SetInput(m_GradientFilter->GetOutput());
     
   m_OrientationFilter->SetInput(m_GradientFilter->GetOutput());
@@ -239,8 +239,7 @@ LineSegmentDetector<TInputImage, TPrecision>
   RectangleListTypeIterator            itRec = m_RectangleList.begin();
   while(itRec != m_RectangleList.end())
     {
-      float NFA = this->ComputeRectNFA(*itRec);
-      NFA = this->ImproveRectangle(&(*itRec) , NFA);
+      float NFA = this->ImproveRectangle(&(*itRec) );
       /**
        * Here we start building the OUTPUT :a LineSpatialObjectList. 
        */
@@ -296,7 +295,7 @@ LineSegmentDetector<TInputImage, TPrecision>
 template <class TInputImage, class TPrecision  >
 float
 LineSegmentDetector<TInputImage, TPrecision>
-:: ImproveRectangle(RectangleType  * rec , float NFA)
+:: ImproveRectangle(RectangleType  * rec)
 {
   int n = 0;
   float nfa_new;
@@ -304,6 +303,8 @@ LineSegmentDetector<TInputImage, TPrecision>
   float delta_2 = delta / 2.0;
   RectangleType r;
 
+  float NFA = this->ComputeRectNFA(*rec);
+  
   if( NFA > 0. ) return NFA;
  
   /*Try to improve the precison of the oriented */

Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx

@@ -44,6 +44,7 @@
 #include "otbLocalHoughFilter.h"
 #include "otbFillGapsFilter.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
+#include "otbLineSegmentDetector.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 #include "otbLineSpatialObjectList.h"
@@ -111,7 +112,10 @@ int main( int argc, char * argv[] )
   InternalImageType >  DetectorType;
   typedef otb::PixelSuppressionByDirectionImageFilter< InternalImageType,
   InternalImageType >   PixelSuppressionType;
-  typedef otb::LocalHoughFilter< InternalImageType >        LocalHoughType;
+  //typedef otb::LocalHoughFilter< InternalImageType >        LocalHoughType;
+
+  typedef otb::LineSegmentDetector<InternalImageType, InternalPixelType>            LocalHoughType;
+  
   typedef otb::FillGapsFilter             FillGapsType;
   typedef otb::DrawLineSpatialObjectListFilter< InternalImageType,
   OutputImageType >  DrawLineListType;
@@ -196,7 +200,7 @@ int main( int argc, char * argv[] )
 
   rescaler->SetInput(pixelSuppression->GetOutput() );
 
-  localHough->SetInput( rescaler->GetOutput() );
+  localHough->SetInput( pixelSuppression->GetOutput() );
 
   fillGaps->SetInput ( localHough->GetOutput() );
 
@@ -243,12 +247,12 @@ int main( int argc, char * argv[] )
   pixelSuppression->SetRadius( PixelSuppressionRadius );
   pixelSuppression->SetAngularBeam( PixelSuppressionAngularBeam );
 
-  PixelSuppressionType::SizeType LocalHoughRadius;
-  LocalHoughRadius[0] = LocalHoughRadiusX;
-  LocalHoughRadius[1] = LocalHoughRadiusY;
+  //PixelSuppressionType::SizeType LocalHoughRadius;
+  //LocalHoughRadius[0] = LocalHoughRadiusX;
+  //LocalHoughRadius[1] = LocalHoughRadiusY;
 
-  localHough->SetRadius( LocalHoughRadius );
-  localHough->SetNumberOfLines( LocalHoughNumberOfLines );
+  //localHough->SetRadius( LocalHoughRadius );
+  //localHough->SetNumberOfLines( LocalHoughNumberOfLines );
 
   fillGaps->SetRadius( FillGapsRadius );
   fillGaps->SetAngularBeam( FillGapsAngularBeam );