Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
e952e9b2
Commit
e952e9b2
authored
Nov 13, 2020
by
Julien Cabieces
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix several C++ comment
parent
f7f9c007
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
40 deletions
+28
-40
Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
...tions/AppClassification/app/otbComputeConfusionMatrix.cxx
+5
-7
Modules/Applications/AppClassification/include/otbVectorPrediction.hxx
...cations/AppClassification/include/otbVectorPrediction.hxx
+5
-7
Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
...rappers/ApplicationEngine/include/otbWrapperApplication.h
+7
-7
Modules/Wrappers/ApplicationEngine/include/otbWrapperBandParameter.h
...ppers/ApplicationEngine/include/otbWrapperBandParameter.h
+4
-8
Modules/Wrappers/ApplicationEngine/include/otbWrapperFieldParameter.h
...pers/ApplicationEngine/include/otbWrapperFieldParameter.h
+6
-10
Modules/Wrappers/QGIS/src/otbQgisDescriptor.cxx
Modules/Wrappers/QGIS/src/otbQgisDescriptor.cxx
+1
-1
No files found.
Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
View file @
e952e9b2
...
...
@@ -198,13 +198,11 @@ private:
OGRFieldType
fieldType
=
feature
.
ogr
().
GetFieldDefnRef
(
iField
)
->
GetType
();
for
(
auto
type
:
typeFilter
)
if
(
fieldType
==
type
)
{
std
::
string
tmpKey
=
"ref.vector.field."
+
key
.
substr
(
0
,
end
-
key
.
begin
());
AddChoice
(
tmpKey
,
item
);
break
;
}
if
(
std
::
find
(
typeFilter
.
begin
(),
typeFilter
.
end
(),
fieldType
)
!=
std
::
end
(
typeFilter
))
{
std
::
string
tmpKey
=
"ref.vector.field."
+
key
.
substr
(
0
,
end
-
key
.
begin
());
AddChoice
(
tmpKey
,
item
);
}
}
}
}
...
...
Modules/Applications/AppClassification/include/otbVectorPrediction.hxx
View file @
e952e9b2
...
...
@@ -65,13 +65,11 @@ void VectorPrediction<RegressionMode>::DoUpdateParameters()
std
::
transform
(
key
.
begin
(),
key
.
end
(),
key
.
begin
(),
tolower
);
auto
fieldType
=
fieldDefn
->
GetType
();
for
(
auto
type
:
typeFilter
)
if
(
fieldType
==
type
)
{
std
::
string
tmpKey
=
"feat."
+
key
;
AddChoice
(
tmpKey
,
item
);
break
;
}
if
(
std
::
find
(
typeFilter
.
begin
(),
typeFilter
.
end
(),
fieldType
)
!=
std
::
end
(
typeFilter
))
{
std
::
string
tmpKey
=
"feat."
+
key
;
AddChoice
(
tmpKey
,
item
);
}
}
}
}
...
...
Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
View file @
e952e9b2
...
...
@@ -565,29 +565,29 @@ public:
/**
* Set vector data name from which we choose the fields for a FieldParameter
* \
in
key The parameter key (must be a FieldParameter)
* \
in
vectorData vector data name
* \
param[in]
key The parameter key (must be a FieldParameter)
* \
param[in]
vectorData vector data name
*/
void
SetVectorData
(
std
::
string
const
&
key
,
std
::
string
const
&
vectorData
);
/**
* Set list of allowed field types for a FieldParameter
* \
in
key The parameter key (must be a FieldParameter)
* \
in
typeFilter List of allowed types
* \
param[in]
key The parameter key (must be a FieldParameter)
* \
param[in]
typeFilter List of allowed types
*/
void
SetTypeFilter
(
std
::
string
const
&
key
,
FieldParameter
::
TypeFilterType
const
&
typeFilter
);
/**
* Get list of allowed field types for a FieldParameter
* \
in
key The parameter key (must be a FieldParameter)
* \
param[in]
key The parameter key (must be a FieldParameter)
* \return List of allowed types
*/
const
FieldParameter
::
TypeFilterType
&
GetTypeFilter
(
std
::
string
const
&
key
);
/**
* Set raster data name from which we choose the bands for a BandParameter
* \
in
key The parameter key (must be a BandParameter)
* \
in
rasterData raster data name
* \
param[in]
key The parameter key (must be a BandParameter)
* \
param[in]
rasterData raster data name
*/
void
SetRasterData
(
std
::
string
const
&
key
,
std
::
string
const
&
rasterData
);
...
...
Modules/Wrappers/ApplicationEngine/include/otbWrapperBandParameter.h
View file @
e952e9b2
...
...
@@ -56,9 +56,9 @@ public:
}
/** Set raster data name from which we choose the fields */
void
SetRasterData
(
const
std
::
string
&
rasterData
)
void
SetRasterData
(
std
::
string
rasterData
)
{
m_RasterData
=
rasterData
;
m_RasterData
=
std
::
move
(
rasterData
)
;
}
/** Get raster data name from which we choose the fields */
...
...
@@ -69,14 +69,10 @@ public:
protected:
/** Constructor */
BandParameter
()
{
}
BandParameter
()
=
default
;
/** Destructor */
~
BandParameter
()
override
{
}
~
BandParameter
()
override
=
default
;
std
::
string
m_RasterData
;
...
...
Modules/Wrappers/ApplicationEngine/include/otbWrapperFieldParameter.h
View file @
e952e9b2
...
...
@@ -58,9 +58,9 @@ public:
}
/** Set vector data name from which we choose the fields */
void
SetVectorData
(
const
std
::
string
&
vectorData
)
void
SetVectorData
(
std
::
string
vectorData
)
{
m_VectorData
=
vectorData
;
m_VectorData
=
std
::
move
(
vectorData
)
;
}
/** Get vector data name from which we choose the fields */
...
...
@@ -70,9 +70,9 @@ public:
}
/** Set list of allowed field types */
void
SetTypeFilter
(
const
TypeFilterType
&
typeFilter
)
void
SetTypeFilter
(
TypeFilterType
typeFilter
)
{
m_TypeFilter
=
typeFilter
;
m_TypeFilter
=
std
::
move
(
typeFilter
)
;
}
/** Get list of allowed field types */
...
...
@@ -83,14 +83,10 @@ public:
protected:
/** Constructor */
FieldParameter
()
{
}
FieldParameter
()
=
default
;
/** Destructor */
~
FieldParameter
()
override
{
}
~
FieldParameter
()
override
=
default
;
std
::
string
m_VectorData
;
TypeFilterType
m_TypeFilter
;
...
...
Modules/Wrappers/QGIS/src/otbQgisDescriptor.cxx
View file @
e952e9b2
...
...
@@ -261,7 +261,7 @@ int main(int argc, char* argv[])
for
(
auto
k
:
key_list
)
values
+=
k
+
";"
;
if
(
values
.
size
())
if
(
!
values
.
empty
())
values
.
pop_back
();
dFile
<<
"|"
<<
values
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment