From e7c7a734bab46850497c00f1a46bca449d27ffdf Mon Sep 17 00:00:00 2001 From: Otmane Lahlou <otmane.lahlou@c-s.fr> Date: Tue, 14 Sep 2010 18:32:51 +0200 Subject: [PATCH] ENH : specify deformation field size for the moment in the ortho tests (not backward compatibility) --- Testing/Code/Projections/CMakeLists.txt | 2 ++ .../Projections/otbOrthoRectificationFilterWithDEM.cxx | 8 +++++++- .../otbOrthoRectificationMonoThreadFilter.cxx | 9 +++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt index 80ee2bc67f..bd60577767 100644 --- a/Testing/Code/Projections/CMakeLists.txt +++ b/Testing/Code/Projections/CMakeLists.txt @@ -304,6 +304,7 @@ ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2} 31 N ${INPUTDATA}/DEM/srtm_directory/ + 4 # ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif ) @@ -323,6 +324,7 @@ ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2} 31 N ${INPUTDATA}/DEM/srtm_directory/ + 4 # ${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif ) diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx index 5c468c6138..ed9b1cd319 100644 --- a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx +++ b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx @@ -49,7 +49,7 @@ int otbOrthoRectificationFilterWithDEM(int argc, char* argv[]) { ossimInit::instance()->initialize(argc, argv); - if (argc != 12) + if (argc != 13) { std::cout << argv[0] << " <input filename> <output filename> <origin easting> <origin northing> <x size> <y size>"; @@ -102,6 +102,12 @@ int otbOrthoRectificationFilterWithDEM(int argc, char* argv[]) utmMapProjection->SetHemisphere(argv[10][0]); orthoRectifFilter->SetMapProjection(utmMapProjection); + // Deformation Field spacing + ImageType::SpacingType gridSpacing; + gridSpacing[0] = atof(argv[12]); + gridSpacing[1] = -atof(argv[12]); + orthoRectifFilter->SetDeformationFieldSpacing(gridSpacing); + std::string srtmDirectory(argv[11]); orthoRectifFilter->SetDEMDirectory(srtmDirectory); diff --git a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx index bd4b84b1b0..649b021cf3 100644 --- a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx +++ b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx @@ -38,7 +38,7 @@ int otbOrthoRectificationMonoThreadFilter(int argc, char* argv[]) { ossimInit::instance()->initialize(argc, argv); - if (argc != 11) + if (argc != 12) { std::cout << argv[0] << " <input filename> <output filename> <origin easting> <origin northing> <x size> <y size> <x spacing> <y spacing> <UTM zone <UTM hemisphere>" @@ -93,8 +93,13 @@ int otbOrthoRectificationMonoThreadFilter(int argc, char* argv[]) utmMapProjection->SetHemisphere(argv[10][0]); orthoRectifFilter->SetMapProjection(utmMapProjection); + // Deformation Field spacing + ImageType::SpacingType gridSpacing; + gridSpacing[0] = atof(argv[11]); + gridSpacing[1] = -atof(argv[11]); + orthoRectifFilter->SetDeformationFieldSpacing(gridSpacing); + writer->SetInput(orthoRectifFilter->GetOutput()); - writer->SetTilingStreamDivisions(); writer->SetNumberOfThreads(1); writer->Update(); -- GitLab