Merge branch 'fix/flirt_xfm' of github.com:mgxd/nipype into fix/flirt_xfm

Author: mgxd

nipype/interfaces/fsl/preprocess.py

@@ -400,8 +400,9 @@ class FLIRTInputSpec(FSLCommandInputSpec):
                    name_template='%s_flirt.log', desc='output log')
     in_matrix_file = File(argstr='-init %s', desc='input 4x4 affine matrix')
     apply_xfm = traits.Bool(
-        argstr='-applyxfm', requires=['in_matrix_file'],
-        desc='apply transformation supplied by in_matrix_file')
+        argstr='-applyxfm',
+        desc=('apply transformation supplied by in_matrix_file or uses_qform to'
+              ' use the affine matrix stored in the reference header'))
     apply_isoxfm = traits.Float(
         argstr='-applyisoxfm %f', xor=['apply_xfm'],
         desc='as applyxfm but forces isotropic resampling')
@@ -561,13 +562,18 @@ def _parse_inputs(self, skip=None):
         if isdefined(self.inputs.save_log) and self.inputs.save_log:
             if not isdefined(self.inputs.verbose) or self.inputs.verbose == 0:
                 self.inputs.verbose = 1
+        if isdefined(self.inputs.apply_xfm) and self.inputs.apply_xfm:
+            if not self.inputs.in_matrix_file or not self.inputs.uses_qform:
+                raise RuntimeError('Argument apply_xfm requires in_matrix_file '
+                                   'or uses_qform arguments to run')
         skip.append('save_log')
         return super(FLIRT, self)._parse_inputs(skip=skip)
 
 class ApplyXFMInputSpec(FLIRTInputSpec):
     apply_xfm = traits.Bool(
-        True, argstr='-applyxfm', requires=['in_matrix_file'],
-        desc='apply transformation supplied by in_matrix_file',
+        True, argstr='-applyxfm',
+        desc=('apply transformation supplied by in_matrix_file or uses_qform to'
+              ' use the affine matrix stored in the reference header'),
         usedefault=True)
 
 

nipype/interfaces/fsl/tests/test_auto_ApplyXFM.py

@@ -10,7 +10,6 @@ def test_ApplyXFM_inputs():
     xor=['apply_xfm'],
     ),
     apply_xfm=dict(argstr='-applyxfm',
-    requires=['in_matrix_file'],
     usedefault=True,
     ),
     args=dict(argstr='%s',

nipype/interfaces/fsl/tests/test_auto_FLIRT.py

@@ -10,7 +10,6 @@ def test_FLIRT_inputs():
     xor=['apply_xfm'],
     ),
     apply_xfm=dict(argstr='-applyxfm',
-    requires=['in_matrix_file'],
     ),
     args=dict(argstr='%s',
     ),

nipype/interfaces/fsl/tests/test_preprocess.py

@@ -220,12 +220,28 @@ def test_flirt(setup_flirt):
     flirter = fsl.FLIRT()
     # infile not specified
     with pytest.raises(ValueError):
-        flirter.run()
+        flirter.cmdline
     flirter.inputs.in_file = infile
     # reference not specified
     with pytest.raises(ValueError):
-        flirter.run()
+        flirter.cmdline
     flirter.inputs.reference = reffile
+
+    # test apply_xfm option
+    axfm = flirter
+    axfm.inputs.apply_xfm = True
+    # in_matrix_file or uses_qform must be defined
+    with pytest.raises(RuntimeError): axfm.cmdline
+    axfm2 = axfm
+    # test uses_qform
+    axfm.inputs.uses_qform = True
+    assert axfm.cmdline == ('flirt -in %s -ref %s -applyxfm -usesqform' % (
+                            infile, reffile))
+    # test in_matrix_file
+    axfm2.inputs.in_matrix_file = reffile
+    assert axfm2.cmdline == ('flirt -in %s -ref %s -applyxfm -init %s' % (
+                            infile, reffile, reffile))
+
     # Generate outfile and outmatrix
     pth, fname, ext = split_filename(infile)
     outfile = fsl_name(flirter, '%s_flirt' % fname)