itkwasm-elastix-emscripten 0.4.0__tar.gz → 1.0.0__tar.gz

{itkwasm_elastix_emscripten-0.4.0 → itkwasm_elastix_emscripten-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itkwasm-elastix-emscripten
-Version: 0.4.0
+Version: 1.0.0
 Dynamic: Summary
 Project-URL: Home, https://github.com/InsightSoftwareConsortium/ITKElastix
 Project-URL: Source, https://github.com/InsightSoftwareConsortium/ITKElastix
@@ -20,8 +20,9 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
-Requires-Dist: itkwasm>=1.0.b178
+Requires-Dist: itkwasm>=1.0.b191
 Provides-Extra: test
 Requires-Dist: hatch<2,>=1.12.0; extra == 'test'
 Requires-Dist: pyodide-py<0.27,>=0.26.2; extra == 'test'

{itkwasm_elastix_emscripten-0.4.0 → itkwasm_elastix_emscripten-1.0.0}/itkwasm_elastix_emscripten/__init__.py

@@ -5,6 +5,7 @@
 from .default_parameter_map_async import default_parameter_map_async
 from .elastix_async import elastix_async
 from .read_parameter_files_async import read_parameter_files_async
+from .transformix_async import transformix_async
 from .write_parameter_files_async import write_parameter_files_async
 
 from ._version import __version__

itkwasm_elastix_emscripten-1.0.0/itkwasm_elastix_emscripten/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

{itkwasm_elastix_emscripten-0.4.0 → itkwasm_elastix_emscripten-1.0.0}/itkwasm_elastix_emscripten/elastix_async.py

@@ -14,25 +14,21 @@ from itkwasm.pyodide import (
 from itkwasm import (
     InterfaceTypes,
     Image,
-    BinaryFile,
+    TransformList,
 )
 
 async def elastix_async(
     parameter_object: Any,
-    transform: str,
     fixed: Optional[Image] = None,
     moving: Optional[Image] = None,
-    initial_transform: Optional[os.PathLike] = None,
+    initial_transform: Optional[TransformList] = None,
     initial_transform_parameter_object: Optional[Any] = None,
-) -> Tuple[Image, Any]:
+) -> Tuple[Image, TransformList, Any]:
     """Rigid and non-rigid registration of images.
 
     :param parameter_object: Elastix parameter object representation
     :type  parameter_object: Any
 
-    :param transform: Fixed-to-moving transform file
-    :type  transform: str
-
     :param fixed: Fixed image
     :type  fixed: Image
 
@@ -40,7 +36,7 @@ async def elastix_async(
     :type  moving: Image
 
     :param initial_transform: Initial transform to apply before registration
-    :type  initial_transform: os.PathLike
+    :type  initial_transform: TransformList
 
     :param initial_transform_parameter_object: Initial elastix transform parameter object to apply before registration. Only provide this or an initial transform.
     :type  initial_transform_parameter_object: Any
@@ -48,6 +44,9 @@ async def elastix_async(
     :return: Resampled moving image
     :rtype:  Image
 
+    :return: Fixed-to-moving transform file
+    :rtype:  TransformList
+
     :return: Elastix optimized transform parameter object representation
     :rtype:  Any
     """
@@ -60,11 +59,11 @@ async def elastix_async(
     if moving is not None:
         kwargs["moving"] = to_js(moving)
     if initial_transform is not None:
-        kwargs["initialTransform"] = to_js(BinaryFile(initial_transform))
+        kwargs["initialTransform"] = to_js(initial_transform)
     if initial_transform_parameter_object is not None:
         kwargs["initialTransformParameterObject"] = to_js(initial_transform_parameter_object)
 
-    outputs = await js_module.elastix(to_js(parameter_object), to_js(transform), webWorker=web_worker, noCopy=True, **kwargs)
+    outputs = await js_module.elastix(to_js(parameter_object), webWorker=web_worker, noCopy=True, **kwargs)
 
     output_web_worker = None
     output_list = []