diff --git a/Examples/BasicFilters/CMakeLists.txt b/Examples/BasicFilters/CMakeLists.txt
index a3f78a9f158dab374bb78710aa606783f51928c0..1cf1aee603b94cf062712ebe274d0a043a4b5238 100644
--- a/Examples/BasicFilters/CMakeLists.txt
+++ b/Examples/BasicFilters/CMakeLists.txt
@@ -19,8 +19,8 @@ TARGET_LINK_LIBRARIES(PrintableImageFilterExample OTBCommon OTBIO)
ADD_EXECUTABLE(IndexedToRGBExample IndexedToRGBExample.cxx )
TARGET_LINK_LIBRARIES(IndexedToRGBExample OTBCommon OTBIO)
-ADD_EXECUTABLE(MeanShiftVectorImageFilterExample MeanShiftVectorImageFilterExample.cxx )
-TARGET_LINK_LIBRARIES(MeanShiftVectorImageFilterExample OTBCommon OTBIO OTBBasicFilters)
+ADD_EXECUTABLE(MeanShiftSegmentationFilterExample MeanShiftSegmentationFilterExample.cxx )
+TARGET_LINK_LIBRARIES(MeanShiftSegmentationFilterExample OTBCommon OTBIO OTBBasicFilters OTBSegmentation)
ADD_EXECUTABLE(HillShadingExample HillShadingExample.cxx )
TARGET_LINK_LIBRARIES(HillShadingExample OTBCommon OTBIO OTBBasicFilters)
@@ -126,32 +126,27 @@ ADD_TEST(bfTeIndexedToRGBExampleTest ${EXE_TESTS}
${TEMP}/buildingExtractionIndexed_scaled.png
)
-ADD_TEST(bfTeMeanShiftVectorImageFilterExampleTest ${EXE_TESTS}
- --compare-n-images ${NOTOL} 6
- ${BASELINE}/MSFilteredOutput.tif
- ${TEMP}/MSFilteredOutput.tif
+ADD_TEST(bfTeMeanShiftSegmentationFilterExampleTest ${EXE_TESTS}
+ --compare-n-images ${NOTOL} 4
${BASELINE}/MSClusteredOutput.tif
${TEMP}/MSClusteredOutput.tif
- ${BASELINE}/MSLabelledOutput.tif
- ${TEMP}/MSLabelledOutput.tif
- ${BASELINE}/MSBoundariesOutput.tif
- ${TEMP}/MSBoundariesOutput.tif
- ${BASELINE}/MSFilteredOutput-pretty.png
- ${TEMP}/MSFilteredOutput-pretty.png
+ ${BASELINE}/MSLabeledOutput.tif
+ ${TEMP}/MSLabeledOutput.tif
+ ${BASELINE}/MSLabeledOutput-pretty.png
+ ${TEMP}/MSLabeledOutput-pretty.png
${BASELINE}/MSClusteredOutput-pretty.png
${TEMP}/MSClusteredOutput-pretty.png
- MeanShiftVectorImageFilterExampleTest
+ MeanShiftSegmentationFilterExampleTest
${INPUTDATA}/ROI_QB_MUL_1.png
- ${TEMP}/MSFilteredOutput.tif
+ ${TEMP}/MSLabeledOutput.tif
${TEMP}/MSClusteredOutput.tif
- ${TEMP}/MSLabelledOutput.tif
- ${TEMP}/MSBoundariesOutput.tif
- ${TEMP}/MSFilteredOutput-pretty.png
+ ${TEMP}/MSLabeledOutput-pretty.png
${TEMP}/MSClusteredOutput-pretty.png
16
16
- 10
- 1.0
+ 100
+ 100
+ 0.1
)
# ------- HillShadingExampleTest ----------
diff --git a/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx b/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
deleted file mode 100644
index bc2db95b761b26f25d87f67188708ebd9eb8d00a..0000000000000000000000000000000000000000
--- a/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
+++ /dev/null
@@ -1,231 +0,0 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-
-
-// Software Guide : BeginCommandLineArgs
-// INPUTS: {ROI_QB_MUL_1.png}
-// OUTPUTS: {MSFilteredOutput.tif}, {MSClusteredOutput.tif}, {MSLabeledOutput.tif}, {MSBoundariesOutput.tif}, {MSFilteredOutput-pretty.jpg}, {MSClusteredOutput-pretty.jpg}
-// 7 30 20 1.0
-// Software Guide : EndCommandLineArgs
-
-// Software Guide : BeginLatex
-//
-// This example demonstrates the use of the
-// \doxygen{otb}{MeanShiftVectorImageFilter} class which implements
-// filtering and clustering using the mean shift algorithm
-// \cite{Comaniciu2002}. For a given pixel, the mean shift will
-// build a set of neighboring pixels within a given spatial radius
-// and a color range. The spatial and color center of this set is
-// then computed and the algorithm iterates with this new spatial and
-// color center. The Mean Shift can be used for edge-preserving
-// smoothing, or for clustering.
-//
-// Software Guide : EndLatex
-
-#include "itkMacro.h"
-#include "otbVectorImage.h"
-#include "otbImageFileReader.h"
-#include "otbStreamingImageFileWriter.h"
-#include "otbImageFileWriter.h"
-#include "otbPrintableImageFilter.h"
-
-// Software Guide : BeginLatex
-//
-// Two implementations for the filter exist, one for scalar images
-// (\doxygen{otb}{MeanShiftImageFilter}). And another one (the one
-// presented in this example) for vector images
-// (\doxygen{otb}{MeanShiftVectorImageFilter}). They have the same
-// interface, so they can be used in the same way. We start by
-// including the needed header file.
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
-#include "otbMeanShiftVectorImageFilter.h"
-// Software Guide : EndCodeSnippet
-int main(int argc, char * argv[])
-{
- if (argc != 12)
- {
- std::cerr << "Usage: " << argv[0]
- << " infname filteredfname clusteredfname labeledclusteredfname "
- << "clusterboundariesfname filteredPretty clusteredPretty "
- << "spatialRadius rangeRadius minregionsize scale"
- << std::endl;
- return EXIT_FAILURE;
- }
-
- const char * infname = argv[1];
- const char * filteredfname = argv[2];
- const char * clusteredfname = argv[3];
- const char * labeledclusteredfname = argv[4];
- const char * clusterboundariesfname = argv[5];
- const char * filteredPretty = argv[6];
- const char * clusteredPretty = argv[7];
- const unsigned int spatialRadius = atoi(argv[8]);
- const double rangeRadius = atof(argv[9]);
- const unsigned int minRegionSize = atoi(argv[10]);
- const double scale = atoi(argv[11]);
-
- // Software Guide : BeginLatex
-//
-// We start by the classical \code{typedef}s needed for reading and
-// writing the images. The EDISON
-// \url{http://www.caip.rutgers.edu/riul/research/code/EDISON/index.html}
-// code upon which OTB's implementation is based, uses float pixel
-// precision, so we choose to work with a float pixel type.
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- const unsigned int Dimension = 2;
- typedef float PixelType;
- typedef otb::VectorImage<PixelType, Dimension> ImageType;
- typedef otb::ImageFileReader<ImageType> ReaderType;
- typedef otb::StreamingImageFileWriter<ImageType> WriterType;
-// Software Guide : EndCodeSnippet
-
- // Software Guide : BeginLatex
-//
-// We can now define the type for the filter, and also the type for
-// the labeled output image, which is needed for the corresponding writer:
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- typedef otb::MeanShiftVectorImageFilter<ImageType, ImageType> FilterType;
- typedef FilterType::LabeledOutputType
- LabeledImageType;
- typedef otb::StreamingImageFileWriter<LabeledImageType>
- LabeledWriterType;
- // Software Guide : EndCodeSnippet
-
- // Software Guide : BeginLatex
-//
-// We instantiate the filter, the reader, and 4 writers (2 for the
-// filetered and clustered images and 2 more for the labeled and
-// boundaries images):
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- FilterType::Pointer filter = FilterType::New();
- ReaderType::Pointer reader = ReaderType::New();
- WriterType::Pointer writer1 = WriterType::New();
- WriterType::Pointer writer2 = WriterType::New();
- LabeledWriterType::Pointer writer3 = LabeledWriterType::New();
- LabeledWriterType::Pointer writer4 = LabeledWriterType::New();
- // Software Guide : EndCodeSnippet
-
- // Software Guide : BeginLatex
-//
-// We set the file names for the reader and the writers:
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- reader->SetFileName(infname);
- writer1->SetFileName(filteredfname);
- writer2->SetFileName(clusteredfname);
- writer3->SetFileName(labeledclusteredfname);
- writer4->SetFileName(clusterboundariesfname);
- // Software Guide : EndCodeSnippet
-
- // Software Guide : BeginLatex
-//
-// We can now set the parameters for the filter. There are 3 main
-// parameters: the spatial radius used for defining the neighborhood,
-// the range radius used for defining the interval in the color space
-// and the minimum size for the regions to be kept after clustering.
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- filter->SetSpatialRadius(spatialRadius);
- filter->SetRangeRadius(rangeRadius);
- filter->SetMinimumRegionSize(minRegionSize);
- // Software Guide : EndCodeSnippet
- // Software Guide : BeginLatex
-//
-// OTB's implementation adds another parameter -- the scale -- which
-// allows to stretch the image before processing. This is useful when
-// pixel values are in the $[0-1]$ range.
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- filter->SetScale(scale);
- // Software Guide : EndCodeSnippet
- // Software Guide : BeginLatex
-//
-// We can now plug the pipeline and run it.
-//
-// Software Guide : EndLatex
-
-// Software Guide : BeginCodeSnippet
- filter->SetInput(reader->GetOutput());
- writer1->SetInput(filter->GetOutput());
- writer2->SetInput(filter->GetClusteredOutput());
- writer3->SetInput(filter->GetLabeledClusteredOutput());
- writer4->SetInput(filter->GetClusterBoundariesOutput());
-
- writer1->Update();
- writer2->Update();
- writer3->Update();
- writer4->Update();
- // Software Guide : EndCodeSnippet
-
- // Software Guide : BeginLatex
- // Figure~\ref{fig:MeanShiftVectorImageFilter} shows the result of applying the mean shift
- // to a Quickbird image.
- // \begin{figure}
- // \center
- // \includegraphics[width=0.40\textwidth]{ROI_QB_MUL_1.eps}
- // \includegraphics[width=0.40\textwidth]{MSFilteredOutput-pretty.eps}
- // \includegraphics[width=0.40\textwidth]{MSClusteredOutput-pretty.eps}
- // \itkcaption[Mean Shift]{From top to bottom and left to right:
- // Original image, image filtered by
- // mean shift and mean shift clustering.}
- // \label{fig:MeanShiftVectorImageFilter}
- // \end{figure}
- // Software Guide : EndLatex
-
- typedef otb::PrintableImageFilter<ImageType> PrintableFilterType;
- PrintableFilterType::Pointer printableImageFilter = PrintableFilterType::New();
-
- printableImageFilter->SetChannel(1);
- printableImageFilter->SetChannel(2);
- printableImageFilter->SetChannel(3);
-
- typedef PrintableFilterType::OutputImageType OutputImageType;
- typedef otb::ImageFileWriter<OutputImageType> PrettyWriterType;
-
- PrettyWriterType::Pointer prettyWriter = PrettyWriterType::New();
-
- printableImageFilter->SetInput(filter->GetOutput());
- prettyWriter->SetFileName(filteredPretty);
- prettyWriter->SetInput(printableImageFilter->GetOutput());
- prettyWriter->Update();
-
- printableImageFilter->SetInput(filter->GetClusteredOutput());
- prettyWriter->SetFileName(clusteredPretty);
- prettyWriter->SetInput(printableImageFilter->GetOutput());
- prettyWriter->Update();
-
- return EXIT_SUCCESS;
-}
diff --git a/Examples/BasicFilters/otbBasicFiltersExamplesTests.cxx b/Examples/BasicFilters/otbBasicFiltersExamplesTests.cxx
index 071d6fdbd32acd02354cefd0f4614f6a9e32f36e..5cc6175b9989afc4ef31e884a0b686b51b85369c 100644
--- a/Examples/BasicFilters/otbBasicFiltersExamplesTests.cxx
+++ b/Examples/BasicFilters/otbBasicFiltersExamplesTests.cxx
@@ -31,7 +31,7 @@ void RegisterTests()
REGISTER_TEST(PrintableImageFilterExample1Test);
REGISTER_TEST(PrintableImageFilterExample2Test);
REGISTER_TEST(IndexedToRGBExampleTest);
- REGISTER_TEST(MeanShiftVectorImageFilterExampleTest);
+ REGISTER_TEST(MeanShiftSegmentationFilterExampleTest);
REGISTER_TEST(HillShadingExampleTest);
}
@@ -64,8 +64,8 @@ void RegisterTests()
#include "IndexedToRGBExample.cxx"
#undef main
-#define main MeanShiftVectorImageFilterExampleTest
-#include "MeanShiftVectorImageFilterExample.cxx"
+#define main MeanShiftSegmentationFilterExampleTest
+#include "MeanShiftSegmentationFilterExample.cxx"
#undef main
#define main HillShadingExampleTest