diff --git a/Examples/DisparityMap/CMakeLists.txt b/Examples/DisparityMap/CMakeLists.txt
index d1103a2e04a314b6d912953fd8397a2d3d101cee..76fffb3c88c68d5abdcb206f91f32b661c662309 100644
--- a/Examples/DisparityMap/CMakeLists.txt
+++ b/Examples/DisparityMap/CMakeLists.txt
@@ -13,6 +13,9 @@ ADD_EXECUTABLE(SIFTDisparityMapEstimation SIFTDisparityMapEstimation.cxx )
TARGET_LINK_LIBRARIES(SIFTDisparityMapEstimation OTBFeatureExtraction OTBCommon OTBIO
ITKIO)
+ADD_EXECUTABLE(EstimateAffineTransformationExample EstimateAffineTransformationExample.cxx )
+TARGET_LINK_LIBRARIES(EstimateAffineTransformationExample OTBFeatureExtraction OTBCommon OTBIO OTBProjections
+ITKIO)
IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
@@ -42,6 +45,16 @@ ADD_TEST(dmTeSimpleDisparityMapEstimationExampleTest ${EXE_TESTS}
100 10 15 10 10 250 0.9
)
+ADD_TEST(dmTeEstimateAffineTransformationExampleTest ${EXE_TESTS}
+ --compare-image ${TOL}
+ ${BASELINE}/ROI_IKO_PAN_LesHalles.tif
+ ${TEMP}/otbEstimateAffineTransformationOutput.tif
+ EstimateAffineTransformationExampleTest
+ ${INPUTDATA}/ROI_IKO_PAN_LesHalles_pos_spacing.tif
+ ${INPUTDATA}/ROI_IKO_PAN_LesHalles_warped_pos_spacing.tif
+ ${TEMP}/otbEstimateAffineTransformationOutput.tif
+)
+
INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
ADD_EXECUTABLE(otbDisparityMapExamplesTests otbDisparityMapExamplesTests.cxx)
TARGET_LINK_LIBRARIES(otbDisparityMapExamplesTests ITKAlgorithms ITKStatistics OTBBasicFilters OTBCommon OTBDisparityMap OTBIO OTBSpatialReasoning OTBChangeDetection OTBFeatureExtraction OTBLearning OTBMultiScale OTBTesting)
diff --git a/Examples/DisparityMap/EstimateAffineTransformationExample.cxx b/Examples/DisparityMap/EstimateAffineTransformationExample.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..75de20d739f86de7b6cadd24371b67e5522ba653
--- /dev/null
+++ b/Examples/DisparityMap/EstimateAffineTransformationExample.cxx
@@ -0,0 +1,430 @@
+/*=========================================================================
+
+ 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.
+
+=========================================================================*/
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+#ifdef __BORLANDC__
+#define ITK_LEAN_AND_MEAN
+#endif
+
+// Software Guide : BeginCommandLineArgs
+// INPUTS: {ROISpot5.png}, {ROISpot5Moving.png}
+// OUTPUTS: {SIFTResampling.png}
+// Software Guide : EndCommandLineArgs
+
+// Software Guide : BeginLatex
+//
+// This example demonstrates the use of the
+// \doxygen{otb}{KeyPointSetsMatchingFilter} for disparity map
+// estimation. The idea here is to match SIFTs extracted from both the
+// fixed and the moving images. The use of SIFTs is demonstrated in
+// section \ref{sec:SIFTDetector}. The
+// \doxygen{itk}{DeformationFieldSource} will be used
+// to generate a deformation field by using
+// interpolation on the deformation values from the point set. More
+// advanced methods for deformation field interpolation are also
+// available.
+//
+// The first step toward the use of these filters is to include the
+// appropriate header files.
+//
+// Software Guide : EndLatex
+
+
+// Software Guide : BeginCodeSnippet
+
+#include "otbKeyPointSetsMatchingFilter.h"
+//#include "otbSiftFastImageFilter.h"
+#include "otbImageToSIFTKeyPointSetFilter.h"
+
+// Disabling deprecation warning if on visual
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
+#include "itkDeformationFieldSource.h"
+// Enabling remaining deprecation warning
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include "itkWarpImageFilter.h"
+
+// Software Guide : EndCodeSnippet
+
+#include "otbImage.h"
+#include "otbMacro.h"
+#include "otbVectorImage.h"
+#include "otbImageFileReader.h"
+#include "otbImageFileWriter.h"
+#include "itkRescaleIntensityImageFilter.h"
+#include "itkPointSet.h"
+#include "otbMultiToMonoChannelExtractROI.h"
+#include "otbLeastSquareAffineTransformEstimator.h"
+#include "itkResampleImageFilter.h"
+
+int main (int argc, char* argv[])
+{
+ if (argc!= 9)
+ {
+ std::cerr <<"Usage: "<<argv[0];
+ std::cerr<<"fixedFileName movingFileName resamplingImageFileName octaves scales threshold ratio secondOrderThreshold" << std::endl;
+ return EXIT_FAILURE;
+ }
+
+ const char * fixedfname = argv[1];
+ const char * movingfname = argv[2];
+ const char * outputImageFilename = argv[3];
+
+ const unsigned int octaves = atoi(argv[4]);
+ const unsigned int scales = atoi(argv[5]);
+ float threshold = atof(argv[6]);
+ float ratio = atof(argv[7]);
+ const double secondOrderThreshold = atof(argv[8]);
+
+ const unsigned int Dimension = 2;
+
+ // Software Guide : BeginLatex
+ //
+ // Then we must decide what pixel type to use for the image. We choose to do
+ // all the computations in floating point precision and rescale the results
+ // between 0 and 255 in order to export PNG images.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ typedef double RealType;
+ typedef unsigned char OutputPixelType;
+
+ typedef otb::Image<RealType,Dimension> ImageType;
+ typedef otb::Image<OutputPixelType,Dimension> OutputImageType;
+
+ // Software Guide : EndCodeSnippet
+ // Software Guide : BeginLatex
+ //
+ // The SIFTs obtained for the matching will be stored in vector
+ // form inside a point set. So we need the following types:
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ typedef itk::VariableLengthVector<RealType> RealVectorType;
+ typedef itk::PointSet<RealVectorType,Dimension> PointSetType;
+
+ // Software Guide : EndCodeSnippet
+// Software Guide : BeginLatex
+ //
+ // The filter for computing the SIFTs has a type defined as follows:
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ //typedef otb::SiftFastImageFilter<ImageType,PointSetType>
+ //ImageToSIFTKeyPointSetFilterType;
+ typedef otb::ImageToSIFTKeyPointSetFilter<ImageType,PointSetType>
+ ImageToSIFTKeyPointSetFilterType;
+
+ // Software Guide : EndCodeSnippet
+// Software Guide : BeginLatex
+ //
+ // Although many choices for evaluating the distances during the
+ // matching procedure exist, we choose here to use a simple
+ // Euclidean distance. We can then define the type for the matching filter.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ typedef itk::Statistics::EuclideanDistance<RealVectorType> DistanceType;
+ typedef otb::KeyPointSetsMatchingFilter<PointSetType, DistanceType>
+ EuclideanDistanceMatchingFilterType;
+ // Software Guide : EndCodeSnippet
+ // Software Guide : BeginLatex
+ //
+ // The following types are needed for dealing with the matched points.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ typedef PointSetType::PointType PointType;
+ typedef std::pair<PointType,PointType> MatchType;
+ typedef std::vector<MatchType> MatchVectorType;
+ typedef EuclideanDistanceMatchingFilterType::LandmarkListType
+ LandmarkListType;
+
+ typedef PointSetType::PointsContainer PointsContainerType;
+ typedef PointsContainerType::Iterator PointsIteratorType;
+ typedef PointSetType::PointDataContainer PointDataContainerType;
+ typedef PointDataContainerType::Iterator PointDataIteratorType;
+
+ // Software Guide : EndCodeSnippet
+
+
+ // Software Guide : BeginLatex
+ //
+ // We define the type for the image reader.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ typedef otb::ImageFileReader<ImageType> ReaderType;
+
+ // Software Guide : EndCodeSnippet
+
+ // Software Guide : BeginLatex
+ //
+ // Two readers are instantiated : one for the fixed image, and one
+ // for the moving image.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ ReaderType::Pointer fixedReader = ReaderType::New();
+ ReaderType::Pointer movingReader = ReaderType::New();
+
+ fixedReader->SetFileName(fixedfname);
+ movingReader->SetFileName(movingfname);
+ fixedReader->UpdateOutputInformation();
+ movingReader->UpdateOutputInformation();
+
+ // Software Guide : EndCodeSnippet
+ // Software Guide : BeginLatex
+ //
+ // We will now instantiate the 2 SIFT filters and the filter used
+ // for the matching of the points.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ ImageToSIFTKeyPointSetFilterType::Pointer filter1 =
+ ImageToSIFTKeyPointSetFilterType::New();
+ ImageToSIFTKeyPointSetFilterType::Pointer filter2 =
+ ImageToSIFTKeyPointSetFilterType::New();
+ EuclideanDistanceMatchingFilterType::Pointer euclideanMatcher =
+ EuclideanDistanceMatchingFilterType::New();
+
+ // Software Guide : EndCodeSnippet
+ // Software Guide : BeginLatex
+ //
+ // We plug the pipeline and set the parameters.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+
+ bool useBackMatching = 0;
+
+ filter1->SetInput(0, fixedReader->GetOutput() );
+ //filter1->SetScalesNumber(3);
+ filter2->SetInput(0, movingReader->GetOutput() );
+ //filter2->SetScalesNumber(3);
+
+ // Software Guide : BeginCodeSnippet
+ filter1->SetOctavesNumber(octaves);
+ filter1->SetScalesNumber(scales);
+
+ filter1->SetDoGThreshold(threshold);
+ filter1->SetEdgeThreshold(ratio);
+
+ filter2->SetOctavesNumber(octaves);
+ filter2->SetScalesNumber(scales);
+
+ filter2->SetDoGThreshold(threshold);
+ filter2->SetEdgeThreshold(ratio);
+// Software Guide : EndCodeSnippet
+
+ filter1->Update();
+ filter2->Update();
+
+ //filter1->SetNumberOfThreads(1);
+ //filter2->SetNumberOfThreads(1);
+
+ //Take the minimum point set to compute euclidian diff
+ PointSetType::Pointer ptSet1 = filter1->GetOutput();
+ PointSetType::Pointer ptSet2 = filter2->GetOutput();
+
+ typedef PointSetType::PointsContainer PointsContainer;
+ typedef PointsContainer::Iterator PointsIterator;
+
+ PointSetType::Pointer ptSet1bis = PointSetType::New();
+ PointSetType::Pointer ptSet2bis = PointSetType::New();
+ //PointsContainer::Pointer pt1Container;
+ //PointsContainer::Pointer pt2Container;
+ //bool 1isMin = ptSet1->GetNumberOfPoints() <= ptSet2->GetNumberOfPoints();
+ //LandmarkListType::Iterator it
+ unsigned int sizeMin=ptSet2->GetNumberOfPoints();
+ if ( ptSet1->GetNumberOfPoints() < ptSet2->GetNumberOfPoints() )
+ {
+ sizeMin = ptSet1->GetNumberOfPoints();
+ }
+
+
+ //PointsIterator pointIterator = points->Begin();
+ //PointsIterator end = points->End();
+ unsigned int dataId = 0;
+ //while ( pointIterator != end )
+ //typedef PointSetType::PointContainer PointDataContainer;
+ PointsContainer::Pointer points1 = ptSet1->GetPoints();
+ PointsContainer::Pointer points2 = ptSet2->GetPoints();
+ typedef PointsContainer::Iterator PointsIterator;
+ PointsIterator pointsIterator1 = points1->Begin();
+ PointsIterator pointsIterator2 = points2->Begin();
+ for (unsigned int dataId=0;dataId < sizeMin;++dataId)
+ {
+ ptSet1bis->SetPoint( dataId , pointsIterator1->Value() );
+ ptSet2bis->SetPoint( dataId , pointsIterator2->Value() );
+ std::cout << pointsIterator1->Value() << std::endl;
+
+ ++pointsIterator1;
+ ++pointsIterator2;
+ }
+std::cout << "add over"<< std::endl;
+ euclideanMatcher->SetInput1(ptSet1);
+std::cout << "add over"<< std::endl;
+ euclideanMatcher->SetInput2(ptSet2);
+std::cout << "add over"<< std::endl;
+ euclideanMatcher->SetDistanceThreshold(secondOrderThreshold);
+ euclideanMatcher->SetUseBackMatching(useBackMatching);
+ euclideanMatcher->Update();
+std::cout << "add over"<< std::endl;
+ // Software Guide : EndCodeSnippet
+ // Software Guide : BeginLatex
+ //
+ // The matched points will be stored into a landmark list.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+
+ LandmarkListType::Pointer landmarkList;
+ landmarkList = euclideanMatcher->GetOutput();
+
+ // Software Guide : EndCodeSnippet
+
+ // Software Guide : BeginLatex
+ //
+ // Apply Mean square algorithm
+ //
+ // Software Guide : EndLatex
+// Software Guide : BeginCodeSnippet
+ typedef itk::Point<double,2> MyPointType;
+ typedef otb::LeastSquareAffineTransformEstimator<MyPointType> EstimatorType;
+
+ // instantiation
+ EstimatorType::Pointer estimator = EstimatorType::New();
+ std::cout << "landmark list size " << landmarkList->Size() << std::endl;
+ for (LandmarkListType::Iterator it = landmarkList->Begin();
+ it != landmarkList->End(); ++it)
+ {
+ //otbMsgDevMacro(<<"landmark1" << it.Get()->GetPoint1() );
+ //otbMsgDevMacro(<<"landmark2" << it.Get()->GetPoint2() );
+ std::cout << "landmark1" << it.Get()->GetPoint1() << std::endl;
+ std::cout << "landmark2" << it.Get()->GetPoint2() << std::endl;
+ estimator->AddTiePoints(it.Get()->GetPoint1(),it.Get()->GetPoint2());
+ }
+
+ // Trigger computation
+ estimator->Compute();
+ // meanSquarestimator->SetInput(euclideanMatcher->GetOutput());
+// Software Guide : EndCodeSnippet
+
+ // Software Guide : BeginLatex
+ //
+ // Resample the initial image with the transformation evaluated
+ //
+ // Software Guide : EndLatex
+// Software Guide : BeginLatex
+ //
+ // It is common, as the last step of a registration task, to use
+ // the resulting transform to map the moving image into the fixed
+ // image space. This is easily done with the
+ // \doxygen{itk}{ResampleImageFilter}. First, a ResampleImageFilter
+ // type is instantiated using the image types. It is convenient to
+ // use the fixed image type as the output type since it is likely
+ // that the transformed moving image will be compared with the
+ // fixed image.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+ typedef itk::ResampleImageFilter<
+ ImageType,
+ OutputImageType > ResampleFilterType;
+ // Software Guide : EndCodeSnippet
+
+ // Software Guide : BeginLatex
+ //
+ // A resampling filter is created and the moving image is connected as
+ // its input.
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+ ResampleFilterType::Pointer resampler = ResampleFilterType::New();
+ resampler->SetInput( movingReader->GetOutput() );
+
+ //typedef itk::ImageRegistrationMethod<
+ //ImageType,
+ //ImageType > RegistrationType;
+
+ //RegistrationType::Pointer registration = RegistrationType::New();
+
+ // Software Guide : EndCodeSnippet
+
+ // Software Guide : BeginLatex
+ //
+ // The Transform that is produced as output need to be inversed to
+ // We apply here the resampling algorithm to the "fixed" image
+ // to produce the moving image. Or apply to the moving image
+ //
+ //
+ // Software Guide : EndLatex
+
+ // Software Guide : BeginCodeSnippet
+ // Get the output transform
+ typedef EstimatorType::AffineTransformType AffineTransformType;
+ AffineTransformType::Pointer transform = AffineTransformType::New();
+ transform->GetInverse( estimator->GetAffineTransform() );
+
+ resampler->SetTransform( transform );
+ resampler->SetSize( fixedReader->GetOutput()->GetLargestPossibleRegion().GetSize() );
+ resampler->SetOutputOrigin( fixedReader->GetOutput()->GetOrigin() );
+ resampler->SetOutputSpacing( fixedReader->GetOutput()->GetSpacing() );
+ resampler->SetDefaultPixelValue( 100 );
+
+ // Software Guide : EndCodeSnippet
+
+ typedef otb::ImageFileWriter< OutputImageType > WriterType;
+ WriterType::Pointer writer = WriterType::New();
+
+ writer->SetInput( resampler->GetOutput() );
+ writer->SetFileName( outputImageFilename );
+ writer->Update();
+
+ return EXIT_SUCCESS;
+}
+
diff --git a/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx b/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx
index 8fc0a95ebea7e0e20880769ab202c7f956e264c2..a947200a5d4b98b901bde29b74c3ac86359cdca9 100644
--- a/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx
+++ b/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx
@@ -226,6 +226,9 @@ int main (int argc, char* argv[])
filter2->SetInput(0, movingReader->GetOutput() );
filter2->SetScalesNumber(3);
+ filter1->SetNumberOfThreads(1);
+ filter2->SetNumberOfThreads(1);
+
euclideanMatcher->SetInput1(filter1->GetOutput());
euclideanMatcher->SetInput2(filter2->GetOutput());
euclideanMatcher->SetDistanceThreshold(secondOrderThreshold);
diff --git a/Examples/DisparityMap/otbDisparityMapExamplesTests.cxx b/Examples/DisparityMap/otbDisparityMapExamplesTests.cxx
index c54e5d1be90acddea9915ce92ff05805eaf925ab..152e41cf3fbf92518a1b0fd32aff69606e103147 100644
--- a/Examples/DisparityMap/otbDisparityMapExamplesTests.cxx
+++ b/Examples/DisparityMap/otbDisparityMapExamplesTests.cxx
@@ -26,10 +26,13 @@
void RegisterTests()
{
REGISTER_TEST(SimpleDisparityMapEstimationExampleTest);
+ REGISTER_TEST(EstimateAffineTransformationExampleTest);
}
#undef main
#define main SimpleDisparityMapEstimationExampleTest
#include "SimpleDisparityMapEstimationExample.cxx"
-
+#undef main
+#define main EstimateAffineTransformationExampleTest
+#include "EstimateAffineTransformationExample.cxx"