feat(itkwasm): Mesh, MeshType

thewtex · thewtex · commit b2164f36e00d · 2022-05-21T22:06:33.000-04:00
diff --git a/doc/content/api/Mesh.md b/doc/content/api/Mesh.md
@@ -5,7 +5,6 @@ An `Mesh` is the N-dimensional data structure to represent points sets and meshe
 
 **meshType**: The [MeshType](./MeshType.html) for this mesh.
 **name**: An optional name, a `String`, that describes this mesh.
-**dimension**: An integer that describes the dimension for the mesh, typically 2 or 3.
 **numberOfPoints**: The number of points in the mesh.
 **points**: A [TypedArray](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray) containing the point locations.
 **numberOfPointPixels**: The number of points pixels in the mesh.
diff --git a/src/core/Image.ts b/src/core/Image.ts
@@ -3,7 +3,7 @@ import type TypedArray from './TypedArray.js'
 import setMatrixElement from './setMatrixElement.js'
 
 class Image {
-  name: string = 'Image'
+  name: string = 'image'
 
   origin: number[]
 
diff --git a/src/core/Mesh.ts b/src/core/Mesh.ts
@@ -22,7 +22,7 @@ class Mesh {
   constructor (public readonly mt = new MeshType()) {
     this.meshType = mt
 
-    this.name = 'Mesh'
+    this.name = 'mesh'
 
     this.numberOfPoints = 0
     this.points = null
diff --git a/src/python/itkwasm/__init__.py b/src/python/itkwasm/__init__.py
@@ -3,8 +3,11 @@
 __version__ = "1.0a0"
 
 from .image import Image, ImageType
+from .mesh import Mesh, MeshType
 
 __all__ = [
   "Image",
   "ImageType",
+  "Mesh",
+  "MeshType",
 ]
diff --git a/src/python/itkwasm/mesh.py b/src/python/itkwasm/mesh.py
@@ -0,0 +1,42 @@
+from dataclasses import dataclass
+
+from typing import Sequence, Optional
+
+try:
+    from numpy.typing import ArrayLike
+except ImportError:
+    from numpy import ndarray as ArrayLike
+
+@dataclass
+class MeshType:
+    dimension: int
+
+    pointComponentType: str
+    pointPixelComponentType: str
+    pointPixelType: str
+    pointPixelComponents: int
+
+    cellComponentType: str
+    cellPixelComponentType: str
+    cellPixelType: str
+    cellPixelComponents: int
+
+
+@dataclass
+class Mesh:
+    meshType: MeshType
+
+    name: str
+
+    numberOfPoints: int
+    points: Optional[ArrayLike]
+
+    numberOfPointPixels: int
+    pointData: Optional[ArrayLike]
+
+    numberOfCells: int
+    cells: Optional[ArrayLike]
+    cellBufferSize: int
+
+    numberOfCellPixels: int
+    cellData: Optional[ArrayLike]
diff --git a/src/python/test/input/cow.vtk b/src/python/test/input/cow.vtk
diff --git a/src/python/test/test_image.py b/src/python/test/test_image.py
@@ -7,11 +7,11 @@
 import numpy as np
 
 def test_image():
-  data = Path(__file__).absolute().parent / "input" / "cthead1.png"
-  itk_image = itk.imread(data, itk.UC)
-  itk_image_dict = itk.dict_from_image(itk_image)
-  itkwasm_image = Image(**itk_image_dict)
-  itkwasm_image_dict = asdict(itkwasm_image)
-  itk_image_roundtrip = itk.image_from_dict(itkwasm_image_dict)
-  difference = np.sum(itk.comparison_image_filter(itk_image, itk_image_roundtrip))
-  assert difference == 0.0
+    data = Path(__file__).absolute().parent / "input" / "cthead1.png"
+    itk_image = itk.imread(data, itk.UC)
+    itk_image_dict = itk.dict_from_image(itk_image)
+    itkwasm_image = Image(**itk_image_dict)
+    itkwasm_image_dict = asdict(itkwasm_image)
+    itk_image_roundtrip = itk.image_from_dict(itkwasm_image_dict)
+    difference = np.sum(itk.comparison_image_filter(itk_image, itk_image_roundtrip))
+    assert difference == 0.0
diff --git a/src/python/test/test_mesh.py b/src/python/test/test_mesh.py
@@ -0,0 +1,47 @@
+from pathlib import Path
+
+import itk
+
+from itkwasm import Mesh
+from dataclasses import asdict
+import numpy as np
+
+def test_mesh():
+    data = Path(__file__).absolute().parent / "input" / "cow.vtk"
+    itk_mesh = itk.meshread(data)
+
+    itk_mesh_dict = itk.dict_from_mesh(itk_mesh)
+    # Bug, to be fixed by 5.3.0
+    itk_mesh_dict.pop('dimension', None)
+    itkwasm_mesh = Mesh(**itk_mesh_dict)
+    itkwasm_mesh_dict = asdict(itkwasm_mesh)
+    itk_mesh_roundtrip = itk.mesh_from_dict(itkwasm_mesh_dict)
+    itk_mesh_roundtrip_dict = itk.dict_from_mesh(itk_mesh_roundtrip)
+
+    meshType = itk_mesh_dict["meshType"]
+    meshType_roundtrip = itk_mesh_roundtrip_dict["meshType"]
+    assert meshType["dimension"] == meshType_roundtrip["dimension"]
+    assert meshType["pointComponentType"] == meshType_roundtrip["pointComponentType"]
+    assert meshType["pointPixelComponentType"] == meshType_roundtrip["pointPixelComponentType"]
+    assert meshType["pointPixelType"] == meshType_roundtrip["pointPixelType"]
+    assert meshType["pointPixelComponents"] == meshType_roundtrip["pointPixelComponents"]
+
+    assert meshType["cellComponentType"] == meshType_roundtrip["cellComponentType"]
+    assert meshType["cellPixelComponentType"] == meshType_roundtrip["cellPixelComponentType"]
+    assert meshType["cellPixelType"] == meshType_roundtrip["cellPixelType"]
+    assert meshType["cellPixelComponents"] == meshType_roundtrip["cellPixelComponents"]
+
+    assert itk_mesh_dict["name"] == itk_mesh_roundtrip_dict["name"]
+
+    assert itk_mesh_dict["numberOfPoints"] == itk_mesh_roundtrip_dict["numberOfPoints"]
+    assert np.array_equal(itk_mesh_dict["points"], itk_mesh_roundtrip_dict["points"])
+
+    assert itk_mesh_dict["numberOfPointPixels"] == itk_mesh_roundtrip_dict["numberOfPointPixels"]
+    assert np.array_equal(itk_mesh_dict["pointData"], itk_mesh_roundtrip_dict["pointData"])
+
+    assert itk_mesh_dict["numberOfCells"] == itk_mesh_roundtrip_dict["numberOfCells"]
+    assert np.array_equal(itk_mesh_dict["cells"], itk_mesh_roundtrip_dict["cells"])
+    assert itk_mesh_dict["cellBufferSize"] == itk_mesh_roundtrip_dict["cellBufferSize"]
+
+    assert itk_mesh_dict["numberOfCellPixels"] == itk_mesh_roundtrip_dict["numberOfCellPixels"]
+    assert np.array_equal(itk_mesh_dict["cellData"], itk_mesh_roundtrip_dict["cellData"])
