Skip to content
Snippets Groups Projects
Commit e7c7a734 authored by Otmane Lahlou's avatar Otmane Lahlou
Browse files

ENH : specify deformation field size for the moment in the ortho tests (not backward compatibility)

parent b71ba04c
No related branches found
No related tags found
No related merge requests found
...@@ -304,6 +304,7 @@ ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2} ...@@ -304,6 +304,7 @@ ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2}
31 31
N N
${INPUTDATA}/DEM/srtm_directory/ ${INPUTDATA}/DEM/srtm_directory/
4
# ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif # ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
) )
...@@ -323,6 +324,7 @@ ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2} ...@@ -323,6 +324,7 @@ ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2}
31 31
N N
${INPUTDATA}/DEM/srtm_directory/ ${INPUTDATA}/DEM/srtm_directory/
4
# ${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif # ${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif
) )
......
...@@ -49,7 +49,7 @@ int otbOrthoRectificationFilterWithDEM(int argc, char* argv[]) ...@@ -49,7 +49,7 @@ int otbOrthoRectificationFilterWithDEM(int argc, char* argv[])
{ {
ossimInit::instance()->initialize(argc, argv); ossimInit::instance()->initialize(argc, argv);
if (argc != 12) if (argc != 13)
{ {
std::cout << argv[0] << std::cout << argv[0] <<
" <input filename> <output filename> <origin easting> <origin northing> <x size> <y size>"; " <input filename> <output filename> <origin easting> <origin northing> <x size> <y size>";
...@@ -102,6 +102,12 @@ int otbOrthoRectificationFilterWithDEM(int argc, char* argv[]) ...@@ -102,6 +102,12 @@ int otbOrthoRectificationFilterWithDEM(int argc, char* argv[])
utmMapProjection->SetHemisphere(argv[10][0]); utmMapProjection->SetHemisphere(argv[10][0]);
orthoRectifFilter->SetMapProjection(utmMapProjection); 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]); std::string srtmDirectory(argv[11]);
orthoRectifFilter->SetDEMDirectory(srtmDirectory); orthoRectifFilter->SetDEMDirectory(srtmDirectory);
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
int otbOrthoRectificationMonoThreadFilter(int argc, char* argv[]) int otbOrthoRectificationMonoThreadFilter(int argc, char* argv[])
{ {
ossimInit::instance()->initialize(argc, argv); ossimInit::instance()->initialize(argc, argv);
if (argc != 11) if (argc != 12)
{ {
std::cout << argv[0] << std::cout << argv[0] <<
" <input filename> <output filename> <origin easting> <origin northing> <x size> <y size> <x spacing> <y spacing> <UTM zone <UTM hemisphere>" " <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[]) ...@@ -93,8 +93,13 @@ int otbOrthoRectificationMonoThreadFilter(int argc, char* argv[])
utmMapProjection->SetHemisphere(argv[10][0]); utmMapProjection->SetHemisphere(argv[10][0]);
orthoRectifFilter->SetMapProjection(utmMapProjection); 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->SetInput(orthoRectifFilter->GetOutput());
writer->SetTilingStreamDivisions(); writer->SetTilingStreamDivisions();
writer->SetNumberOfThreads(1); writer->SetNumberOfThreads(1);
writer->Update(); writer->Update();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment