diff --git a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
index cbadc412bb8edd5ff8654c459c5ae03c1e707a02..7b570f058d6c0da5ed057a7071330669315afbbc 100644
--- a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
+++ b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
@@ -37,187 +37,179 @@ namespace Wrapper
class EdgeExtraction : public Application
{
public:
-/** Standard class typedefs. */
-typedef EdgeExtraction Self;
-typedef Application Superclass;
-typedef itk::SmartPointer<Self> Pointer;
-typedef itk::SmartPointer<const Self> ConstPointer;
-
-typedef MultiToMonoChannelExtractROI<FloatVectorImageType::InternalPixelType,FloatImageType::InternalPixelType>
- ExtractorFilterType;
-typedef itk::GradientMagnitudeImageFilter<FloatImageType, FloatImageType>
- GradientFilterType;
-typedef itk::SobelEdgeDetectionImageFilter<FloatImageType, FloatImageType>
- SobelFilterType;
-//typedef itk::CannyEdgeDetectionImageFilter<FloatImageType, FloatImageType>
-// CannyFilterType;
-typedef TouziEdgeDetectorImageFilter<FloatImageType, FloatImageType>
- TouziFilterType;
-
-/** Standard macro */
-itkNewMacro(Self);
-
-itkTypeMacro(EdgeExtraction, otb::Application);
+ /** Standard class typedefs. */
+ typedef EdgeExtraction Self;
+ typedef Application Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
-private:
+ typedef MultiToMonoChannelExtractROI<FloatVectorImageType::InternalPixelType, FloatImageType::InternalPixelType> ExtractorFilterType;
+ typedef itk::GradientMagnitudeImageFilter<FloatImageType, FloatImageType> GradientFilterType;
+ typedef itk::SobelEdgeDetectionImageFilter<FloatImageType, FloatImageType> SobelFilterType;
+ // typedef itk::CannyEdgeDetectionImageFilter<FloatImageType, FloatImageType>
+ // CannyFilterType;
+ typedef TouziEdgeDetectorImageFilter<FloatImageType, FloatImageType> TouziFilterType;
-void DoInit() override
-{
-SetName("EdgeExtraction");
-SetDescription(
- "This application computes edge features on every pixel of the input image "
- "selected channel");
-
-// Documentation
-SetDocName("Edge Feature Extraction");
-SetDocLongDescription(
- "This application computes edge features on a selected channel of the input."
- "It uses different filter such as gradient, Sobel and Touzi");
-
-SetDocLimitations("None");
-SetDocAuthors("OTB-Team");
-SetDocSeeAlso("otb class");
-
-AddDocTag(Tags::FeatureExtraction);
-AddDocTag("Edge");
-
-AddParameter(ParameterType_InputImage, "in", "Input Image");
-SetParameterDescription("in", "The input image on which the features are computed.");
-
-AddParameter(ParameterType_Int, "channel", "Selected Channel");
-SetParameterDescription("channel", "The selected channel index");
-SetDefaultParameterInt("channel", 1);
-SetMinimumParameterIntValue("channel", 1);
-
-AddRAMParameter();
-
-AddParameter(ParameterType_Choice, "filter", "Edge feature");
-SetParameterDescription("filter", "Choice of edge feature");
-
-//Gradient Section
-AddChoice("filter.gradient", "Gradient");
-SetParameterDescription("filter.gradient",
- "This filter computes the gradient magnitude of the image at each pixel.");
-
-//Sobel Section
-AddChoice("filter.sobel", "Sobel");
-SetParameterDescription("filter.sobel",
- "This filter uses the Sobel operator to calculate the image gradient and "
- "then finds the magnitude of this gradient vector.");
-
-//Touzi Section
-AddChoice("filter.touzi", "Touzi");
-SetParameterDescription("filter.touzi",
- "This filter is more suited for radar images. It has a spatial parameter "
- "to avoid speckle noise perturbations. The larger the radius is, "
- "less sensible to the speckle noise the filter is, but micro edge will be missed.");
-AddParameter(ParameterType_Int, "filter.touzi.xradius",
- "The X radius of the neighborhood.");
-SetDefaultParameterInt("filter.touzi.xradius", 1);
-AddParameter(ParameterType_Int, "filter.touzi.yradius",
- "The Y radius of the neighborhood.");
-SetDefaultParameterInt("filter.touzi.yradius", 1);
-
-//Canny Section
-/*
-AddChoice("filter.canny", "Canny");
-AddParameter(ParameterType_Float, "filter.canny.variance", "");
-SetDefaultParameterFloat("filter.canny.variance", 1.0);
-AddParameter(ParameterType_Float, "filter.canny.maximumerror", "");
-SetDefaultParameterFloat("filter.canny.maximumerror", 0.01);
-AddParameter(ParameterType_Float, "filter.canny.upperthreshold", "");
-SetDefaultParameterFloat("filter.canny.upperthreshold", 15.0);
-AddParameter(ParameterType_Float, "filter.canny.lowerthreshold", "");
-SetDefaultParameterFloat("filter.canny.lowerthreshold", 3.0);
-*/
-
-AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
-SetParameterDescription("out", "Output image containing the edge features.");
-
-// Doc example parameter settings
-SetDocExampleParameterValue("in", "qb_RoadExtract.tif");
-SetDocExampleParameterValue("channel", "1");
-SetDocExampleParameterValue("out", "Edges.tif");
-
-SetOfficialDocLink();
-}
-
-void DoUpdateParameters() override
-{
- // Nothing to do here : all parameters are independent
-}
+ /** Standard macro */
+ itkNewMacro(Self);
-void DoExecute() override
-{
- FloatVectorImageType::Pointer inImage = GetParameterImage("in");
- inImage->UpdateOutputInformation();
- int nbChan = inImage->GetNumberOfComponentsPerPixel();
+ itkTypeMacro(EdgeExtraction, otb::Application);
- if( GetParameterInt("channel") > nbChan )
+private:
+ void DoInit() override
+ {
+ SetName("EdgeExtraction");
+ SetDescription(
+ "This application computes edge features on every pixel of the input image "
+ "selected channel");
+
+ // Documentation
+ SetDocName("Edge Feature Extraction");
+ SetDocLongDescription(
+ "This application computes edge features on a selected channel of the input."
+ "It uses different filter such as gradient, Sobel and Touzi");
+
+ SetDocLimitations("None");
+ SetDocAuthors("OTB-Team");
+ SetDocSeeAlso("otb class");
+
+ AddDocTag(Tags::FeatureExtraction);
+ AddDocTag("Edge");
+
+ AddParameter(ParameterType_InputImage, "in", "Input Image");
+ SetParameterDescription("in", "The input image on which the features are computed.");
+
+ AddParameter(ParameterType_Int, "channel", "Selected Channel");
+ SetParameterDescription("channel", "The selected channel index");
+ SetDefaultParameterInt("channel", 1);
+ SetMinimumParameterIntValue("channel", 1);
+
+ AddRAMParameter();
+
+ AddParameter(ParameterType_Choice, "filter", "Edge feature");
+ SetParameterDescription("filter", "Choice of edge feature");
+
+ // Gradient Section
+ AddChoice("filter.gradient", "Gradient");
+ SetParameterDescription("filter.gradient", "This filter computes the gradient magnitude of the image at each pixel.");
+
+ // Sobel Section
+ AddChoice("filter.sobel", "Sobel");
+ SetParameterDescription("filter.sobel",
+ "This filter uses the Sobel operator to calculate the image gradient and "
+ "then finds the magnitude of this gradient vector.");
+
+ // Touzi Section
+ AddChoice("filter.touzi", "Touzi");
+ SetParameterDescription("filter.touzi",
+ "This filter is more suited for radar images. It has a spatial parameter "
+ "to avoid speckle noise perturbations. The larger the radius is, "
+ "less sensible to the speckle noise the filter is, but micro edge will be missed.");
+ AddParameter(ParameterType_Int, "filter.touzi.xradius", "The X radius of the neighborhood.");
+ SetDefaultParameterInt("filter.touzi.xradius", 1);
+ AddParameter(ParameterType_Int, "filter.touzi.yradius", "The Y radius of the neighborhood.");
+ SetDefaultParameterInt("filter.touzi.yradius", 1);
+
+ // Canny Section
+ /*
+ AddChoice("filter.canny", "Canny");
+ AddParameter(ParameterType_Float, "filter.canny.variance", "");
+ SetDefaultParameterFloat("filter.canny.variance", 1.0);
+ AddParameter(ParameterType_Float, "filter.canny.maximumerror", "");
+ SetDefaultParameterFloat("filter.canny.maximumerror", 0.01);
+ AddParameter(ParameterType_Float, "filter.canny.upperthreshold", "");
+ SetDefaultParameterFloat("filter.canny.upperthreshold", 15.0);
+ AddParameter(ParameterType_Float, "filter.canny.lowerthreshold", "");
+ SetDefaultParameterFloat("filter.canny.lowerthreshold", 3.0);
+ */
+
+ AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
+ SetParameterDescription("out", "Output image containing the edge features.");
+
+ // Doc example parameter settings
+ SetDocExampleParameterValue("in", "qb_RoadExtract.tif");
+ SetDocExampleParameterValue("channel", "1");
+ SetDocExampleParameterValue("out", "Edges.tif");
+
+ SetOfficialDocLink();
+ }
+
+ void DoUpdateParameters() override
+ {
+ // Nothing to do here : all parameters are independent
+ }
+
+ void DoExecute() override
+ {
+ FloatVectorImageType::Pointer inImage = GetParameterImage("in");
+ inImage->UpdateOutputInformation();
+ int nbChan = inImage->GetNumberOfComponentsPerPixel();
+
+ if (GetParameterInt("channel") > nbChan)
{
- otbAppLogCRITICAL("Selected band is not available...");
- return;
+ otbAppLogCRITICAL("Selected band is not available...");
+ return;
}
- const std::string edgeType = GetParameterString("filter");
+ const std::string edgeType = GetParameterString("filter");
- m_ExtractorFilter = ExtractorFilterType::New();
- m_ExtractorFilter->SetInput(inImage);
- m_ExtractorFilter->SetStartX(inImage->GetLargestPossibleRegion().GetIndex(0));
- m_ExtractorFilter->SetStartY(inImage->GetLargestPossibleRegion().GetIndex(1));
- m_ExtractorFilter->SetSizeX(inImage->GetLargestPossibleRegion().GetSize(0));
- m_ExtractorFilter->SetSizeY(inImage->GetLargestPossibleRegion().GetSize(1));
- m_ExtractorFilter->SetChannel(GetParameterInt("channel"));
- m_ExtractorFilter->UpdateOutputInformation();
+ m_ExtractorFilter = ExtractorFilterType::New();
+ m_ExtractorFilter->SetInput(inImage);
+ m_ExtractorFilter->SetStartX(inImage->GetLargestPossibleRegion().GetIndex(0));
+ m_ExtractorFilter->SetStartY(inImage->GetLargestPossibleRegion().GetIndex(1));
+ m_ExtractorFilter->SetSizeX(inImage->GetLargestPossibleRegion().GetSize(0));
+ m_ExtractorFilter->SetSizeY(inImage->GetLargestPossibleRegion().GetSize(1));
+ m_ExtractorFilter->SetChannel(GetParameterInt("channel"));
+ m_ExtractorFilter->UpdateOutputInformation();
- m_GradientFilter = GradientFilterType::New();
- m_SobelFilter = SobelFilterType::New();
- m_TouziFilter = TouziFilterType::New();
- //m_CannyFilter = CannyFilterType::New();
+ m_GradientFilter = GradientFilterType::New();
+ m_SobelFilter = SobelFilterType::New();
+ m_TouziFilter = TouziFilterType::New();
+ // m_CannyFilter = CannyFilterType::New();
- if( edgeType == "gradient" )
+ if (edgeType == "gradient")
{
- m_GradientFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
- SetParameterOutputImage("out", m_GradientFilter->GetOutput());
+ m_GradientFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
+ SetParameterOutputImage("out", m_GradientFilter->GetOutput());
}
- if( edgeType == "sobel" )
+ if (edgeType == "sobel")
{
- m_SobelFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
- SetParameterOutputImage("out", m_SobelFilter->GetOutput());
+ m_SobelFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
+ SetParameterOutputImage("out", m_SobelFilter->GetOutput());
}
- if( edgeType == "touzi" )
+ if (edgeType == "touzi")
{
- m_TouziFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
- TouziFilterType::SizeType rad;
- rad[0] = this->GetParameterInt("filter.touzi.xradius");
- rad[1] = this->GetParameterInt("filter.touzi.yradius");
- m_TouziFilter->SetRadius(rad);
- SetParameterOutputImage("out", m_TouziFilter->GetOutput());
- }
-/*
- if( edgeType == "canny" )
- {
-
- m_CannyFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
- m_CannyFilter->SetVariance(GetParameterFloat("filter.canny.variance"));
- m_CannyFilter->SetMaximumError(GetParameterFloat("filter.canny.maximumerror"));
- m_CannyFilter->SetUpperThreshold(GetParameterFloat("filter.canny.upperthreshold"));
- m_CannyFilter->SetLowerThreshold(GetParameterFloat("filter.canny.lowerthreshold"));
-
- SetParameterOutputImage("out", m_CannyFilter->GetOutput());
+ m_TouziFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
+ TouziFilterType::SizeType rad;
+ rad[0] = this->GetParameterInt("filter.touzi.xradius");
+ rad[1] = this->GetParameterInt("filter.touzi.yradius");
+ m_TouziFilter->SetRadius(rad);
+ SetParameterOutputImage("out", m_TouziFilter->GetOutput());
}
-*/
-}
-
-ExtractorFilterType::Pointer m_ExtractorFilter;
-GradientFilterType::Pointer m_GradientFilter;
-SobelFilterType::Pointer m_SobelFilter;
-TouziFilterType::Pointer m_TouziFilter;
-//CannyFilterType::Pointer m_CannyFilter;
+ /*
+ if( edgeType == "canny" )
+ {
+
+ m_CannyFilter->SetInput(const_cast<FloatImageType*>(m_ExtractorFilter->GetOutput()));
+ m_CannyFilter->SetVariance(GetParameterFloat("filter.canny.variance"));
+ m_CannyFilter->SetMaximumError(GetParameterFloat("filter.canny.maximumerror"));
+ m_CannyFilter->SetUpperThreshold(GetParameterFloat("filter.canny.upperthreshold"));
+ m_CannyFilter->SetLowerThreshold(GetParameterFloat("filter.canny.lowerthreshold"));
+
+ SetParameterOutputImage("out", m_CannyFilter->GetOutput());
+ }
+ */
+ }
+
+ ExtractorFilterType::Pointer m_ExtractorFilter;
+ GradientFilterType::Pointer m_GradientFilter;
+ SobelFilterType::Pointer m_SobelFilter;
+ TouziFilterType::Pointer m_TouziFilter;
+ // CannyFilterType::Pointer m_CannyFilter;
};
-}
-}
+} // namespace Wrapper
+} // namespace otb
OTB_APPLICATION_EXPORT(otb::Wrapper::EdgeExtraction)