Merge pull request #1183 from thewtex/mesh-metadata

feat(Mesh,PolyData): add metadata member in C++
InsightSoftwareConsortium · Jul 18, 2024 · 8924f95 · 8924f95
2 parents c13cf7b + a8fdda0
commit 8924f95
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 2 deletions.
diff --git a/include/itkImageJSON.h b/include/itkImageJSON.h
@@ -63,8 +63,9 @@ namespace itk
     std::string         direction;
     std::vector<size_t> size { 0, 0 };
 
-    MetadataJSON metadata;
     std::string data;
+
+    MetadataJSON metadata;
   };
 
 template<typename TImage>

diff --git a/include/itkMeshJSON.h b/include/itkMeshJSON.h
@@ -26,6 +26,7 @@
 #include "itkFloatTypesJSON.h"
 #include "itkPixelTypesJSON.h"
 #include "itkWasmMesh.h"
+#include "itkMetaDataDictionaryJSON.h"
 
 #include "glaze/glaze.hpp"
 
@@ -74,6 +75,8 @@ namespace itk
 
     size_t numberOfCellPixels{ 0 };
     std::string cellData;
+
+    MetadataJSON metadata;
   };
 
 template<typename TMesh>
@@ -164,6 +167,9 @@ auto meshToMeshJSON(const TMesh * mesh, const WasmMesh<TMesh> * wasmMesh, bool i
     meshJSON.cellData = "data:application/vnd.itk.path,data/cell-data.raw";
   }
 
+  auto dictionary = mesh->GetMetaDataDictionary();
+  metaDataDictionaryToJSON(dictionary, meshJSON.metadata);
+
   return meshJSON;
 }
 } // end namespace itk

diff --git a/include/itkMeshToWasmMeshFilter.hxx b/include/itkMeshToWasmMeshFilter.hxx
@@ -18,6 +18,8 @@
 #ifndef itkMeshToWasmMeshFilter_hxx
 #define itkMeshToWasmMeshFilter_hxx
 
+#include "itkMetaDataDictionaryJSON.h"
+
 #include "glaze/glaze.hpp"
 
 namespace itk

diff --git a/include/itkPolyDataJSON.h b/include/itkPolyDataJSON.h
@@ -26,6 +26,7 @@
 #include "itkFloatTypesJSON.h"
 #include "itkPixelTypesJSON.h"
 #include "itkWasmPolyData.h"
+#include "itkMetaDataDictionaryJSON.h"
 
 #include "glaze/glaze.hpp"
 
@@ -79,6 +80,8 @@ namespace itk
 
     size_t numberOfCellPixels { 0 };
     std::string cellData;
+
+    MetadataJSON metadata;
   };
 
 template<typename TPolyData>
@@ -203,6 +206,9 @@ auto polyDataToPolyDataJSON(const TPolyData * polyData, bool inMemory) -> PolyDa
   cellDataStream << cellDataAddress;
   polyDataJSON.cellData = cellDataStream.str();
 
+  auto dictionary = polyData->GetMetaDataDictionary();
+  metaDataDictionaryToJSON(dictionary, polyDataJSON.metadata);
+
   return polyDataJSON;
 }
 } // end namespace itk

diff --git a/include/itkWasmMeshToMeshFilter.hxx b/include/itkWasmMeshToMeshFilter.hxx
@@ -375,7 +375,7 @@ WasmMeshToMeshFilter<TMesh>
     const std::string descriptiveError = glz::format_error(deserializedAttempt, json);
     itkExceptionMacro("Failed to deserialize meshJSON: " << descriptiveError);
   }
-  auto meshJSON = deserializedAttempt.value();
+  const auto meshJSON = deserializedAttempt.value();
 
   const auto dimension = meshJSON.meshType.dimension;
   const auto numberOfPointPixels = meshJSON.numberOfPointPixels;
@@ -482,6 +482,9 @@ WasmMeshToMeshFilter<TMesh>
     mesh->GetCellData()->resize(meshJSON.numberOfCellPixels);
     mesh->GetCellData()->assign(cellDataPtr, cellDataPtr + meshJSON.numberOfCellPixels);
   }
+
+  auto dictionary = mesh->GetMetaDataDictionary();
+  jsonToMetaDataDictionary(meshJSON.metadata, dictionary);
 }
 
 template <typename TMesh>

diff --git a/include/itkWasmPolyDataToPolyDataFilter.hxx b/include/itkWasmPolyDataToPolyDataFilter.hxx
@@ -251,6 +251,9 @@ WasmPolyDataToPolyDataFilter<TPolyData>
     polyData->GetCellData()->resize(numberOfCellPixels * cellPixelComponents);
     polyData->GetCellData()->assign(cellDataPtr, cellDataPtr + numberOfCellPixels * cellPixelComponents);
   }
+
+  auto dictionary = polyData->GetMetaDataDictionary();
+  jsonToMetaDataDictionary(polyDataJSON.metadata, dictionary);
 }
 
 template <typename TPolyData>