Automated merge with http://hg.orfeo-toolbox.org/OTB

Examples/Filtering/DerivativeImageFilter.cxx

@@ -21,7 +21,7 @@
 
 //  Software Guide : BeginCommandLineArgs
 //    INPUTS:  {ROISpot5.png}
-//    OUTPUTS: {DerivativeImageFilterFloatOutput.mhd}
+//    OUTPUTS: {DerivativeImageFilterFloatOutput.hdr}
 //    OUTPUTS: {DerivativeImageFilterOutput.png}
 //    1 0
 //  Software Guide : EndCommandLineArgs

Examples/Filtering/LaplacianRecursiveGaussianImageFilter1.cxx

@@ -21,14 +21,14 @@
 
 //  Software Guide : BeginCommandLineArgs
 //    INPUTS: {ROISpot5.png}
-//    OUTPUTS: {LaplacianRecursiveGaussianImageFilteroutput3.mha}
+//    OUTPUTS: {LaplacianRecursiveGaussianImageFilteroutput3.hdr}
 //    3
 //    OUTPUTS: {LaplacianRecursiveGaussianImageFilterOutput3.png}
 //  Software Guide : EndCommandLineArgs
 
 //  Software Guide : BeginCommandLineArgs
 //    INPUTS: {ROISpot5.png}
-//    OUTPUTS: {LaplacianRecursiveGaussianImageFilteroutput5.mha}
+//    OUTPUTS: {LaplacianRecursiveGaussianImageFilteroutput5.hdr}
 //    5
 //    OUTPUTS: {LaplacianRecursiveGaussianImageFilterOutput5.png}
 //  Software Guide : EndCommandLineArgs

Examples/Filtering/LaplacianRecursiveGaussianImageFilter2.cxx

@@ -21,14 +21,14 @@
 
 //  Software Guide : BeginCommandLineArgs
 //    INPUTS: {ROISpot5.png}
-//    OUTPUTS: {LaplacianRecursiveGaussianImageFilter2output3.mha}
+//    OUTPUTS: {LaplacianRecursiveGaussianImageFilter2output3.hdr}
 //    3
 //    OUTPUTS: {LaplacianRecursiveGaussianImageFilter2Output3.png}
 //  Software Guide : EndCommandLineArgs
 
 //  Software Guide : BeginCommandLineArgs
 //    INPUTS: {ROISpot5.png}
-//    OUTPUTS: {LaplacianRecursiveGaussianImageFilter2output5.mha}
+//    OUTPUTS: {LaplacianRecursiveGaussianImageFilter2output5.hdr}
 //    5
 //    OUTPUTS: {LaplacianRecursiveGaussianImageFilter2Output5.png}
 //  Software Guide : EndCommandLineArgs

Examples/Filtering/SecondDerivativeRecursiveGaussianImageFilter.cxx

@@ -120,7 +120,7 @@ int main(int argc, char * argv[])
   ImageType::Pointer Izz = duplicator->GetOutput();
 
   writer->SetInput(Izz);
-  outputFileName = outputPrefix + "-Izz.mhd";
+  outputFileName = outputPrefix + "-Izz.hdr";
   writer->SetFileName(outputFileName.c_str());
   writer->Update();
 
@@ -133,7 +133,7 @@ int main(int argc, char * argv[])
   ImageType::Pointer Iyy = duplicator->GetOutput();
 
   writer->SetInput(Iyy);
-  outputFileName = outputPrefix + "-Iyy.mhd";
+  outputFileName = outputPrefix + "-Iyy.hdr";
   writer->SetFileName(outputFileName.c_str());
   writer->Update();
 
@@ -146,7 +146,7 @@ int main(int argc, char * argv[])
   ImageType::Pointer Ixx = duplicator->GetOutput();
 
   writer->SetInput(Ixx);
-  outputFileName = outputPrefix + "-Ixx.mhd";
+  outputFileName = outputPrefix + "-Ixx.hdr";
   writer->SetFileName(outputFileName.c_str());
   writer->Update();
 
@@ -164,7 +164,7 @@ int main(int argc, char * argv[])
   ImageType::Pointer Iyz = duplicator->GetOutput();
 
   writer->SetInput(Iyz);
-  outputFileName = outputPrefix + "-Iyz.mhd";
+  outputFileName = outputPrefix + "-Iyz.hdr";
   writer->SetFileName(outputFileName.c_str());
   writer->Update();
 
@@ -182,7 +182,7 @@ int main(int argc, char * argv[])
   ImageType::Pointer Ixz = duplicator->GetOutput();
 
   writer->SetInput(Ixz);
-  outputFileName = outputPrefix + "-Ixz.mhd";
+  outputFileName = outputPrefix + "-Ixz.hdr";
   writer->SetFileName(outputFileName.c_str());
   writer->Update();
 
@@ -200,7 +200,7 @@ int main(int argc, char * argv[])
   ImageType::Pointer Ixy = duplicator->GetOutput();
 
   writer->SetInput(Ixy);
-  outputFileName = outputPrefix + "-Ixy.mhd";
+  outputFileName = outputPrefix + "-Ixy.hdr";
   writer->SetFileName(outputFileName.c_str());
   writer->Update();
   // Software Guide : EndCodeSnippet

Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx

@@ -19,7 +19,7 @@
 //  Software Guide : BeginCommandLineArgs
 //    INPUTS: {qb_RoadExtract.tif}
 //    OUTPUTS: {OBIARadiometricAttribute1.tif}, {qb_ExtractRoad_Radiometry_pretty.jpg}
-//    STATS::Ndvi::Mean 0 0.5 16 16 50 1.0
+//    STATS::Band1::Mean 0 0.5 16 16 50 1.0
 //  Software Guide : EndCommandLineArgs
 
 //  Software Guide : BeginLatex
@@ -27,23 +27,14 @@
 //  This example shows the basic approach to perform object based analysis on a image.
 //  The input image is firstly segmented using the \doxygen{otb}{MeanShiftImageFilter}
 //  Then each segmented region is converted to a Map of labeled objects.
-//  Afterwards the \doxygen{otb}{RadiometricAttributesLabelMapFilter} computes
-//  radiometric attributes for each object.
-//
-//  This filter internally applies the
-//  \doxygen{otb}{StatisticsAttributesLabelMapFilter} to the following features:
-//  \begin{itemize}
-//  \item GEMI
-//  \item NDVI
-//  \item IR
-//  \item IC
-//  \item IB
-//  \item NDWI2
-//  \item Intensity
-//  \item and original B, G, R and NIR channels
-//  \end{itemize}
-//  Here we use the \doxygen{otb}{AttributesMapOpeningLabelMapFilter} to extract vegetated areas.
-//  Let's get to the source code explanation.
+//  Afterwards the \doxygen{otb}{otbMultiChannelRAndNIRIndexImageFilter} computes
+//  radiometric attributes for each object. In this example the NDVI is computed.
+//  The computed feature is passed to the \doxygen{otb}{BandsStatisticsAttributesLabelMapFilter}
+//  which computes statistics over the resulting band.
+//  Therefore, region's statistics over each band can be access by concatening
+//  STATS, the band number and the statistical attribute separated by colons. In this example
+//  the mean of the first band (which contains the NDVI) is access over all the regions
+//  with the attribute: 'STATS::Band1::Mean'.
 //
 //  Software Guide : EndLatex
 
@@ -59,9 +50,9 @@
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "otbStatisticsAttributesLabelMapFilter.h"
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
-#include "otbAttributesMapOpeningLabelMapFilter.h"
 #include "itkLabelMapToBinaryImageFilter.h"
 #include "otbMultiChannelExtractROI.h"
+#include "otbAttributesMapOpeningLabelMapFilter.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
 #include "otbMultiChannelRAndNIRIndexImageFilter.h"