From 2553389f2bbf2c1f2ba0c342eea789e7ec3d8ec3 Mon Sep 17 00:00:00 2001 From: Christophe Palmann <christophe.palmann@c-s.fr> Date: Mon, 5 Oct 2015 10:53:30 +0200 Subject: [PATCH] ENH: AppSARConvert renamed to AppSARPolarMatrixConvert --- .../Applications/AppSARConvert/CMakeLists.txt | 2 - .../AppSARPolarMatrixConvert/CMakeLists.txt | 2 + .../app/CMakeLists.txt | 4 +- .../app/otbSARPolarMatrixConvert.cxx} | 12 +-- .../otb-module.cmake | 2 +- .../test/CMakeLists.txt | 80 +++++++++---------- 6 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 Modules/Applications/AppSARConvert/CMakeLists.txt create mode 100644 Modules/Applications/AppSARPolarMatrixConvert/CMakeLists.txt rename Modules/Applications/{AppSARConvert => AppSARPolarMatrixConvert}/app/CMakeLists.txt (73%) rename Modules/Applications/{AppSARConvert/app/otbSARConvert.cxx => AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx} (98%) rename Modules/Applications/{AppSARConvert => AppSARPolarMatrixConvert}/otb-module.cmake (86%) rename Modules/Applications/{AppSARConvert => AppSARPolarMatrixConvert}/test/CMakeLists.txt (58%) diff --git a/Modules/Applications/AppSARConvert/CMakeLists.txt b/Modules/Applications/AppSARConvert/CMakeLists.txt deleted file mode 100644 index d3b59b9738..0000000000 --- a/Modules/Applications/AppSARConvert/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -project(OTBAppSARConvert) -otb_module_impl() diff --git a/Modules/Applications/AppSARPolarMatrixConvert/CMakeLists.txt b/Modules/Applications/AppSARPolarMatrixConvert/CMakeLists.txt new file mode 100644 index 0000000000..b20d3ebc6c --- /dev/null +++ b/Modules/Applications/AppSARPolarMatrixConvert/CMakeLists.txt @@ -0,0 +1,2 @@ +project(OTBAppSARPolarMatrixConvert) +otb_module_impl() diff --git a/Modules/Applications/AppSARConvert/app/CMakeLists.txt b/Modules/Applications/AppSARPolarMatrixConvert/app/CMakeLists.txt similarity index 73% rename from Modules/Applications/AppSARConvert/app/CMakeLists.txt rename to Modules/Applications/AppSARPolarMatrixConvert/app/CMakeLists.txt index 638ed12b8c..81426caca5 100644 --- a/Modules/Applications/AppSARConvert/app/CMakeLists.txt +++ b/Modules/Applications/AppSARPolarMatrixConvert/app/CMakeLists.txt @@ -6,7 +6,7 @@ set(OTBAppFiltering_LINK_LIBS ) otb_create_application( - NAME SARConvert - SOURCES otbSARConvert.cxx + NAME SARPolarMatrixConvert + SOURCES otbSARPolarMatrixConvert.cxx LINK_LIBRARIES ${${otb-module}_LIBRARIES}) diff --git a/Modules/Applications/AppSARConvert/app/otbSARConvert.cxx b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx similarity index 98% rename from Modules/Applications/AppSARConvert/app/otbSARConvert.cxx rename to Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx index 3b6d7cb7ad..fe96ee46e7 100644 --- a/Modules/Applications/AppSARConvert/app/otbSARConvert.cxx +++ b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx @@ -54,11 +54,11 @@ namespace otb namespace Wrapper { -class SARConvert : public Application +class SARPolarMatrixConvert : public Application { public: /** Standard class typedefs. */ - typedef SARConvert Self; + typedef SARPolarMatrixConvert Self; typedef Application Superclass; typedef itk::SmartPointer<Self> Pointer; typedef itk::SmartPointer<const Self> ConstPointer; @@ -178,16 +178,16 @@ public: /** Standard macro */ itkNewMacro(Self); - itkTypeMacro(SARConvert, otb::Application); + itkTypeMacro(SARPolarMatrixConvert, otb::Application); private: void DoInit() { - SetName("SARConvert"); + SetName("SARPolarMatrixConvert"); SetDescription("This applications allows converting classical polarimetric matrices to each other."); // Documentation - SetDocName("SARConvert"); + SetDocName("SARPolarMatrixConvert"); SetDocLongDescription( "This application allows converting classical polarimetric matrices to each other.\n" @@ -706,4 +706,4 @@ private: } //end namespace Wrapper } //end namespace otb -OTB_APPLICATION_EXPORT(otb::Wrapper::SARConvert) +OTB_APPLICATION_EXPORT(otb::Wrapper::SARPolarMatrixConvert) diff --git a/Modules/Applications/AppSARConvert/otb-module.cmake b/Modules/Applications/AppSARPolarMatrixConvert/otb-module.cmake similarity index 86% rename from Modules/Applications/AppSARConvert/otb-module.cmake rename to Modules/Applications/AppSARPolarMatrixConvert/otb-module.cmake index 4ef86df391..759161f8b4 100644 --- a/Modules/Applications/AppSARConvert/otb-module.cmake +++ b/Modules/Applications/AppSARPolarMatrixConvert/otb-module.cmake @@ -1,6 +1,6 @@ set(DOCUMENTATION "Basic filters application.") -otb_module(OTBAppSARConvert +otb_module(OTBAppSARPolarMatrixConvert DEPENDS OTBPolarimetry OTBImageManipulation diff --git a/Modules/Applications/AppSARConvert/test/CMakeLists.txt b/Modules/Applications/AppSARPolarMatrixConvert/test/CMakeLists.txt similarity index 58% rename from Modules/Applications/AppSARConvert/test/CMakeLists.txt rename to Modules/Applications/AppSARPolarMatrixConvert/test/CMakeLists.txt index ace66ef645..dfe52d71e2 100644 --- a/Modules/Applications/AppSARConvert/test/CMakeLists.txt +++ b/Modules/Applications/AppSARPolarMatrixConvert/test/CMakeLists.txt @@ -1,157 +1,157 @@ otb_module_test() -#----------- SARConvert TESTS ---------------- +#----------- SARPolarMatrixConvert TESTS ---------------- #1 -otb_test_application(NAME apTvSARConvertRecCoherency - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecCoherency + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv msinclairtocoherency - -outc ${TEMP}/apTvSARConvertRecCoherency.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertRecCoherency.tif ) #2 -otb_test_application(NAME apTvSARConvertRecCovariance - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecCovariance + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv msinclairtocovariance - -outc ${TEMP}/apTvSARConvertRecCovariance.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertRecCovariance.tif ) #3 -otb_test_application(NAME apTvSARConvertRecCirCovariance - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecCirCovariance + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv msinclairtocircovariance - -outc ${TEMP}/apTvSARConvertRecCirCovariance.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertRecCirCovariance.tif ) #4 -otb_test_application(NAME apTvSARConvertRecCohToMueller - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecCohToMueller + APP SARPolarMatrixConvert OPTIONS -inc ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif -conv mcoherencytomueller - -outf ${TEMP}/apTvSARConvertRecCohToMueller.tif + -outf ${TEMP}/apTvSARPolarMatrixConvertRecCohToMueller.tif ) #5 -otb_test_application(NAME apTvSARConvertRecCovToCohDeg - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecCovToCohDeg + APP SARPolarMatrixConvert OPTIONS -inc ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif -conv mcovariancetocoherencydegree - -outc ${TEMP}/apTvSARConvertRecCovToCohDeg.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertRecCovToCohDeg.tif ) #6 - interleaved (failed) -otb_test_application(NAME apTvSARConvertRecCovToRecCoh - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecCovToRecCoh + APP SARPolarMatrixConvert OPTIONS -inc ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif -conv mcovariancetocoherency - -outc ${TEMP}/apTvSARConvertRecCovToRecCoh.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertRecCovToRecCoh.tif ) #7 - interleaved (failed) -otb_test_application(NAME apTvSARConvertRecLinCovToRecCirCov - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertRecLinCovToRecCirCov + APP SARPolarMatrixConvert OPTIONS -inc ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif -conv mlinearcovariancetocircularcovariance - -outc ${TEMP}/apTvSARConvertRecCovToRecCoh.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertRecCovToRecCoh.tif ) #8 - interleaved (failed) -otb_test_application(NAME apTvSARConvertMuellerToRecCov - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertMuellerToRecCov + APP SARPolarMatrixConvert OPTIONS -inf ${BASELINE}/saTvSinclairImageFilter_SinclairToMueller.tif -conv muellertomcovariance - -outc ${TEMP}/apTvSARConvertMuellerToRecCov.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertMuellerToRecCov.tif ) #9 -otb_test_application(NAME apTvSARConvertBiSincToCoherency - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertBiSincToCoherency + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invh ${INPUTDATA}/RSAT_imageryC_VH.tif -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv bsinclairtocoherency - -outc ${TEMP}/apTvSARConvertBiSincToCoherency.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertBiSincToCoherency.tif ) #10 -otb_test_application(NAME apTvSARConvertBiSincToCovariance - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertBiSincToCovariance + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invh ${INPUTDATA}/RSAT_imageryC_VH.tif -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv bsinclairtocovariance - -outc ${TEMP}/apTvSARConvertBiSincToCovariance.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertBiSincToCovariance.tif ) #11 -otb_test_application(NAME apTvSARConvertBiSincToCirCovariance - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertBiSincToCirCovariance + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invh ${INPUTDATA}/RSAT_imageryC_VH.tif -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv bsinclairtocircovariance - -outc ${TEMP}/apTvSARConvertBiSincToCirCovariance.tif + -outc ${TEMP}/apTvSARPolarMatrixConvertBiSincToCirCovariance.tif ) #12 - interleaved (failed) -otb_test_application(NAME apTvSARConvertSincToMueller - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertSincToMueller + APP SARPolarMatrixConvert OPTIONS -inhh ${INPUTDATA}/RSAT_imageryC_HH.tif -inhv ${INPUTDATA}/RSAT_imageryC_HV.tif -invh ${INPUTDATA}/RSAT_imageryC_HV.tif #monostatic -invv ${INPUTDATA}/RSAT_imageryC_VV.tif -conv sinclairtomueller - -outf ${TEMP}/apTvSARConvertSincToMueller.tif + -outf ${TEMP}/apTvSARPolarMatrixConvertSincToMueller.tif ) #13 -otb_test_application(NAME apTvSARConvertMuellerToPolDeGPow - APP SARConvert +otb_test_application(NAME apTvSARPolarMatrixConvertMuellerToPolDeGPow + APP SARPolarMatrixConvert OPTIONS -inf ${BASELINE}/saTvSinclairImageFilter_SinclairToMueller.tif -conv muellertopoldegandpower - -outf ${TEMP}/apTvSARConvertMuellerToPolDeGPow.tif + -outf ${TEMP}/apTvSARPolarMatrixConvertMuellerToPolDeGPow.tif ) -- GitLab