Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
diapotb
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
Container Registry
Model registry
Operate
Environments
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
Remote Modules
diapotb
Commits
65cf3c48
Commit
65cf3c48
authored
3 years ago
by
Gaëlle USSEGLIO
Browse files
Options
Downloads
Patches
Plain Diff
ENH : Update metadata API to v8
parent
fe2d21cb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!57
Update to OTB V8
,
!56
Update to OTB v8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/otbSARDEMProjection.cxx
+2
-2
2 additions, 2 deletions
app/otbSARDEMProjection.cxx
include/otbSARDEMProjectionImageFilter.h
+1
-1
1 addition, 1 deletion
include/otbSARDEMProjectionImageFilter.h
include/otbSARDEMProjectionImageFilter.txx
+16
-16
16 additions, 16 deletions
include/otbSARDEMProjectionImageFilter.txx
with
19 additions
and
19 deletions
app/otbSARDEMProjection.cxx
+
2
−
2
View file @
65cf3c48
...
...
@@ -132,12 +132,12 @@ void DoExecute() override
// DEMProjection Filter
DEMFilterType
::
Pointer
filterDEMProjection
=
DEMFilterType
::
New
();
m_Ref
.
push_back
(
filterDEMProjection
.
GetPointer
());
filterDEMProjection
->
SetSARImageKeyWorList
(
SARPtr
->
GetImage
Keywordlist
());
filterDEMProjection
->
SetSARImageKeyWorList
(
SARPtr
->
GetImage
Metadata
());
// Streaming Gain Filter
DEMInfoFilterType
::
Pointer
filterStreamingDEMInfo
=
DEMInfoFilterType
::
New
();
m_Ref
.
push_back
(
filterStreamingDEMInfo
.
GetPointer
());
filterStreamingDEMInfo
->
SetSARImageKeyWorList
(
SARPtr
->
GetImage
Keywordlist
());
filterStreamingDEMInfo
->
SetSARImageKeyWorList
(
SARPtr
->
GetImage
Metadata
());
// Streaming Check Filter (To check if DEM cover the SAR Image)
DEMCheckFilterType
::
Pointer
filterStreamingDEMCheck
=
DEMCheckFilterType
::
New
();
...
...
This diff is collapsed.
Click to expand it.
include/otbSARDEMProjectionImageFilter.h
+
1
−
1
View file @
65cf3c48
...
...
@@ -26,7 +26,7 @@
#include
"itkPoint.h"
#include
"otbSarSensorModelAdapter.h"
#include
"otbImage
Keywordlist
.h"
#include
"otbImage
Metadata
.h"
namespace
otb
{
...
...
This diff is collapsed.
Click to expand it.
include/otbSARDEMProjectionImageFilter.txx
+
16
−
16
View file @
65cf3c48
...
...
@@ -96,8 +96,8 @@ SARDEMProjectionImageFilter< TImageIn, TImageOut >
ImageInConstPointer inputPtr = this->GetInput();
ImageOutPointer outputPtr = this->GetOutput();
// Image
KeyWordList
ImageKeywordlist
inputKwl = inputPtr->GetImage
Keywordlist
();
// Image
metadata
auto
inputKwl = inputPtr->GetImage
Metadata
();
// Set the number of Components for the Output VectorImage
// At Least 4 Components :
...
...
@@ -118,19 +118,19 @@ SARDEMProjectionImageFilter< TImageIn, TImageOut >
// m_withSatPos = true => 3 Three components added : Satellite Position into cartesian
// Fill KeyWordList
inputKwl.Add
Key("support_data.
band.L", std::to_string(1));
inputKwl.Add
Key("support_data.
band.C", std::to_string(0));
inputKwl.Add
Key("support_data.
band.Z", std::to_string(2));
inputKwl.Add
Key("support_data.
band.Y", std::to_string(3));
inputKwl.Add
(std::string("
band.L"
)
, std::to_string(1));
inputKwl.Add
(std::string("
band.C"
)
, std::to_string(0));
inputKwl.Add
(std::string("
band.Z"
)
, std::to_string(2));
inputKwl.Add
(std::string("
band.
.
Y"
)
, std::to_string(3));
m_NbComponents = 4;
if (m_withXYZ)
{
m_NbComponents += 3;
inputKwl.Add
Key("support_data.
band.XCart", std::to_string(4));
inputKwl.Add
Key("support_data.
band.YCart", std::to_string(5));
inputKwl.Add
Key("support_data.
band.ZCart", std::to_string(6));
inputKwl.Add
(std::string("
band.XCart"
)
, std::to_string(4));
inputKwl.Add
(std::string("
band.YCart"
)
, std::to_string(5));
inputKwl.Add
(std::string("
band.ZCart"
)
, std::to_string(6));
}
if (m_withH)
{
...
...
@@ -138,22 +138,22 @@ SARDEMProjectionImageFilter< TImageIn, TImageOut >
m_indH = m_NbComponents;
m_NbComponents += 1;
inputKwl.Add
Key("support_data.
band.H", std::to_string(m_indH));
inputKwl.Add
(std::string("
band.H"
)
, std::to_string(m_indH));
}
if (m_withSatPos)
{
m_indSatPos = m_NbComponents;
m_NbComponents += 3;
inputKwl.Add
Key("support_data.
band.XSatPos", std::to_string(m_indSatPos));
inputKwl.Add
Key("support_data.
band.YSatPos", std::to_string(m_indSatPos+1));
inputKwl.Add
Key("support_data.
band.ZSatPos", std::to_string(m_indSatPos+2));
inputKwl.Add
(std::string("
band.XSatPos"
)
, std::to_string(m_indSatPos));
inputKwl.Add
(std::string("
band.YSatPos"
)
, std::to_string(m_indSatPos+1));
inputKwl.Add
(std::string("
band.ZSatPos"
)
, std::to_string(m_indSatPos+2));
}
// Add gain and direction into kwl
inputKwl.Add
Key("support_data.
band.DirectionToScanDEMC", std::to_string(m_directionToScanDEMC));
inputKwl.Add
Key("support_data.
band.DirectionToScanDEML", std::to_string(m_directionToScanDEML));
inputKwl.Add
Key("support_data.
band.Gain", std::to_string(m_gain));
inputKwl.Add
(std::string("
band.DirectionToScanDEMC"
)
, std::to_string(m_directionToScanDEMC));
inputKwl.Add
(std::string("
band.DirectionToScanDEML"
)
, std::to_string(m_directionToScanDEML));
inputKwl.Add
(std::string("
band.
.
Gain"
)
, std::to_string(m_gain));
outputPtr->SetNumberOfComponentsPerPixel(m_NbComponents);
...
...
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