feat(itkwasm): Add PointSet, PointSetType

thewtex · thewtex · commit 7113730eb69c · 2022-05-21T22:06:37.000-04:00
diff --git a/src/python/itkwasm/__init__.py b/src/python/itkwasm/__init__.py
@@ -1,13 +1,16 @@
 """itkwasm: Python interface to itk-wasm WebAssembly modules."""
 
-__version__ = "1.0a0"
+__version__ = "1.0b0"
 
 from .image import Image, ImageType
 from .mesh import Mesh, MeshType
+from .pointset import PointSet, PointSetType
 
 __all__ = [
   "Image",
   "ImageType",
   "Mesh",
   "MeshType",
+  "PointSet",
+  "PointSetType",
 ]
diff --git a/src/python/itkwasm/mesh.py b/src/python/itkwasm/mesh.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from typing import Sequence, Optional
+from typing import Optional
 
 try:
     from numpy.typing import ArrayLike
diff --git a/src/python/itkwasm/pointset.py b/src/python/itkwasm/pointset.py
@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+
+from typing import Optional
+
+try:
+    from numpy.typing import ArrayLike
+except ImportError:
+    from numpy import ndarray as ArrayLike
+
+@dataclass
+class PointSetType:
+    dimension: int
+
+    pointComponentType: str
+    pointPixelComponentType: str
+    pointPixelType: str
+    pointPixelComponents: int
+
+
+@dataclass
+class PointSet:
+    pointSetType: PointSetType
+
+    name: str
+
+    numberOfPoints: int
+    points: Optional[ArrayLike]
+
+    numberOfPointPixels: int
+    pointData: Optional[ArrayLike]
diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml
@@ -28,6 +28,7 @@ dynamic = ["version", "description"]
 
 requires-python = ">=3.7"
 dependencies = [
+    "numpy",
 ]
 
 [project.urls]
diff --git a/src/python/test/test_mesh.py b/src/python/test/test_mesh.py
@@ -21,6 +21,7 @@ def test_mesh():
     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"]
diff --git a/src/python/test/test_pointset.py b/src/python/test/test_pointset.py
@@ -0,0 +1,43 @@
+import itk
+
+from itkwasm import PointSet
+from dataclasses import asdict
+import numpy as np
+
+def test_pointset():
+    n_points = 5
+    dimension = 3
+
+    PointSetType = itk.PointSet[itk.F, dimension]
+    pointset = PointSetType.New()
+
+    points = np.random.random((n_points, dimension)).astype(np.float32)
+    pointset.SetPoints(itk.vector_container_from_array(points.ravel()))
+
+    point_data = np.random.random((n_points,)).astype(np.float32)
+    pointset.SetPointData(itk.vector_container_from_array(point_data.ravel()))
+    
+    itk_pointset_dict = itk.dict_from_pointset(pointset)
+    # Bug, to be fixed by 5.3.0
+    itk_pointset_dict.pop('dimension', None)
+    itkwasm_pointset = PointSet(**itk_pointset_dict)
+    itkwasm_pointset_dict = asdict(itkwasm_pointset)
+    itk_pointset_roundtrip = itk.pointset_from_dict(itkwasm_pointset_dict)
+    itk_pointset_roundtrip_dict = itk.dict_from_pointset(itk_pointset_roundtrip)
+    
+    pointSetType = itk_pointset_dict["pointSetType"]
+    pointSetType_roundtrip = itk_pointset_roundtrip_dict["pointSetType"]
+    assert pointSetType["dimension"] == pointSetType_roundtrip["dimension"]
+
+    assert pointSetType["pointComponentType"] == pointSetType_roundtrip["pointComponentType"]
+    assert pointSetType["pointPixelComponentType"] == pointSetType_roundtrip["pointPixelComponentType"]
+    assert pointSetType["pointPixelType"] == pointSetType_roundtrip["pointPixelType"]
+    assert pointSetType["pointPixelComponents"] == pointSetType_roundtrip["pointPixelComponents"]
+
+    assert itk_pointset_dict["name"] == itk_pointset_roundtrip_dict["name"]
+
+    assert itk_pointset_dict["numberOfPoints"] == itk_pointset_roundtrip_dict["numberOfPoints"]
+    assert np.array_equal(itk_pointset_dict["points"], itk_pointset_roundtrip_dict["points"])
+
+    assert itk_pointset_dict["numberOfPointPixels"] == itk_pointset_roundtrip_dict["numberOfPointPixels"]
+    assert np.array_equal(itk_pointset_dict["pointData"], itk_pointset_roundtrip_dict["pointData"])

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ dynamic = ["version", "description"]`
`28`	`28`
`29`	`29`	`requires-python = ">=3.7"`
`30`	`30`	`dependencies = [`
	`31`	`+ "numpy",`
`31`	`32`	`]`
`32`	`33`
`33`	`34`	`[project.urls]`