Skip to content
Snippets Groups Projects
Commit 65cf3c48 authored by Gaëlle USSEGLIO's avatar Gaëlle USSEGLIO
Browse files

ENH : Update metadata API to v8

parent fe2d21cb
No related branches found
No related tags found
2 merge requests!57Update to OTB V8,!56Update to OTB v8
......@@ -132,12 +132,12 @@ void DoExecute() override
// DEMProjection Filter
DEMFilterType::Pointer filterDEMProjection = DEMFilterType::New();
m_Ref.push_back(filterDEMProjection.GetPointer());
filterDEMProjection->SetSARImageKeyWorList(SARPtr->GetImageKeywordlist());
filterDEMProjection->SetSARImageKeyWorList(SARPtr->GetImageMetadata());
// Streaming Gain Filter
DEMInfoFilterType::Pointer filterStreamingDEMInfo = DEMInfoFilterType::New();
m_Ref.push_back(filterStreamingDEMInfo.GetPointer());
filterStreamingDEMInfo->SetSARImageKeyWorList(SARPtr->GetImageKeywordlist());
filterStreamingDEMInfo->SetSARImageKeyWorList(SARPtr->GetImageMetadata());
// Streaming Check Filter (To check if DEM cover the SAR Image)
DEMCheckFilterType::Pointer filterStreamingDEMCheck = DEMCheckFilterType::New();
......
......@@ -26,7 +26,7 @@
#include "itkPoint.h"
#include "otbSarSensorModelAdapter.h"
#include "otbImageKeywordlist.h"
#include "otbImageMetadata.h"
namespace otb
{
......
......@@ -96,8 +96,8 @@ SARDEMProjectionImageFilter< TImageIn, TImageOut >
ImageInConstPointer inputPtr = this->GetInput();
ImageOutPointer outputPtr = this->GetOutput();
// Image KeyWordList
ImageKeywordlist inputKwl = inputPtr->GetImageKeywordlist();
// Image metadata
auto inputKwl = inputPtr->GetImageMetadata();
// 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.AddKey("support_data.band.L", std::to_string(1));
inputKwl.AddKey("support_data.band.C", std::to_string(0));
inputKwl.AddKey("support_data.band.Z", std::to_string(2));
inputKwl.AddKey("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.AddKey("support_data.band.XCart", std::to_string(4));
inputKwl.AddKey("support_data.band.YCart", std::to_string(5));
inputKwl.AddKey("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.AddKey("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.AddKey("support_data.band.XSatPos", std::to_string(m_indSatPos));
inputKwl.AddKey("support_data.band.YSatPos", std::to_string(m_indSatPos+1));
inputKwl.AddKey("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.AddKey("support_data.band.DirectionToScanDEMC", std::to_string(m_directionToScanDEMC));
inputKwl.AddKey("support_data.band.DirectionToScanDEML", std::to_string(m_directionToScanDEML));
inputKwl.AddKey("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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment