diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt index 80ee2bc67f0e4e66b320668cd1a0306b1cc65823..bd605777671f0a87eb4d9d1028ec77d56c3afecf 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 5c468c61380e3ad6c8e0ac559197844393cd8b85..ed9b1cd319897c2783f5a879d41433d5ececee04 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 bd4b84b1b071618d837153b30c22dd473a71c54c..649b021cf3d032a6afa77d7ecbdfc1a0c5fa3824 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();