Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Cabieces
otb
Commits
553a584a
Commit
553a584a
authored
8 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
WRG: fix warning in macro otbDocHtmlParamMacro
parent
3920368f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
+11
-8
11 additions, 8 deletions
...ationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
with
11 additions
and
8 deletions
Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
+
11
−
8
View file @
553a584a
...
...
@@ -53,9 +53,9 @@ namespace Wrapper
#define otbDocHtmlParamMacro( type, param, fullKey, showKey ) \
oss << "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Courier New, courier'; font-weight:600;\"; >"; \
oss << param->GetName(); \
if( showKey == true &&
!std::string(
param->GetKey()
).empty()
) \
if( showKey == true && param->GetKey()
[0] != '\0'
) \
{ \
if (fullKey
!= ""
) \
if (
!
fullKey
.empty()
) \
{ \
oss << " ("<< fullKey<< "." << param->GetKey() << ")"; \
} \
...
...
@@ -65,7 +65,7 @@ else \
} \
} \
oss << ": </span>"; \
if(
std::string(
param->GetDescription()
).size()!=0
) \
if( param->GetDescription()
[0] != '\0'
) \
{ \
oss << param->GetDescription(); \
} \
...
...
@@ -172,6 +172,7 @@ ApplicationHtmlDocGenerator::GenerateDoc(const Application::Pointer app, const s
void
ApplicationHtmlDocGenerator
::
GetDocParameters
(
const
Application
::
Pointer
app
,
std
::
string
&
val
,
const
bool
showKey
)
{
std
::
ostringstream
oss
;
const
std
::
string
emptyString
;
const
std
::
vector
<
std
::
string
>
appKeyList
=
app
->
GetParametersKeys
(
false
);
const
unsigned
int
nbOfParam
=
appKeyList
.
size
();
...
...
@@ -189,7 +190,7 @@ void ApplicationHtmlDocGenerator::GetDocParameters( const Application::Pointer a
if
(
app
->
GetParameterType
(
key
)
==
ParameterType_Group
)
{
oss
<<
"<li>"
;
otbDocHtmlParamMacro
(
"group"
,
param
,
""
,
showKey
);
otbDocHtmlParamMacro
(
"group"
,
param
,
emptyString
,
showKey
);
std
::
string
grDoc
;
ApplicationHtmlDocGenerator
::
GetDocParameterGroup
(
app
,
grDoc
,
key
,
showKey
);
oss
<<
grDoc
;
...
...
@@ -198,7 +199,7 @@ void ApplicationHtmlDocGenerator::GetDocParameters( const Application::Pointer a
else
if
(
app
->
GetParameterType
(
key
)
==
ParameterType_Choice
)
{
oss
<<
"<li>"
;
otbDocHtmlParamMacro
(
"choice"
,
param
,
""
,
showKey
);
otbDocHtmlParamMacro
(
"choice"
,
param
,
emptyString
,
showKey
);
std
::
string
grDoc
;
ApplicationHtmlDocGenerator
::
GetDocParameterChoice
(
app
,
grDoc
,
key
,
showKey
);
oss
<<
grDoc
;
...
...
@@ -207,7 +208,7 @@ void ApplicationHtmlDocGenerator::GetDocParameters( const Application::Pointer a
else
{
oss
<<
"<li>"
;
otbDocHtmlParamMacro
(
"param"
,
param
,
""
,
showKey
);
otbDocHtmlParamMacro
(
"param"
,
param
,
emptyString
,
showKey
);
oss
<<
"</li>"
;
}
}
...
...
@@ -227,6 +228,7 @@ void ApplicationHtmlDocGenerator::GetDocParameterGroup( const Application::Point
ParameterGroup
*
group
=
dynamic_cast
<
ParameterGroup
*>
(
paramGr
);
const
std
::
vector
<
std
::
string
>
appKeyList
=
group
->
GetParametersKeys
(
false
);
unsigned
int
nbOfParam
=
appKeyList
.
size
();
const
std
::
string
emptyString
;
std
::
ostringstream
oss
;
oss
<<
"<ul>"
;
...
...
@@ -237,7 +239,7 @@ void ApplicationHtmlDocGenerator::GetDocParameterGroup( const Application::Point
if
(
app
->
GetParameterType
(
fullKey
)
==
ParameterType_Group
)
{
oss
<<
"<li>"
;
otbDocHtmlParamMacro
(
"group"
,
param
,
""
,
showKey
);
otbDocHtmlParamMacro
(
"group"
,
param
,
emptyString
,
showKey
);
std
::
string
grDoc
;
ApplicationHtmlDocGenerator
::
GetDocParameterGroup
(
app
,
grDoc
,
fullKey
,
showKey
);
oss
<<
grDoc
;
...
...
@@ -274,6 +276,7 @@ void ApplicationHtmlDocGenerator::GetDocParameterChoice( const Application::Poin
ChoiceParameter
*
choice
=
dynamic_cast
<
ChoiceParameter
*>
(
paramCh
);
const
std
::
vector
<
std
::
string
>
appKeyList
=
choice
->
GetChoiceKeys
();
unsigned
int
nbOfParam
=
choice
->
GetNbChoices
();
const
std
::
string
emptyString
;
std
::
ostringstream
oss
;
oss
<<
"<ul>"
;
...
...
@@ -284,7 +287,7 @@ void ApplicationHtmlDocGenerator::GetDocParameterChoice( const Application::Poin
std
::
string
grDoc
;
oss
<<
"<li>"
;
otbDocHtmlParamMacro
(
"group"
,
group
,
""
,
showKey
);
otbDocHtmlParamMacro
(
"group"
,
group
,
emptyString
,
showKey
);
ApplicationHtmlDocGenerator
::
GetDocParameterGroup
(
app
,
grDoc
,
fullKey
,
showKey
);
oss
<<
grDoc
;
oss
<<
"</li>"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment