Add ability to name dataset

PDAL · Feb 4, 2020 · fb42543 · fb42543
1 parent 8d4b419
commit fb42543
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/plugins/hdf/io/Hdf5Handler.cpp b/plugins/hdf/io/Hdf5Handler.cpp
@@ -69,10 +69,12 @@ Hdf5Handler::Hdf5Handler()
 
 void Hdf5Handler::initialize(
         const std::string& filename,
+        const std::string& dimName,
         const std::string& datasetName)
 {
     try
     {
+        std::cout << "Dim name: " << dimName << std::endl;
         m_h5File.reset(new H5::H5File(filename, H5F_ACC_RDONLY));
 
         std::cout << "Number of HD5 Objects: " << m_h5File.get()->getObjCount() <<std::endl;
@@ -94,7 +96,7 @@ void Hdf5Handler::initialize(
                 case H5T_INTEGER:
                     if(int_type.getSign() == H5T_SGN_NONE) {
                         m_dimInfos.push_back(DimInfo(
-                            datasetName,
+                            dimName.empty() ? datasetName : dimName,
                             vauge_type,
                             int_type.getOrder(),
                             int_type.getSign(),
@@ -106,7 +108,7 @@ void Hdf5Handler::initialize(
                         std::cout << "uint,  s:" << int_type.getSize() << ", e:" << int_type.getOrder();
                     } else if(int_type.getSign() == H5T_SGN_2) {
                         m_dimInfos.push_back(DimInfo(
-                            datasetName,
+                            dimName.empty() ? datasetName : dimName,
                             vauge_type,
                             int_type.getOrder(),
                             int_type.getSign(),
@@ -122,7 +124,7 @@ void Hdf5Handler::initialize(
                     break;
                 case H5T_FLOAT:
                     m_dimInfos.push_back(DimInfo(
-                        datasetName,
+                        dimName.empty() ? datasetName : dimName,
                         vauge_type,
                         float_type.getOrder(),
                         H5T_SGN_ERROR,

diff --git a/plugins/hdf/io/Hdf5Handler.hpp b/plugins/hdf/io/Hdf5Handler.hpp
@@ -104,6 +104,7 @@ class Hdf5Handler
 
     void initialize(
             const std::string& filename,
+            const std::string& dimName,
             const std::string& datasetName);
             // const std::vector<hdf5::Hdf5ColumnData>& columns);
     void close();

diff --git a/plugins/hdf/io/HdfReader.cpp b/plugins/hdf/io/HdfReader.cpp
@@ -264,6 +264,7 @@ void HdfReader::addArgs(ProgramArgs& args)
 {
     // args.add("metadata", "Metadata file", m_metadataFile);
     args.add("dataset", "HDF dataset to open", m_datasetName);
+    args.add("name", "PDAL Dimension name of the selected dataset", m_dimName);
 }
 
 void HdfReader::initialize()
@@ -273,7 +274,7 @@ void HdfReader::initialize()
     {
         throwError("Invalid metadata file: '" + m_metadataFile + "'");
     }
-    m_hdf5Handler.initialize(m_filename, m_datasetName);
+    m_hdf5Handler.initialize(m_filename, m_dimName, m_datasetName);
 
     // Data are WGS84 (4326) with ITRF2000 datum (6656)
     // See http://nsidc.org/data/docs/daac/icebridge/ilvis2/index.html for

diff --git a/plugins/hdf/io/HdfReader.hpp b/plugins/hdf/io/HdfReader.hpp
@@ -68,6 +68,7 @@ class PDAL_DLL HdfReader : public pdal::Reader
 
     std::string m_metadataFile;
     std::string m_datasetName;
+    std::string m_dimName;
     Dimension::IdList m_idlist;
     std::vector<hdf5::DimInfo> m_infos;