diff --git a/Testing/Code/ChangeDetection/CMakeLists.txt b/Testing/Code/ChangeDetection/CMakeLists.txt index f7bd839c39556ba110af9deea76bfbcbbb122ed1..18d64ce51ba7f8f0918a4ba03ca009624b408fa7 100644 --- a/Testing/Code/ChangeDetection/CMakeLists.txt +++ b/Testing/Code/ChangeDetection/CMakeLists.txt @@ -117,7 +117,15 @@ ADD_TEST(cdTuKullbackLeiblerSupervizedDistanceImageFilterNew ${CHANGEDETECTION_T otbKullbackLeiblerSupervizedDistanceImageFilterNew) ADD_TEST(cdTvKullbackLeiblerSupervizedDistanceImageFilter ${CHANGEDETECTION_TESTS2} - otbKullbackLeiblerSupervizedDistanceImageFilter) + --compare-image ${TOL} + ${BASELINE}/cdTVKullbackLeiblerSupervizedDistanceImageFilterOutput.png + ${TEMP}/cdTVKullbackLeiblerSupervizedDistanceImageFilterOutput.png + otbKullbackLeiblerSupervizedDistanceImageFilter + ${INPUTDATA}/ERSBefore.png + ${INPUTDATA}/ERSAfter.png + ${INPUTDATA}/ERS_ROI.png + 35 + ${TEMP}/cdTVKullbackLeiblerSupervizedDistanceImageFilterOutput.png) # ------- Fichiers sources CXX ----------------------------------- diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx index c5c6cc6e02040fb90887d04c45b4878c1e1dd961..a6d56d8724366d552f959f5688021861514bdb23 100644 --- a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx +++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx @@ -19,6 +19,7 @@ #include "otbImage.h" #include "otbImageFileReader.h" #include "otbImageFileWriter.h" +#include "itkRescaleIntensityImageFilter.h" #include "otbKullbackLeiblerSupervizedDistanceImageFilter.h" #include "otbCommandProgressUpdate.h" @@ -26,9 +27,6 @@ int otbKullbackLeiblerSupervizedDistanceImageFilter(int argc, char * argv[]) { const unsigned int Dimension = 2; - std::cout << "En attente des explications de Gregoire, pour définir l'image de Training !!!"; - return EXIT_FAILURE; - typedef double InputPixelType; typedef unsigned char TrainingPixelType; @@ -85,10 +83,19 @@ int otbKullbackLeiblerSupervizedDistanceImageFilter(int argc, char * argv[]) CommandType::Pointer observer = CommandType::New(); changeDetector->AddObserver( itk::ProgressEvent(), observer ); - typedef otb::ImageFileWriter< ImageType > WriterType; + typedef unsigned char OutputPixelType; + typedef otb::Image< OutputPixelType, Dimension > OutputImageType; + typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType > + RescalerType; + RescalerType::Pointer rescaler = RescalerType::New(); + rescaler->SetOutputMinimum(0); + rescaler->SetOutputMaximum(255); + rescaler->SetInput( changeDetector->GetOutput() ); + + typedef otb::ImageFileWriter< OutputImageType > WriterType; WriterType::Pointer writer = WriterType::New(); writer->SetFileName( outputImageFileName ); - writer->SetInput( changeDetector->GetOutput() ); + writer->SetInput( rescaler->GetOutput() ); writer->Update();