From 036cb50870c5b11eb2628e151c67d7c76d8872b0 Mon Sep 17 00:00:00 2001
From: Ludovic Hussonnois <ludovic.hussonnois@c-s.fr>
Date: Wed, 1 Feb 2017 11:06:13 +0100
Subject: [PATCH] BUG: Mantis-1289 : Clear and update DEM loading data to
update pixels parameters.
Put DEM clear and loading in DoUpdate().
This change correct a side effect that was present in DoExecute() function.
---
.../app/otbOrthoRectification.cxx | 8 ++++---
.../otbWrapperElevationParametersHandler.cxx | 24 +++++++++++++------
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
index 4b355d489f..4e0b6b56f5 100644
--- a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
+++ b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
@@ -235,6 +235,11 @@ private:
{
if (HasValue("io.in"))
{
+
+ // Clear and reset the DEM Handler
+ otb::DEMHandler::Instance()->ClearDEMs();
+ otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this,"elev");
+
// input image
FloatVectorImageType::Pointer inImage = GetParameterImage("io.in");
@@ -645,9 +650,6 @@ private:
break;
}
- // Setup the DEM Handler
- otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this,"elev");
-
// If activated, generate RPC model
if(IsParameterEnabled("opt.rpc"))
{
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
index e72145ce08..409f8ad46e 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
@@ -107,10 +107,20 @@ void ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(const Ap
// Set DEM directory if available
if(IsDEMUsed(app,key))
{
- oss.str("");
- oss<<"Elevation management: using DEM directory ("<<GetDEMDirectory(app,key)<<")"<<std::endl;
- otb::DEMHandler::Instance()->OpenDEMDirectory(GetDEMDirectory(app,key));
- app->GetLogger()->Info(oss.str());
+ std::string demDirectory = GetDEMDirectory(app,key);
+ if(otb::DEMHandler::Instance()->IsValidDEMDirectory(demDirectory.c_str()))
+ {
+ oss.str( "" );
+ oss << "Elevation management: using DEM directory (" << demDirectory << ")" << std::endl;
+ otb::DEMHandler::Instance()->OpenDEMDirectory( demDirectory );
+ app->GetLogger()->Info( oss.str() );
+ }
+ else
+ {
+ oss.str( "" );
+ oss << "DEM directory : " << demDirectory << " is not a valid DEM directory";
+ app->GetLogger()->Warning( oss.str() );
+ }
}
}
@@ -161,10 +171,10 @@ ElevationParametersHandler::IsGeoidUsed(const Application::Pointer app, const st
bool
ElevationParametersHandler::IsDEMUsed(const Application::Pointer app, const std::string& key)
{
- std::ostringstream geoidKey;
- geoidKey<< key<<".dem";
+ std::ostringstream demKey;
+ demKey<< key<<".dem";
- return app->IsParameterEnabled(geoidKey.str()) && app->HasValue(geoidKey.str());
+ return app->IsParameterEnabled(demKey.str()) && app->HasValue(demKey.str());
}
--
GitLab