ENH: Automatic move of files to module Registration/Stereo

Modules/Applications/AppStereo/otb-module.cmake

@@ -5,7 +5,6 @@ otb_module(OTBAppStereo
     OTBApplicationEngine
     OTBDEM
     OTBDisparityMap
-    OTBDisplacementField
     OTBITK
     OTBImageBase
     OTBImageIO

Modules/Registration/DisplacementField/otb-module.cmake

@@ -7,16 +7,14 @@ in generating a deformation field between two images in epipolar geometry
 
 otb_module(OTBDisplacementField
   DEPENDS
+    OTBCommon
     OTBITK
     OTBImageBase
-    OTBTransform
-    OTBCommon
-    OTBOSSIMAdapters
     OTBObjectList
 
   TEST_DEPENDS
-    OTBTestKernel
     OTBImageIO
+    OTBTestKernel
 
   DESCRIPTION
     "${DOCUMENTATION}"

Modules/Registration/DisplacementField/test/CMakeLists.txt

@@ -11,7 +11,6 @@ otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
 otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
 otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
 otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
-otbStereorectificationDisplacementFieldSource.cxx
 otbNearestTransformDisplacementFieldGenerator.cxx
 otbNearestPointDisplacementFieldGenerator.cxx
 otbBSplinesInterpolateTransformDisplacementFieldGenerator.cxx
@@ -62,24 +61,7 @@ otb_add_test(NAME dmTuBSplinesInterpolateDisplacementFieldGeneratorNew COMMAND o
 otb_add_test(NAME dmTuNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew COMMAND otbDisplacementFieldTestDriver
   otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew)
 
-otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbDisplacementFieldTestDriver
-  --compare-n-images ${EPSILON_10} 2
-  ${BASELINE}/feTvStereorectificationDeformationFieldSourceOutput1.tif
-  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput1.tif
-  ${BASELINE}/feTvStereorectificationDeformationFieldSourceOutput2.tif
-  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput2.tif
-  otbStereorectificationDisplacementFieldSource
-  ${EXAMPLEDATA}/sensor_stereo_left.tif
-  ${EXAMPLEDATA}/sensor_stereo_right.tif
-  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput1.tif
-  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput2.tif
-  300
-  0.5
-  5
-  )
 
-otb_add_test(NAME dmTuStereorectificationDisplacementFieldSourceNew COMMAND otbDisplacementFieldTestDriver
-  otbStereorectificationDisplacementFieldSourceNew)
 
 otb_add_test(NAME dmTvNearestTransformDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver
   --compare-image ${EPSILON_10}

Modules/Registration/DisplacementField/test/otbDisplacementFieldTestDriver.cxx

@@ -11,7 +11,6 @@ void RegisterTests()
   REGISTER_TEST(otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew);
   REGISTER_TEST(otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew);
   REGISTER_TEST(otbStereorectificationDisplacementFieldSourceNew);
-  REGISTER_TEST(otbStereorectificationDisplacementFieldSource);
   REGISTER_TEST(otbNearestTransformDisplacementFieldGenerator);
   REGISTER_TEST(otbNearestPointDisplacementFieldGenerator);
   REGISTER_TEST(otbBSplinesInterpolateTransformDisplacementFieldGenerator);

Modules/Registration/Stereo/otb-module.cmake

@@ -4,6 +4,7 @@ elevation map construction are available.")
 
 otb_module(OTBStereo
   DEPENDS
+    OTBCommon
     OTBITK
     OTBITKPendingPatches
     OTBImageBase
@@ -14,7 +15,6 @@ otb_module(OTBStereo
     OTBTransform
 
   TEST_DEPENDS
-    OTBCommon
     OTBImageIO
     OTBTestKernel
 

Modules/Registration/Stereo/test/CMakeLists.txt

@@ -6,6 +6,7 @@ otbBijectionCoherencyFilter.cxx
 otbMulti3DMapToDEMFilter.cxx
 otbAdhesionCorrectionFilter.cxx
 otbStereoSensorModelToElevationMapFilter.cxx
+otbStereorectificationDisplacementFieldSource.cxx
 )
 
 add_executable(otbStereoTestDriver ${OTBStereoTests})
@@ -287,3 +288,20 @@ otb_add_test(NAME dmTvStereoSensorModelToElevationFilter COMMAND otbStereoTestDr
   3
   )
 
+otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbDisplacementFieldTestDriver
+  --compare-n-images ${EPSILON_10} 2
+  ${BASELINE}/feTvStereorectificationDeformationFieldSourceOutput1.tif
+  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput1.tif
+  ${BASELINE}/feTvStereorectificationDeformationFieldSourceOutput2.tif
+  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput2.tif
+  otbStereorectificationDisplacementFieldSource
+  ${EXAMPLEDATA}/sensor_stereo_left.tif
+  ${EXAMPLEDATA}/sensor_stereo_right.tif
+  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput1.tif
+  ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput2.tif
+  300
+  0.5
+  5
+  )
+otb_add_test(NAME dmTuStereorectificationDisplacementFieldSourceNew COMMAND otbDisplacementFieldTestDriver
+  otbStereorectificationDisplacementFieldSourceNew)

Modules/Registration/Stereo/test/otbStereoTestDriver.cxx

@@ -13,4 +13,5 @@ void RegisterTests()
   REGISTER_TEST(otbAdhesionCorrectionFilter);
   REGISTER_TEST(otbStereoSensorModelToElevationMapFilterNew);
   REGISTER_TEST(otbStereoSensorModelToElevationMapFilter);
+  REGISTER_TEST(otbStereorectificationDisplacementFieldSource);
 }