Skip to content
Snippets Groups Projects
Commit 6e4769f9 authored by Stéphane Albert's avatar Stéphane Albert
Browse files

REFAC: Cleaned otb::Wrapper::InputProcessXMLParameter code.

parent dac09ee9
No related branches found
No related tags found
No related merge requests found
...@@ -263,12 +263,17 @@ InputProcessXMLParameter::Read(Application::Pointer this_) ...@@ -263,12 +263,17 @@ InputProcessXMLParameter::Read(Application::Pointer this_)
ParameterType type = paramGroup->GetParameterTypeFromString(typeAsString); ParameterType type = paramGroup->GetParameterTypeFromString(typeAsString);
Parameter* param = this_->GetParameterByKey(key); Parameter* param = this_->GetParameterByKey(key);
bool updateFromXML = true;
if(param->HasUserValue()) // std::cout
updateFromXML = false; // << "'" << paramName << "'\t"
// << key << "\t"
// << typeAsString << "\t"
// << type << "\t"
// << ParameterType_OutputImage << "\t"
// << param->HasUserValue() << "\t"
// << value << std::endl;
if(updateFromXML) if( !param->HasUserValue() )
{ {
param->SetUserValue(true); param->SetUserValue(true);
param->SetActive(true); param->SetActive(true);
...@@ -289,16 +294,27 @@ InputProcessXMLParameter::Read(Application::Pointer this_) ...@@ -289,16 +294,27 @@ InputProcessXMLParameter::Read(Application::Pointer this_)
{ {
this_->SetParameterString(key, value); this_->SetParameterString(key, value);
} }
else if (type == ParameterType_OutputImage) else if( type == ParameterType_OutputImage )
{ {
OutputImageParameter *paramDown = dynamic_cast<OutputImageParameter*>(param); assert( dynamic_cast< OutputImageParameter * >( param )==param );
if(paramDown!=ITK_NULLPTR)
{ OutputImageParameter * outImageParam =
paramDown->SetFileName(value); dynamic_cast< OutputImageParameter * >( param );
std::string pixTypeAsString = GetChildNodeTextOf(n_Parameter, "pixtype");
ImagePixelType outPixType = GetPixelTypeFromString(pixTypeAsString); assert( outImageParam!=ITK_NULLPTR );
paramDown->SetPixelType(outPixType);
} outImageParam->SetFileName( value );
std::string pixelType(
GetChildNodeTextOf(n_Parameter, "pixtype" )
);
if( pixelType.empty() )
std::runtime_error( "Invalid pixel type (empty string)." );
outImageParam->SetPixelType(
GetPixelTypeFromString( pixelType )
);
} }
else if (type == ParameterType_ComplexOutputImage) else if (type == ParameterType_ComplexOutputImage)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment