From 6686547a4c65697daea7b946270d89a16a4f2a2c Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@cnes.fr>
Date: Tue, 21 Feb 2017 15:41:59 +0100
Subject: [PATCH] ENH: Move the new deburst filter to SARCalibration module and
remove the SAR module introduced in this RFC (from RFC review)
---
.../AppSARCalibration/otb-module.cmake | 1 -
Modules/Filtering/SAR/CMakeLists.txt | 2 --
Modules/Filtering/SAR/otb-module.cmake | 15 ---------------
Modules/Filtering/SAR/test/CMakeLists.txt | 18 ------------------
.../Filtering/SAR/test/otbSARTestDriver.cxx | 5 -----
.../include/otbSarDeburstImageFilter.h | 2 +-
.../include/otbSarDeburstImageFilter.txx | 0
.../SARCalibration/test/CMakeLists.txt | 9 +++++++++
.../test/otbSARCalibrationTestDriver.cxx | 1 +
.../test/otbSarDeburstFilterTest.cxx | 0
10 files changed, 11 insertions(+), 42 deletions(-)
delete mode 100644 Modules/Filtering/SAR/CMakeLists.txt
delete mode 100644 Modules/Filtering/SAR/otb-module.cmake
delete mode 100644 Modules/Filtering/SAR/test/CMakeLists.txt
delete mode 100644 Modules/Filtering/SAR/test/otbSARTestDriver.cxx
rename Modules/{Filtering/SAR => Radiometry/SARCalibration}/include/otbSarDeburstImageFilter.h (99%)
rename Modules/{Filtering/SAR => Radiometry/SARCalibration}/include/otbSarDeburstImageFilter.txx (100%)
rename Modules/{Filtering/SAR => Radiometry/SARCalibration}/test/otbSarDeburstFilterTest.cxx (100%)
diff --git a/Modules/Applications/AppSARCalibration/otb-module.cmake b/Modules/Applications/AppSARCalibration/otb-module.cmake
index 1bd92a017b..7750ce8a65 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 83fb58076c..0000000000
--- 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 6eac63778b..0000000000
--- 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 0ad4c09904..0000000000
--- 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 d1b8fb9c81..0000000000
--- 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 e9540b79c3..d7f85cb459 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 f6ccc87ca9..849187da1d 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 873a912bbe..fd15425b0c 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
--
GitLab