From 39a42e6d77372f1a2e1280fb9d0c71244a753ade Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 2 Feb 2017 15:59:46 +0100
Subject: [PATCH] BUG: fix documentation of proxy parameters
---
.../src/otbWrapperApplicationHtmlDocGenerator.cxx | 4 ++--
.../CommandLine/src/otbWrapperCommandLineLauncher.cxx | 2 +-
.../QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
index 086ec18a62..bb6864898d 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
@@ -186,7 +186,7 @@ void ApplicationHtmlDocGenerator::GetDocParameters( const Application::Pointer a
for( unsigned int i=0; i<nbOfParam; i++ )
{
const std::string key(appKeyList[i]);
- Parameter::Pointer param = app->GetParameterByKey( key );
+ Parameter::Pointer param = app->GetParameterByKey(key, false);
if( app->GetParameterType(key) == ParameterType_Group)
{
oss << "<li>";
@@ -235,7 +235,7 @@ void ApplicationHtmlDocGenerator::GetDocParameterGroup( const Application::Point
for( unsigned int i=0; i<nbOfParam; i++ )
{
const std::string fullKey(std::string(key).append(".").append(appKeyList[i]));
- Parameter::Pointer param = app->GetParameterByKey( fullKey );
+ Parameter::Pointer param = app->GetParameterByKey( fullKey, false);
if( app->GetParameterType(fullKey) == ParameterType_Group)
{
oss<<"<li>";
diff --git a/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
index 8fa88be9de..c75e921044 100644
--- a/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
+++ b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
@@ -858,7 +858,7 @@ std::string CommandLineLauncher::DisplayParameterHelp(const Parameter::Pointer &
itkExceptionMacro("Not handled parameter type.");
- oss<< " " << param->GetName() << " ";
+ oss<< " " << m_Application->GetParameterName(paramKey) << " ";
if (type == ParameterType_OutputImage)
{
diff --git a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx
index fbb113c46a..872b4b4703 100644
--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx
+++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx
@@ -55,6 +55,7 @@ void QtWidgetParameterGroup::DoCreateWidget()
for (unsigned int i = 0; i < nbParams; ++i)
{
Parameter* param = m_ParamList->GetParameterByIndex(i);
+ Parameter* rawParam = m_ParamList->GetParameterByIndex(i,false);
if (param != ITK_NULLPTR)
{
@@ -70,7 +71,7 @@ void QtWidgetParameterGroup::DoCreateWidget()
if (paramAsGroup == ITK_NULLPTR && paramAsChoice == ITK_NULLPTR && !paramIsXML)
{
// Label (col 1)
- QWidget* label = new QtWidgetParameterLabel( param );
+ QWidget* label = new QtWidgetParameterLabel( rawParam );
gridLayout->addWidget(label, i, 1);
// Parameter Widget (col 2)
@@ -149,7 +150,7 @@ void QtWidgetParameterGroup::DoCreateWidget()
}
connect(group, SIGNAL(clicked(bool)), specificWidget, SLOT(SetActivationState(bool)));
- group->setTitle(param->GetName());
+ group->setTitle(rawParam->GetName());
gridLayout->addWidget(group, i, 0, 1, -1);
m_WidgetList.push_back(specificWidget);
--
GitLab