ENH: Automatic move of files to module Core/ObjectList

Modules/Applications/AppStereo/otb-module.cmake

@@ -9,7 +9,6 @@ otb_module(OTBAppStereo
     OTBITK
     OTBImageBase
     OTBImageIO
-    OTBImageManipulation
     OTBInterpolation
     OTBMathParser
     OTBObjectList

Modules/Core/ObjectList/test/CMakeLists.txt

@@ -14,6 +14,9 @@ set(OTBObjectListTests
   otbImageListToVectorImageFilterNew.cxx
   otbObjectList2.cxx
   otbObjectListToObjectListFilterNew.cxx
+  otbImageToImageListFilterNew.cxx
+  otbVectorImageToImageListFilter.cxx
+  otbVectorImageToImageListFilterNew.cxx
   otbObjectListTestDriver.cxx  )
 
 add_executable(otbObjectListTestDriver ${OTBObjectListTests})
@@ -83,3 +86,47 @@ otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbVectorDataBaseTestDriver
   )
 otb_add_test(NAME coTuObjectListToObjectListFilterNew COMMAND otbVectorDataBaseTestDriver
   otbObjectListToObjectListFilterNew)
+otb_add_test(NAME coTuImageToImageListFilterNew COMMAND otbImageManipulationTestDriver
+  otbImageToImageListFilterNew)
+otb_add_test(NAME bfTvVectorImageToImageListFilter COMMAND otbImageManipulationTestDriver
+  --compare-n-images ${EPSILON_7} 3
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
+  ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
+  ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
+  ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
+  otbVectorImageToImageListFilter
+  ${INPUTDATA}/poupees.png
+  ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
+  ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
+  ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
+  )
+otb_add_test(NAME bfTvVectorImageToImageListFilterIt COMMAND otbImageManipulationTestDriver
+  --compare-n-images ${EPSILON_7} 3
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
+  ${TEMP}/bfTvVectorImageToImageListFilterItBand1.png
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
+  ${TEMP}/bfTvVectorImageToImageListFilterItBand2.png
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
+  ${TEMP}/bfTvVectorImageToImageListFilterItBand3.png
+  otbVectorImageToImageListFilterIterator
+  ${INPUTDATA}/poupees.png
+  ${TEMP}/bfTvVectorImageToImageListFilterIt
+  png
+  )
+otb_add_test(NAME bfTvVectorImageToImageListFilterIt2 COMMAND otbImageManipulationTestDriver
+  --compare-n-images ${EPSILON_7} 3
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
+  ${TEMP}/bfTvVectorImageToImageListFilterIt2Band1.tif
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
+  ${TEMP}/bfTvVectorImageToImageListFilterIt2Band2.tif
+  ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
+  ${TEMP}/bfTvVectorImageToImageListFilterIt2Band3.tif
+  otbVectorImageToImageListFilterIterator
+  ${INPUTDATA}/poupees.png
+  ${TEMP}/bfTvVectorImageToImageListFilterIt2
+  tif
+  )
+otb_add_test(NAME bfTuVectorImageToImageListFilterNew COMMAND otbImageManipulationTestDriver
+  otbVectorImageToImageListFilterNew)

Modules/Core/ObjectList/test/otbObjectListTestDriver.cxx

@@ -15,4 +15,7 @@ void RegisterTests()
   REGISTER_TEST(otbImageListToVectorImageFilterNew);
   REGISTER_TEST(otbObjectList2);
   REGISTER_TEST(otbObjectListToObjectListFilterNew);
+  REGISTER_TEST(otbImageToImageListFilterNew);
+  REGISTER_TEST(otbVectorImageToImageListFilter);
+  REGISTER_TEST(otbVectorImageToImageListFilterNew);
 }

Modules/Detection/ObjectDetection/otb-module.cmake

@@ -2,23 +2,22 @@ set(DOCUMENTATION "This module contains useful classes for object detection.")
 
 otb_module(OTBObjectDetection
   DEPENDS
-    OTBVectorDataBase
-    OTBTextures
-    OTBStatistics
-    OTBITK
-    OTBMoments
+    OTBCommon
     OTBDescriptors
-    OTBStreaming
-    OTBImageManipulation
+    OTBITK
     OTBImageBase
+    OTBMoments
     OTBObjectList
-    OTBCommon
+    OTBStatistics
+    OTBStreaming
+    OTBTextures
+    OTBVectorDataBase
 
   TEST_DEPENDS
-    OTBTestKernel
     OTBIOXML
     OTBImageIO
     OTBSVMLearning
+    OTBTestKernel
     OTBVectorDataIO
 
   DESCRIPTION

Modules/Filtering/DEM/otb-module.cmake

@@ -10,6 +10,7 @@ otb_module(OTBDEM
 
   TEST_DEPENDS
     OTBImageIO
+    OTBTestKernel
 
   DESCRIPTION
     "${DOCUMENTATION}"

Modules/Filtering/ImageManipulation/test/CMakeLists.txt

@@ -2,7 +2,6 @@ otb_module_test()
 
 set(OTBImageManipulationTests
 otbImageManipulationTestDriver.cxx
-otbVectorImageToImageListFilter.cxx
 otbBinaryImageDensityFunctionNew.cxx
 otbPrintableImageFilter.cxx
 otbConcatenateScalarValueImageFilterTest.cxx
@@ -42,12 +41,10 @@ otbStreamingInnerProductVectorImageFilter.cxx
 otbPhaseFunctorTest.cxx
 otbShiftScaleVectorImageFilterNew.cxx
 otbChangeLabelImageFilter.cxx
-otbVectorImageToImageListFilterNew.cxx
 otbClampVectorImageFilter.cxx
 otbPrintableImageFilterNew.cxx
 otbShiftScaleImageAdaptorNew.cxx
 otbStreamingInnerProductVectorImageFilterNew.cxx
-otbImageToImageListFilterNew.cxx
 otbBoxAndWhiskerImageFilter.cxx
 otbStreamingShrinkImageFilterNew.cxx
 otbVectorRescaleIntensityImageFilter.cxx
@@ -88,48 +85,8 @@ otb_module_target_label(otbImageManipulationTestDriver)
 
 # Tests Declaration
 
-otb_add_test(NAME bfTvVectorImageToImageListFilter COMMAND otbImageManipulationTestDriver
-  --compare-n-images ${EPSILON_7} 3
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
-  ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
-  ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
-  ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
-  otbVectorImageToImageListFilter
-  ${INPUTDATA}/poupees.png
-  ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
-  ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
-  ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
-  )
-
-otb_add_test(NAME bfTvVectorImageToImageListFilterIt COMMAND otbImageManipulationTestDriver
-  --compare-n-images ${EPSILON_7} 3
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
-  ${TEMP}/bfTvVectorImageToImageListFilterItBand1.png
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
-  ${TEMP}/bfTvVectorImageToImageListFilterItBand2.png
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
-  ${TEMP}/bfTvVectorImageToImageListFilterItBand3.png
-  otbVectorImageToImageListFilterIterator
-  ${INPUTDATA}/poupees.png
-  ${TEMP}/bfTvVectorImageToImageListFilterIt
-  png
-  )
-
-otb_add_test(NAME bfTvVectorImageToImageListFilterIt2 COMMAND otbImageManipulationTestDriver
-  --compare-n-images ${EPSILON_7} 3
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
-  ${TEMP}/bfTvVectorImageToImageListFilterIt2Band1.tif
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
-  ${TEMP}/bfTvVectorImageToImageListFilterIt2Band2.tif
-  ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
-  ${TEMP}/bfTvVectorImageToImageListFilterIt2Band3.tif
-  otbVectorImageToImageListFilterIterator
-  ${INPUTDATA}/poupees.png
-  ${TEMP}/bfTvVectorImageToImageListFilterIt2
-  tif
-  )
+
+
 
 otb_add_test(NAME bfTuBinaryImageDensityFunctionNew COMMAND  otbImageManipulationTestDriver
   otbBinaryImageDensityFunctionNew
@@ -500,8 +457,6 @@ otb_add_test(NAME bfTvChangeLabelImageFilter COMMAND otbImageManipulationTestDri
   255   # upper  threshold
   )
 
-otb_add_test(NAME bfTuVectorImageToImageListFilterNew COMMAND otbImageManipulationTestDriver
-  otbVectorImageToImageListFilterNew)
 
 otb_add_test(NAME bfTvClampVectorImageFilterTest COMMAND otbImageManipulationTestDriver
   --compare-image 0.0001
@@ -534,8 +489,6 @@ otb_add_test(NAME bfTuStreamingInnerProductVectorImageFilterNew COMMAND otbImage
 
 
 
-otb_add_test(NAME coTuImageToImageListFilterNew COMMAND otbImageManipulationTestDriver
-  otbImageToImageListFilterNew)
 
 
 

Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx

 #include "otbTestMain.h"
 void RegisterTests()
 {
-  REGISTER_TEST(otbVectorImageToImageListFilter);
   REGISTER_TEST(otbVectorImageToImageListFilterIterator);
   REGISTER_TEST(otbBinaryImageDensityFunctionNew);
   REGISTER_TEST(otbPrintableImageFilter);
@@ -46,7 +45,6 @@ void RegisterTests()
   REGISTER_TEST(otbPhaseFunctorTest);
   REGISTER_TEST(otbShiftScaleVectorImageFilterNew);
   REGISTER_TEST(otbChangeLabelImageFilter);
-  REGISTER_TEST(otbVectorImageToImageListFilterNew);
   REGISTER_TEST(otbClampVectorImageFilterNew);
   REGISTER_TEST(otbClampVectorImageFilterTest);
   REGISTER_TEST(otbPrintableImageFilterNew);
@@ -58,7 +56,6 @@ void RegisterTests()
   REGISTER_TEST(otbBCOInterpolateImageFunctionOverVectorImage);
   REGISTER_TEST(otbBCOInterpolateImageFunctionTest);
   REGISTER_TEST(otbBCOInterpolateImageFunctionVectorImageTest);
-  REGISTER_TEST(otbImageToImageListFilterNew);
   REGISTER_TEST(otbBoxAndWhiskerImageFilter);
   REGISTER_TEST(otbStreamingShrinkImageFilterNew);
   REGISTER_TEST(otbVectorRescaleIntensityImageFilter);

Modules/Filtering/MorphologicalPyramid/otb-module.cmake

@@ -7,16 +7,15 @@ that goal.")
 
 otb_module(OTBMorphologicalPyramid
   DEPENDS
+    OTBCommon
     OTBITK
     OTBImageBase
-    OTBPointSet
-    OTBImageManipulation
-    OTBCommon
     OTBObjectList
+    OTBPointSet
 
   TEST_DEPENDS
-    OTBMorphologicalProfiles
     OTBImageIO
+    OTBMorphologicalProfiles
     OTBTestKernel
 
   DESCRIPTION

Modules/Filtering/Wavelet/otb-module.cmake

@@ -2,15 +2,14 @@ set(DOCUMENTATION "This module contains classes for wavelet analysis.")
 
 otb_module(OTBWavelet
   DEPENDS
-    OTBImageManipulation
-    OTBObjectList
-    OTBITK
     OTBCommon
+    OTBITK
+    OTBObjectList
 
   TEST_DEPENDS
-    OTBTestKernel
-    OTBImageIO
     OTBImageBase
+    OTBImageIO
+    OTBTestKernel
 
   DESCRIPTION
     "${DOCUMENTATION}"

Modules/Filtering/Wavelet/src/CMakeLists.txt

@@ -3,10 +3,10 @@ set(OTBWavelet_SRC
   )
 
 add_library(OTBWavelet ${OTBWavelet_SRC})
-target_link_libraries(OTBWavelet 
+target_link_libraries(OTBWavelet
   ${OTBCommon_LIBRARIES}
-  ${OTBImageManipulation_LIBRARIES}
-
+  ${OTBITK_LIBRARIES}
+  ${OTBObjectList_LIBRARIES}
   )
 
 otb_module_target(OTBWavelet)

Modules/Registration/DisparityMap/otb-module.cmake

@@ -7,19 +7,18 @@ precision.")
 
 otb_module(OTBDisparityMap
   DEPENDS
-    OTBStereo
+    OTBCommon
     OTBITK
     OTBITKPendingPatches
     OTBImageBase
-    OTBTransform
     OTBPointSet
-    OTBCommon
+    OTBStereo
+    OTBTransform
 
   TEST_DEPENDS
-    OTBTestKernel
     OTBImageIO
-    OTBImageManipulation
     OTBObjectList
+    OTBTestKernel
 
   DESCRIPTION
     "${DOCUMENTATION}"

Modules/Registration/Stereo/otb-module.cmake

@@ -4,20 +4,19 @@ elevation map construction are available.")
 
 otb_module(OTBStereo
   DEPENDS
-    OTBStatistics
+    OTBCommon
     OTBITK
     OTBITKPendingPatches
     OTBImageBase
-    OTBTransform
-    OTBCommon
     OTBInterpolation
     OTBOSSIMAdapters
     OTBObjectList
+    OTBStatistics
+    OTBTransform
 
   TEST_DEPENDS
-    OTBTestKernel
     OTBImageIO
-    OTBImageManipulation
+    OTBTestKernel
 
   DESCRIPTION
     "${DOCUMENTATION}"

Modules/Segmentation/MorphologicalProfiles/otb-module.cmake

@@ -3,15 +3,14 @@ image classification based on geodesic morphology characteristics.")
 
 otb_module(OTBMorphologicalProfiles
   DEPENDS
+    OTBCommon
+    OTBITK
     OTBImageBase
-    OTBImageManipulation
     OTBObjectList
-    OTBITK
-    OTBCommon
 
   TEST_DEPENDS
-    OTBTestKernel
     OTBImageIO
+    OTBTestKernel
 
   DESCRIPTION
     "${DOCUMENTATION}"