Commit a0931e22 authored by Emmanuel Christophe's avatar Emmanuel Christophe

ENH: start integration of VectorDataKeywordlist

parent ac6354ea
......@@ -24,12 +24,14 @@
#include <typeinfo>
#include <cassert>
#include "otbMacro.h"
#include "itkMetaDataObject.h"
#include "otbImageMetadataInterface.h"
#include "otbImageKeywordlist.h"
#include "otbVectorDataKeywordlist.h"
#include "otbMacro.h"
namespace otb
{
......@@ -554,6 +556,7 @@ ImageMetadataInterface::PrintSelf(std::ostream& os, itk::Indent indent, const Me
double dvalue = 0.;
OTB_GCP gcpvalue;
ImageKeywordlist ossimvalue;
// VectorDataKeywordlist vectorDataMetaDataValue;
unsigned int i(0);
// Copy of the const metadata dictionary in a metadata dictionary to be used
......@@ -607,6 +610,12 @@ ImageMetadataInterface::PrintSelf(std::ostream& os, itk::Indent indent, const Me
ossimvalue.Print(os);
// ossimvalue.Print(os);
break;
// case MetaDataKey::TVECTORDATAKEYWORDLIST:
// itk::ExposeMetaData<ImageKeywordlist>(dict2, keys[itkey], vectorDataMetaDataValue);
//
// os << indent << "---> " << keys[itkey] << std::endl;
// vectorDataMetaDataValue.Print(os);
// break;
}
}
......
......@@ -23,7 +23,7 @@
#include "otbMetaDataKey.h"
#define NBKEYS 15
#define NBKEYS 19
namespace otb
{
......@@ -54,6 +54,9 @@ const std::string MetaDataKey::ColorEntryAsRGBKey = "ColorEntryAsRGB";
const std::string MetaDataKey::OSSIMKeywordlistKey = "OSSIMKeywordlist";
const std::string MetaDataKey::OSSIMKeywordlistDelimiterKey = "OSSIMKeywordlistDelimiter";
const std::string MetaDataKey::VectorDataKeywordlistKey = "VectorDataKeywordlist";
const std::string MetaDataKey::VectorDataKeywordlistDelimiterKey = "VectorDataKeywordlistDelimiter";
/*const MetaDataKey::KeyTypeDef Types[] =
{
{MetaDataKey::DriverShortNameKey, MetaDataKey::TSTRING},
......@@ -92,7 +95,9 @@ const MetaDataKey::KeyTypeDef Types[] =
MetaDataKey::KeyTypeDef(MetaDataKey::ColorEntryCountKey, MetaDataKey::TENTIER),
MetaDataKey::KeyTypeDef(MetaDataKey::ColorEntryAsRGBKey, MetaDataKey::TVECTOR),
MetaDataKey::KeyTypeDef(MetaDataKey::OSSIMKeywordlistKey, MetaDataKey::TOSSIMKEYWORDLIST),
MetaDataKey::KeyTypeDef(MetaDataKey::OSSIMKeywordlistDelimiterKey,MetaDataKey::TSTRING)
MetaDataKey::KeyTypeDef(MetaDataKey::OSSIMKeywordlistDelimiterKey,MetaDataKey::TSTRING),
MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistKey, MetaDataKey::TVECTORDATAKEYWORDLIST),
MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistDelimiterKey,MetaDataKey::TSTRING)
};
......
......@@ -74,6 +74,9 @@ public:
static const std::string OSSIMKeywordlistKey;
static const std::string OSSIMKeywordlistDelimiterKey;
static const std::string VectorDataKeywordlistKey;
static const std::string VectorDataKeywordlistDelimiterKey;
enum KeyType
{
TSTRING,
......@@ -82,6 +85,7 @@ public:
TOTB_GCP,
TVECTOR,
TOSSIMKEYWORDLIST,
TVECTORDATAKEYWORDLIST,
};
/*
typedef struct
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment