From 933b9fa43a8df9d1608642db9c2077d934a02bd2 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 10 Sep 2019 22:23:09 -0400 Subject: [PATCH 1/4] ENH: Build against ITK v5.1b01 --- setup.py | 4 ++-- test/azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index d82f5e25..4651f0f4 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name='itk-elastix', - version='0.1.0', + version='0.2.0', author='Insight Software Consortium', author_email='itk+community@discourse.itk.org', packages=['itk'], @@ -44,6 +44,6 @@ keywords='ITK InsightToolkit', url=r'https://itk.org/', install_requires=[ - r'itk>=5.0.0.post1' + r'itk>=5.1b01' ] ) diff --git a/test/azure-pipelines.yml b/test/azure-pipelines.yml index 07de04c3..35783768 100644 --- a/test/azure-pipelines.yml +++ b/test/azure-pipelines.yml @@ -1,6 +1,6 @@ variables: - ITKGitTag: v5.0.1 - ITKPythonGitTag: v5.0.1 + ITKGitTag: v5.1b01 + ITKPythonGitTag: v5.1b01 CMakeBuildType: Release trigger: From 720b13814c8da84cf63f739deaa3eec46a6553c6 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 10 Sep 2019 22:24:24 -0400 Subject: [PATCH 2/4] DOC: Document NumPy array support --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index ca9a567d..c318c9c1 100644 --- a/README.rst +++ b/README.rst @@ -39,6 +39,7 @@ image:: import itk + # The fixed and moving image can be an itk.Image or a numpy.ndarray fixed_image = itk.imread('path/to/fixed_image.mha') moving_image = itk.imread('path/to/moving_image.mha') From 6ed7dd726773c00a5929c778dd1b974f4d032eb6 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 11 Sep 2019 01:52:50 -0400 Subject: [PATCH 3/4] BUG: Do not set FixedImage as PrimaryInput and RequiredInput SetPrimaryInputName( "FixedImage", 0 ) calls AddRequiredInputName( "FixedImage", 0 ) --- include/itkElastixRegistrationMethod.hxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/itkElastixRegistrationMethod.hxx b/include/itkElastixRegistrationMethod.hxx index 4a1f7f32..17eff930 100644 --- a/include/itkElastixRegistrationMethod.hxx +++ b/include/itkElastixRegistrationMethod.hxx @@ -48,11 +48,8 @@ ElastixRegistrationMethod< TFixedImage, TMovingImage > this->SetPrimaryInputName( "FixedImage" ); this->SetPrimaryOutputName( "ResultImage" ); - this->AddRequiredInputName( "FixedImage", 0 ); this->AddRequiredInputName( "MovingImage", 1 ); this->AddRequiredInputName( "ParameterObject", 2 ); - this->SetNumberOfRequiredInputs( 3 ); - this->m_InitialTransformParameterFileName = ""; this->m_FixedPointSetFileName = ""; From ea53c8b06b4862ced08a22819427164f4463eb9c Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 11 Sep 2019 01:54:45 -0400 Subject: [PATCH 4/4] DOC: Add work in progress note --- README.rst | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/README.rst b/README.rst index c318c9c1..e69ba3dd 100644 --- a/README.rst +++ b/README.rst @@ -24,27 +24,7 @@ used to solve (medical) image registration problems. The modular design of elastix allows the user to quickly configure, test, and compare different registration methods for a specific application. -Installation ------------- - -Install cross-platform binary Python packages with:: - - pip install itk-elastix - -Usage ------ - -To register two images, traditionally called the fixed image and the moving -image:: - - import itk - - # The fixed and moving image can be an itk.Image or a numpy.ndarray - fixed_image = itk.imread('path/to/fixed_image.mha') - moving_image = itk.imread('path/to/moving_image.mha') - - registered_image = itk.elastix_registration_method(fixed_image, moving_image) - +.. note:: This package is a work in progress. Acknowledgements ----------------