diff --git a/Modules/Applications/AppSARCalibration/otb-module.cmake b/Modules/Applications/AppSARCalibration/otb-module.cmake index 1bd92a017b6f582ca94e13345e669f1aa1a981a6..7750ce8a65c9d6f34ddc3bbec9b81e425c6320aa 100644 --- a/Modules/Applications/AppSARCalibration/otb-module.cmake +++ b/Modules/Applications/AppSARCalibration/otb-module.cmake @@ -3,7 +3,6 @@ set(DOCUMENTATION "SAR Calibration application.") otb_module(OTBAppSARCalibration DEPENDS OTBSARCalibration - OTBSAR OTBApplicationEngine TEST_DEPENDS OTBTestKernel diff --git a/Modules/Filtering/SAR/CMakeLists.txt b/Modules/Filtering/SAR/CMakeLists.txt deleted file mode 100644 index 83fb58076cab332cc090bb43315678d95f97f840..0000000000000000000000000000000000000000 --- a/Modules/Filtering/SAR/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -project(OTBSAR) -otb_module_impl() diff --git a/Modules/Filtering/SAR/otb-module.cmake b/Modules/Filtering/SAR/otb-module.cmake deleted file mode 100644 index 6eac63778b1ec53cc9fb4b50ac7165a838d16e4b..0000000000000000000000000000000000000000 --- a/Modules/Filtering/SAR/otb-module.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(DOCUMENTATION "This module provides basic SAR processing operations.") - -otb_module(OTBSAR - DEPENDS - OTBCommon - OTBITK - OTBOSSIMAdapters - TEST_DEPENDS - OTBImageBase - OTBImageIO - OTBTestKernel - - DESCRIPTION - "${DOCUMENTATION}" -) diff --git a/Modules/Filtering/SAR/test/CMakeLists.txt b/Modules/Filtering/SAR/test/CMakeLists.txt deleted file mode 100644 index 0ad4c099044590fee771d6baacb7ec63a3f6edbe..0000000000000000000000000000000000000000 --- a/Modules/Filtering/SAR/test/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -otb_module_test() - -set(OTBSARTests - otbSARTestDriver.cxx - otbSarDeburstFilterTest.cxx - ) - -add_executable(otbSARTestDriver ${OTBSARTests}) -target_link_libraries(otbSARTestDriver ${OTBSAR-Test_LIBRARIES}) -otb_module_target_label(otbSARTestDriver) - -otb_add_test(NAME saTvSarDeburstImageFilterTest COMMAND otbSARTestDriver - --compare-image ${NOTOL} - ${BASELINE}/saTvSarDeburstImageFilterTestOutput.tif - ${TEMP}/saTvSarDeburstImageFilterTestOutput.tif - otbSarDeburstFilterTest - ${INPUTDATA}/s1a-iw1-slc-vh-amp_xt.tif - ${TEMP}/saTvSarDeburstImageFilterTestOutput.tif) diff --git a/Modules/Filtering/SAR/test/otbSARTestDriver.cxx b/Modules/Filtering/SAR/test/otbSARTestDriver.cxx deleted file mode 100644 index d1b8fb9c81242b6c6572d9b9ec6bf7b96c2bf090..0000000000000000000000000000000000000000 --- a/Modules/Filtering/SAR/test/otbSARTestDriver.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include "otbTestMain.h" -void RegisterTests() -{ - REGISTER_TEST(otbSarDeburstFilterTest); -} diff --git a/Modules/Filtering/SAR/include/otbSarDeburstImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h similarity index 99% rename from Modules/Filtering/SAR/include/otbSarDeburstImageFilter.h rename to Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h index e9540b79c3100e4841dd446987b16e4e5d5dc224..d7f85cb45914838489b3ac3f62224e98ba2dc38d 100644 --- a/Modules/Filtering/SAR/include/otbSarDeburstImageFilter.h +++ b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h @@ -39,7 +39,7 @@ namespace otb * * Note that currently only Sentinel1 IW SLC products are supported. * - * \ingroup OTBSAR + * \ingroup OTBSARCalibration */ template <class TImage> class ITK_EXPORT SarDeburstImageFilter : diff --git a/Modules/Filtering/SAR/include/otbSarDeburstImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.txx similarity index 100% rename from Modules/Filtering/SAR/include/otbSarDeburstImageFilter.txx rename to Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.txx diff --git a/Modules/Radiometry/SARCalibration/test/CMakeLists.txt b/Modules/Radiometry/SARCalibration/test/CMakeLists.txt index f6ccc87ca94ee82085d126f21975218c0927a20d..849187da1d11b9aee6a912ded03ff4cd3f2a2ca9 100644 --- a/Modules/Radiometry/SARCalibration/test/CMakeLists.txt +++ b/Modules/Radiometry/SARCalibration/test/CMakeLists.txt @@ -22,6 +22,7 @@ otbSarRadiometricCalibrationFunctionWithoutNoise.cxx otbTerraSarBrightnessImageComplexFilterTest.cxx otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx otbSarBrightnessToImageFilterTest.cxx +otbSarDeburstFilterTest.cxx ) add_executable(otbSARCalibrationTestDriver ${OTBSARCalibrationTests}) @@ -272,3 +273,11 @@ otb_add_test(NAME raTvSarBrightnessToImageFilter COMMAND otbSARCalibrationTestD ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif 1000 1000 250 250 # Extract ) + +otb_add_test(NAME saTvSarDeburstImageFilterTest COMMAND otbSARCalibrationTestDriver + --compare-image ${NOTOL} + ${BASELINE}/saTvSarDeburstImageFilterTestOutput.tif + ${TEMP}/saTvSarDeburstImageFilterTestOutput.tif + otbSarDeburstFilterTest + ${INPUTDATA}/s1a-iw1-slc-vh-amp_xt.tif + ${TEMP}/saTvSarDeburstImageFilterTestOutput.tif) diff --git a/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx b/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx index 873a912bbe6538f0583e348a02184b4bcca4e6f9..fd15425b0c5f6a310cf3211b584d32163e7a0104 100644 --- a/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx +++ b/Modules/Radiometry/SARCalibration/test/otbSARCalibrationTestDriver.cxx @@ -21,4 +21,5 @@ void RegisterTests() REGISTER_TEST(otbTerraSarBrightnessImageComplexFilterTest); REGISTER_TEST(otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest); REGISTER_TEST(otbSarBrightnessToImageFilterTest); + REGISTER_TEST(otbSarDeburstFilterTest); } diff --git a/Modules/Filtering/SAR/test/otbSarDeburstFilterTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarDeburstFilterTest.cxx similarity index 100% rename from Modules/Filtering/SAR/test/otbSarDeburstFilterTest.cxx rename to Modules/Radiometry/SARCalibration/test/otbSarDeburstFilterTest.cxx