Skip to content

Commit 17bc6b5

Browse files
committed
fix:docstring of traits.Directory was not correctly generated
1 parent 9a16838 commit 17bc6b5

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

nipype/interfaces/elastix/base.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,21 @@
66
# @Author: oesteban - [email protected]
77
# @Date: 2014-06-03 13:42:46
88
# @Last Modified by: oesteban
9-
# @Last Modified time: 2014-06-17 10:17:43
9+
# @Last Modified time: 2014-08-14 19:25:37
1010
"""The :py:mod:`nipype.interfaces.elastix` provides the interface to
1111
the elastix registration software.
1212
1313
.. note:: http://elastix.isi.uu.nl/
1414
15-
1615
"""
1716

18-
from ..base import (CommandLine, CommandLineInputSpec, isdefined,
19-
TraitedSpec, File, traits, InputMultiPath)
20-
from ... import logging
17+
from nipype.interfaces.base import CommandLineInputSpec, traits
18+
from nipype import logging
2119
logger = logging.getLogger('interface')
2220

2321

2422
class ElastixBaseInputSpec(CommandLineInputSpec):
25-
output_path = traits.Directory('./', exists=True, mandatory=True, usedefault=True,
26-
argstr='-out %s', desc='output directory')
2723
num_threads = traits.Int(1, argstr='-threads %01d',
2824
desc='set the maximum number of threads of elastix')
25+
output_path = traits.Str('./', mandatory=True, usedefault=True,
26+
argstr='-out %s', desc='output directory')

nipype/interfaces/elastix/registration.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# @Author: oesteban - [email protected]
77
# @Date: 2014-06-02 12:06:50
88
# @Last Modified by: oesteban
9-
# @Last Modified time: 2014-06-17 10:19:23
9+
# @Last Modified time: 2014-08-14 19:04:57
1010
"""
1111
Interfaces to perform image registrations and to apply the resulting
1212
displacement maps to images and points.
@@ -18,8 +18,6 @@
1818

1919
from ..base import (CommandLine, CommandLineInputSpec, isdefined,
2020
TraitedSpec, File, traits, InputMultiPath)
21-
22-
2321
from base import ElastixBaseInputSpec
2422

2523
from ... import logging
@@ -31,10 +29,8 @@ class RegistrationInputSpec(ElastixBaseInputSpec):
3129
desc='fixed image')
3230
moving_image = File(exists=True, mandatory=True, argstr='-m %s',
3331
desc='moving image')
34-
3532
parameters = InputMultiPath(File(exists=True), mandatory=True, argstr='-p %s...',
3633
desc='parameter file, elastix handles 1 or more -p')
37-
3834
fixed_mask = File(exists=True, argstr='-fMask %s', desc='mask for fixed image')
3935
moving_mask = File(exists=True, argstr='-mMask %s', desc='mask for moving image')
4036
initial_transform = File(exists=True, argstr='-t0 %s',
@@ -51,7 +47,8 @@ class RegistrationOutputSpec(TraitedSpec):
5147

5248

5349
class Registration(CommandLine):
54-
"""Elastix nonlinear registration interface
50+
"""
51+
Elastix nonlinear registration interface
5552
5653
Example
5754
-------
@@ -170,16 +167,18 @@ class AnalyzeWarpInputSpec(ElastixBaseInputSpec):
170167

171168

172169
class AnalyzeWarpOutputSpec(TraitedSpec):
173-
disp_field = File(exists=True, desc='displacements field')
174-
jacdet_map = File(exists=True, desc='det(Jacobian) map')
175-
jacmat_map = File(exists=True, desc='Jacobian matrix map')
170+
disp_field = File(desc='displacements field')
171+
jacdet_map = File(desc='det(Jacobian) map')
172+
jacmat_map = File(desc='Jacobian matrix map')
176173

177174
class AnalyzeWarp(CommandLine):
178-
"""Use `transformix` to get details from the input transform (generate
175+
"""
176+
Use transformix to get details from the input transform (generate
179177
the corresponding deformation field, generate the determinant of the
180178
Jacobian map or the Jacobian map itself)
181179
182-
Example::
180+
Example
181+
-------
183182
184183
>>> from nipype.interfaces.elastix import AnalyzeWarp
185184
>>> reg = AnalyzeWarp()

0 commit comments

Comments
 (0)