From a7b94a4f2522b9e5449ba0d632764a0d79383576 Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Tue, 13 Dec 2011 10:59:15 +0100
Subject: [PATCH] ENH: improvement due to ElevationParameters changes
---
Applications/Projections/otbBundleToPerfectSensor.cxx | 6 +-----
Applications/Projections/otbImageEnvelope.cxx | 6 +-----
Applications/Projections/otbOrthoRectification.cxx | 6 +-----
Applications/Projections/otbSuperimpose.cxx | 6 +-----
4 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/Applications/Projections/otbBundleToPerfectSensor.cxx b/Applications/Projections/otbBundleToPerfectSensor.cxx
index 7f824e54fc..046ee2157d 100644
--- a/Applications/Projections/otbBundleToPerfectSensor.cxx
+++ b/Applications/Projections/otbBundleToPerfectSensor.cxx
@@ -130,6 +130,7 @@ private:
case Elevation_DEM:
{
resampler->SetDEMDirectory(ElevationParametersHandler::GetDEMDirectory(this, "elev"));
+ resampler->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
}
break;
case Elevation_Average:
@@ -142,11 +143,6 @@ private:
// {
// }
// break;
- case Elevation_Geoid:
- {
- resampler->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
- }
- break;
}
// Set up output image informations
diff --git a/Applications/Projections/otbImageEnvelope.cxx b/Applications/Projections/otbImageEnvelope.cxx
index 585a595f8e..3d6a4a9be0 100644
--- a/Applications/Projections/otbImageEnvelope.cxx
+++ b/Applications/Projections/otbImageEnvelope.cxx
@@ -97,6 +97,7 @@ private:
case Elevation_DEM:
{
m_Envelope->SetDEMDirectory(ElevationParametersHandler::GetDEMDirectory(this, "elev"));
+ m_Envelope->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
}
break;
case Elevation_Average:
@@ -109,11 +110,6 @@ private:
// {
// }
// break;
- case Elevation_Geoid:
- {
- m_Envelope->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
- }
- break;
}
if (HasValue("proj"))
diff --git a/Applications/Projections/otbOrthoRectification.cxx b/Applications/Projections/otbOrthoRectification.cxx
index fcdae7d2e6..90e48ee3ee 100644
--- a/Applications/Projections/otbOrthoRectification.cxx
+++ b/Applications/Projections/otbOrthoRectification.cxx
@@ -393,6 +393,7 @@ private:
case Elevation_DEM:
{
m_ResampleFilter->SetDEMDirectory(ElevationParametersHandler::GetDEMDirectory(this, "elev"));
+ m_ResampleFilter->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
}
break;
case Elevation_Average:
@@ -405,11 +406,6 @@ private:
// {
// }
// break;
- case Elevation_Geoid:
- {
- m_ResampleFilter->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
- }
- break;
}
// If activated, generate RPC model
diff --git a/Applications/Projections/otbSuperimpose.cxx b/Applications/Projections/otbSuperimpose.cxx
index 8d1d38a4a6..2bac8d734e 100644
--- a/Applications/Projections/otbSuperimpose.cxx
+++ b/Applications/Projections/otbSuperimpose.cxx
@@ -113,6 +113,7 @@ private:
case Elevation_DEM:
{
m_Resampler->SetDEMDirectory(ElevationParametersHandler::GetDEMDirectory(this, "elev"));
+ m_Resampler->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
}
break;
case Elevation_Average:
@@ -125,11 +126,6 @@ private:
// {
// }
// break;
- case Elevation_Geoid:
- {
- m_Resampler->SetGeoidFile(ElevationParametersHandler::GetGeoidFile(this, "elev"));
- }
- break;
}
// Set up output image informations
--
GitLab