From cc7b3ae7151519bc36bdf6ffbf35b18a1458413c Mon Sep 17 00:00:00 2001 From: Christian Hinge Date: Fri, 6 Aug 2021 19:06:19 +0200 Subject: [PATCH 1/4] Changes the type of ConvertScalarImageToRGBInputSpec.mask_file from File to traits.Str --- .../ants/tests/test_auto_ConvertScalarImageToRGB.py | 1 - nipype/interfaces/ants/visualization.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py b/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py index a49239ebae..0ffdaef6fc 100644 --- a/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py +++ b/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py @@ -35,7 +35,6 @@ def test_ConvertScalarImageToRGB_inputs(): ), mask_image=dict( argstr="%s", - extensions=None, position=3, usedefault=True, ), diff --git a/nipype/interfaces/ants/visualization.py b/nipype/interfaces/ants/visualization.py index a443a76651..3d9ee6c120 100644 --- a/nipype/interfaces/ants/visualization.py +++ b/nipype/interfaces/ants/visualization.py @@ -28,8 +28,8 @@ class ConvertScalarImageToRGBInputSpec(ANTSCommandInputSpec): output_image = traits.Str( "rgb.nii.gz", argstr="%s", usedefault=True, desc="rgb output image", position=2 ) - mask_image = File( - "none", argstr="%s", exists=True, desc="mask image", position=3, usedefault=True + mask_image = traits.Str( + "none", argstr="%s", desc="mask image", position=3, usedefault=True ) colormap = traits.Enum( "grey", From a5853e9c57ffe141d6d2c146293cb37fa6ff772b Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Sat, 2 Apr 2022 21:28:57 -0400 Subject: [PATCH 2/4] Update nipype/interfaces/ants/visualization.py --- nipype/interfaces/ants/visualization.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/ants/visualization.py b/nipype/interfaces/ants/visualization.py index 3d9ee6c120..ac079e9ada 100644 --- a/nipype/interfaces/ants/visualization.py +++ b/nipype/interfaces/ants/visualization.py @@ -28,8 +28,8 @@ class ConvertScalarImageToRGBInputSpec(ANTSCommandInputSpec): output_image = traits.Str( "rgb.nii.gz", argstr="%s", usedefault=True, desc="rgb output image", position=2 ) - mask_image = traits.Str( - "none", argstr="%s", desc="mask image", position=3, usedefault=True + mask_image = traits.Either( + "none", traits.File(exists=True), argstr="%s", desc="mask image", position=3, usedefault=True ) colormap = traits.Enum( "grey", From 230fac6149d4dfbd5da669a983332a1fe318ef57 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 2 Apr 2022 21:32:56 -0400 Subject: [PATCH 3/4] STY: black [ignore-rev] --- nipype/interfaces/ants/visualization.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nipype/interfaces/ants/visualization.py b/nipype/interfaces/ants/visualization.py index ac079e9ada..2a87699a0a 100644 --- a/nipype/interfaces/ants/visualization.py +++ b/nipype/interfaces/ants/visualization.py @@ -29,7 +29,12 @@ class ConvertScalarImageToRGBInputSpec(ANTSCommandInputSpec): "rgb.nii.gz", argstr="%s", usedefault=True, desc="rgb output image", position=2 ) mask_image = traits.Either( - "none", traits.File(exists=True), argstr="%s", desc="mask image", position=3, usedefault=True + "none", + traits.File(exists=True), + argstr="%s", + desc="mask image", + position=3, + usedefault=True, ) colormap = traits.Enum( "grey", From 921f7928baba4c4f11034bf6df17fe20611c9914 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 2 Apr 2022 21:43:50 -0400 Subject: [PATCH 4/4] FIX: Set default mask_image = "none" --- nipype/interfaces/ants/visualization.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nipype/interfaces/ants/visualization.py b/nipype/interfaces/ants/visualization.py index 2a87699a0a..0fcf9a6b47 100644 --- a/nipype/interfaces/ants/visualization.py +++ b/nipype/interfaces/ants/visualization.py @@ -34,6 +34,7 @@ class ConvertScalarImageToRGBInputSpec(ANTSCommandInputSpec): argstr="%s", desc="mask image", position=3, + default="none", usedefault=True, ) colormap = traits.Enum(