Merge branch 'wasm-mesh-io'

Author: thewtex

include/itkImageToJSONFilter.hxx

@@ -180,7 +180,7 @@ ImageToJSONFilter<TImage>
 
   const auto direction = reinterpret_cast< size_t >( image->GetDirection().GetVnlMatrix().begin() );
   std::ostringstream directionStream;
-  directionStream << "address:";
+  directionStream << "data:application/vnd.itk.address,";
   directionStream << direction;
   rapidjson::Value directionString;
   directionString.SetString( directionStream.str().c_str(), allocator );
@@ -197,7 +197,7 @@ ImageToJSONFilter<TImage>
 
   const auto data = reinterpret_cast< size_t >( image->GetBufferPointer() );
   std::ostringstream dataStream;
-  dataStream << "address:";
+  dataStream << "data:application/vnd.itk.address,";
   dataStream << data;
   rapidjson::Value dataString;
   dataString.SetString( dataStream.str().c_str(), allocator );

include/itkJSONFromMesh.h

@@ -27,6 +27,8 @@ namespace itk
  *\class JSONToImageFilter
  * \brief Convert an ImageJSON to an Image object.
  * 
+ * TImage must match the type stored in the JSON representation or an exception will be shown.
+ * 
  * \ingroup WebAssemblyInterface
  */
 template <typename TImage>

include/itkJSONToImageFilter.h

@@ -195,7 +195,7 @@ JSONToImageFilter<TImage>
   using DirectionType = typename ImageType::DirectionType;
   const rapidjson::Value & directionJson = document["direction"];
   const std::string directionString( directionJson.GetString() );
-  const double * directionPtr = reinterpret_cast< double * >( std::atol(directionString.substr(8).c_str()) );
+  const double * directionPtr = reinterpret_cast< double * >( std::atol(directionString.substr(33).c_str()) );
   using VnlMatrixType = typename DirectionType::InternalMatrixType;
   const VnlMatrixType vnlMatrix(directionPtr);
   const DirectionType direction(vnlMatrix);
@@ -219,7 +219,7 @@ JSONToImageFilter<TImage>
 
   const rapidjson::Value & dataJson = document["data"];
   const std::string dataString( dataJson.GetString() );
-  PixelType * dataPtr = reinterpret_cast< PixelType * >( std::atol(dataString.substr(8).c_str()) );
+  PixelType * dataPtr = reinterpret_cast< PixelType * >( std::atol(dataString.substr(33).c_str()) );
   const bool letImageContainerManageMemory = false;
   filter->SetImportPointer( dataPtr, totalSize, letImageContainerManageMemory );
 

include/itkJSONToImageFilter.hxx

@@ -0,0 +1,104 @@
+/*=========================================================================
+ *
+ *  Copyright NumFOCUS
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *=========================================================================*/
+#ifndef itkJSONToMeshFilter_h
+#define itkJSONToMeshFilter_h
+
+#include "itkProcessObject.h"
+#include "itkMeshJSON.h"
+
+namespace itk
+{
+/**
+ *\class JSONToMeshFilter
+ * \brief Convert an MeshJSON to an Mesh object.
+ * 
+ * TMesh must match the type stored in the JSON representation or an exception will be shown.
+ * 
+ * \ingroup WebAssemblyInterface
+ */
+template <typename TMesh>
+class ITK_TEMPLATE_EXPORT JSONToMeshFilter : public ProcessObject
+{
+public:
+  ITK_DISALLOW_COPY_AND_MOVE(JSONToMeshFilter);
+
+  /** Standard class type aliases. */
+  using Self = JSONToMeshFilter;
+  using Superclass = ProcessObject;
+  using Pointer = SmartPointer<Self>;
+  using ConstPointer = SmartPointer<const Self>;
+
+  /** Method for creation through the object factory. */
+  itkNewMacro(Self);
+
+  /** Run-time type information (and related methods). */
+  itkTypeMacro(JSONToMeshFilter, ProcessObject);
+
+  using DataObjectIdentifierType = Superclass::DataObjectIdentifierType;
+  using DataObjectPointerArraySizeType = Superclass::DataObjectPointerArraySizeType;
+
+  using MeshType = TMesh;
+  using MeshJSONType = MeshJSON<MeshType>;
+
+  /** Set/Get the path input of this process object.  */
+  using Superclass::SetInput;
+  virtual void
+  SetInput(const MeshJSONType * mesh);
+
+  virtual void
+  SetInput(unsigned int, const MeshJSONType * mesh);
+
+  const MeshJSONType *
+  GetInput();
+
+  const MeshJSONType *
+  GetInput(unsigned int idx);
+
+  MeshType *
+  GetOutput();
+  const MeshType *
+  GetOutput() const;
+
+  MeshType *
+  GetOutput(unsigned int idx);
+
+protected:
+  JSONToMeshFilter();
+  ~JSONToMeshFilter() override = default;
+
+  ProcessObject::DataObjectPointer
+  MakeOutput(ProcessObject::DataObjectPointerArraySizeType idx) override;
+  ProcessObject::DataObjectPointer
+  MakeOutput(const ProcessObject::DataObjectIdentifierType &) override;
+
+  void
+  GenerateOutputInformation() override
+  {} // do nothing
+  void
+  GenerateData() override;
+
+  void
+  PrintSelf(std::ostream & os, Indent indent) const override;
+};
+} // end namespace itk
+
+#ifndef ITK_MANUAL_INSTANTIATION
+#  include "itkJSONToMeshFilter.hxx"
+#endif
+
+#endif