Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NORMLIM_sigma0
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
s1-tiling
NORMLIM_sigma0
Merge requests
!4
Resolve "Migrate code to OTB 8.x"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Migrate code to OTB 8.x"
5-migrate-code-to-otb-8-x
into
master
Overview
0
Commits
6
Pipelines
0
Changes
21
Merged
Luc Hermitte
requested to merge
5-migrate-code-to-otb-8-x
into
master
2 years ago
Overview
0
Commits
6
Pipelines
0
Changes
5
Expand
Closes
#5 (closed)
0
0
Merge request reports
Compare
version 2
version 4
3d892f9c
1 year ago
version 3
61c396fb
1 year ago
version 2
3b486bb6
1 year ago
version 1
40c9a2c2
2 years ago
master (base)
and
latest version
latest version
4134a18d
6 commits,
1 year ago
version 4
3d892f9c
5 commits,
1 year ago
version 3
61c396fb
4 commits,
1 year ago
version 2
3b486bb6
2 commits,
1 year ago
version 1
40c9a2c2
1 commit,
2 years ago
Show latest version
5 files
+
276
−
217
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
app/otbSARDEMProjection2.cxx
+
32
−
23
Options
@@ -30,6 +30,7 @@
#include
"otbSARStreamingDEMCheckFilter.h"
#include
"otbWrapperElevationParametersHandler.h"
#include
"otbDEMHandler.h"
#include
"otbConfigurationManager.h"
#include
<iostream>
#include
<string>
@@ -119,7 +120,8 @@ private:
SetParameterRole
(
"directiontoscandeml"
,
Role_Output
);
SetDefaultParameterInt
(
"directiontoscandeml"
,
1
);
AddParameter
(
ParameterType_Group
,
"elev"
,
"Elevation parameters group"
);
AddParameter
(
ParameterType_Group
,
"elev"
,
"Elevation management"
);
SetParameterDescription
(
"elev"
,
"This group of parameters allows managing elevation values."
);
AddParameter
(
ParameterType_InputFilename
,
"elev.geoid"
,
"Input file path to Geoid."
);
SetParameterDescription
(
"elev.geoid"
,
"Input file path to Geoid."
);
@@ -134,32 +136,37 @@ private:
void
DoUpdateParameters
()
override
{
// Elevation
if
(
IsParameterEnabled
(
"elev.geoid"
)
&&
HasValue
(
"elev.geoid"
))
{
ElevationParametersHandler
::
AddElevationParameters
(
this
,
"elev"
);
std
::
string
geoid
=
GetParameterString
(
"elev.geoid"
);
otbAppLogINFO
(
<<
"elev.geoid : "
<<
geoid
);
#if OTB_VERSION_MAJOR < 8
otb
::
DEMHandler
::
Instance
()
->
ClearDEMs
();
#endif
otb
::
Wrapper
::
ElevationParametersHandler
::
SetupDEMHandlerFromElevationParameters
(
this
,
"elev"
);
otbAppLogINFO
(
<<
"Geoid used: "
<<
otb
::
Wrapper
::
ElevationParametersHandler
::
IsGeoidUsed
(
this
,
"elev"
));
otbAppLogINFO
(
<<
"Geoid active(rec): "
<<
this
->
GetParameterByKey
(
"elev.geoid"
)
->
GetActive
(
true
));
otbAppLogINFO
(
<<
"Geoid active(no rec): "
<<
this
->
GetParameterByKey
(
"elev.geoid"
)
->
GetActive
(
false
));
otbAppLogINFO
(
<<
"Geoid enabled: "
<<
this
->
IsParameterEnabled
(
"elev.geoid"
));
otbAppLogINFO
(
<<
"Geoid has value: "
<<
this
->
HasValue
(
"elev.geoid"
));
// ====[ Update Elevation information
// GEOID parameter is best taken, in priority order:
// 1. As -elev.geom
// 2. As $OTB_GEOID_FILE
// 3. As: ignored
auto
get_geoid_filename
=
[
&
]()
{
if
(
IsParameterEnabled
(
"elev.geoid"
)
&&
HasValue
(
"elev.geoid"
))
return
GetParameterString
(
"elev.geoid"
);
else
return
ConfigurationManager
::
GetGeoidFile
();
};
m_geoid_filename
=
get_geoid_filename
();
}
void
DoExecute
()
override
{
// Set elevation information
#if OTB_VERSION_MAJOR >= 8
otbAppLogINFO
(
<<
"configured geoid file: "
<<
DEMHandler
::
GetInstance
().
GetGeoidFile
());
auto
&
demHandler
=
DEMHandler
::
GetInstance
();
demHandler
.
ClearElevationParameters
();
// NO!!!!!
#else
auto
&
demHandler
=
*
DEMHandler
::
Instance
();
demHandler
.
ClearDEMs
();
#endif
otbAppLogINFO
(
<<
"Geoid file used : "
<<
(
m_geoid_filename
.
empty
()
?
"None"
:
m_geoid_filename
));
demHandler
.
SetDefaultHeightAboveEllipsoid
(
0
);
if
(
!
m_geoid_filename
.
empty
())
{
demHandler
.
OpenGeoidFile
(
m_geoid_filename
);
}
}
void
DoExecute
()
override
{
// Get No data value
int
noData
=
GetParameterInt
(
"nodata"
);
otbAppLogINFO
(
<<
"No Data : "
<<
noData
);
@@ -168,7 +175,7 @@ private:
ComplexFloatImageType
::
Pointer
SARPtr
=
GetParameterComplexFloatImage
(
"insar"
);
// DEMProjection Filter
DEMFilterType
::
Pointer
filterDEMProjection
=
DEMFilterType
::
New
();
DEMFilterType
::
Pointer
filterDEMProjection
=
DEMFilterType
::
New
(
m_geoid_filename
);
m_Ref
.
push_back
(
filterDEMProjection
.
GetPointer
());
#if OTB_VERSION_MAJOR >= 8
filterDEMProjection
->
SetSARImageMetadata
(
SARPtr
->
GetImageMetadata
());
@@ -253,6 +260,8 @@ private:
// Vector for filters
std
::
vector
<
itk
::
ProcessObject
::
Pointer
>
m_Ref
;
std
::
string
m_geoid_filename
;
};
}
Loading