Merge branch 'master' into image-moments

Author: brad-t-moore

.github/workflows/build-test-publish.yml

@@ -258,7 +258,7 @@ jobs:
           - os: ubuntu-18.04
             c-compiler: "gcc"
             cxx-compiler: "g++"
-            itk-git-tag: "7548a390d71dc25b80e792703ee3cfea17853a99"
+            itk-git-tag: "v5.2.0"
             cmake-build-type: "Release"
 
     steps:

src/Filtering/BinaryMathematicalMorphology/ThinImage/CMakeLists.txt

@@ -23,3 +23,8 @@ install(FILES Code.cxx CMakeLists.txt
 enable_testing()
 add_test(NAME ThinImageTest
   COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThinImage)
+
+if(ITK_WRAP_PYTHON)
+add_test(NAME ThinImageTestPython
+  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py)
+endif()

src/Filtering/BinaryMathematicalMorphology/ThinImage/Code.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+import sys
+import itk
+
+PixelType = itk.UC
+Dimension = 2
+ImageType = itk.Image[PixelType, Dimension]
+
+if len(sys.argv) == 2:
+    image = itk.imread(sys.argv[1])
+
+else:
+    # Create an image
+    start = itk.Index[Dimension]()
+    start.Fill(0)
+
+    size = itk.Size[Dimension]()
+    size.Fill(100)
+
+    region = itk.ImageRegion[Dimension]()
+    region.SetIndex(start)
+    region.SetSize(size)
+
+    image = ImageType.New(Regions=region)
+    image.Allocate()
+    image.FillBuffer(0)
+
+    # Draw a 5 pixel wide line
+    image[50:55, 20:80] = 255
+
+    # Write Image
+    itk.imwrite(image, "input.png")
+
+image = itk.binary_thinning_image_filter(image)
+
+# Rescale the image so that it can be seen (the output is 0 and 1, we want 0 and 255)
+image = itk.rescale_intensity_image_filter(image, output_minimum=0, output_maximum=255)
+
+# Write Image
+itk.imwrite(image, "outputPython.png")

src/Filtering/BinaryMathematicalMorphology/ThinImage/Documentation.rst

@@ -29,6 +29,13 @@ Results
 Code
 ----
 
+Python
+......
+
+.. literalinclude:: Code.py
+   :language: python
+   :lines: 1, 16-
+
 C++
 ...
 

src/Filtering/ImageIntensity/RescaleIntensity/CMakeLists.txt

@@ -19,10 +19,25 @@ install( FILES Code.cxx CMakeLists.txt
 )
 
 enable_testing()
+
+set( input_image ${CMAKE_CURRENT_BINARY_DIR}/Gourds.png )
+set( output_image Output.png )
+
 add_test( NAME RescaleIntensityTest
   COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/RescaleIntensity
-    ${CMAKE_CURRENT_BINARY_DIR}/Gourds.png
-    Output.png
+    ${input_image}
+    ${output_image}
     0
     255
 )
+
+if( ITK_WRAP_PYTHON )
+  string( REPLACE . "Python." output_image "${output_image}" )
+  add_test( NAME RescaleIntensityTestPython
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py
+      ${input_image}
+      ${output_image}
+      0
+      255
+  )
+endif()

src/Filtering/ImageIntensity/RescaleIntensity/Code.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+import sys
+import itk
+
+if len(sys.argv) != 5:
+    print(
+        "Usage: "
+        + sys.argv[0]
+        + " <InputFileName> <OutputFileName> <OutputMin> <OutputMax>"
+    )
+    sys.exit(1)
+
+input_image = sys.argv[1]
+output_image = sys.argv[1]
+output_minimum = int(sys.argv[3])
+output_maximum = int(sys.argv[4])
+
+image = itk.imread(sys.argv[1])
+
+image = itk.rescale_intensity_image_filter(
+    image, output_minimum=output_minimum, output_maximum=output_maximum
+)
+
+itk.imwrite(image, sys.argv[2])

src/Filtering/ImageIntensity/RescaleIntensity/Documentation.rst

@@ -32,6 +32,13 @@ Results
 Code
 ----
 
+Python
+......
+
+.. literalinclude:: Code.py
+   :language: python
+   :lines: 1, 16-
+
 C++
 ...
 

src/IO/ImageBase/WriteAnImage/CMakeLists.txt

@@ -21,3 +21,8 @@ install( FILES Code.cxx CMakeLists.txt
 enable_testing()
 add_test( NAME WriteAnImageTest
   COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WriteAnImage )
+
+if(ITK_WRAP_PYTHON)
+  add_test(NAME WriteAnImageTestPython
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py)
+endif()

src/IO/ImageBase/WriteAnImage/Code.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+import sys
+import itk
+
+if len(sys.argv) > 1:
+    output_filename = sys.argv[1]
+else:
+    output_filename = "testPython.png"
+
+pixel_type = itk.UC
+dimension = 2
+image_type = itk.Image[pixel_type, dimension]
+
+start = itk.Index[dimension]()
+start.Fill(0)
+
+size = itk.Size[dimension]()
+size[0] = 200
+size[1] = 300
+
+region = itk.ImageRegion[dimension]()
+region.SetIndex(start)
+region.SetSize(size)
+
+image = image_type.New(Regions=region)
+image.Allocate()
+
+itk.imwrite(image, output_filename)

src/IO/ImageBase/WriteAnImage/Documentation.rst

@@ -26,6 +26,13 @@ Results
 Code
 ----
 
+Python
+......
+
+.. literalinclude:: Code.py
+   :language: python
+   :lines: 1, 16-
+
 C++
 ...