Skip to content

Commit dac452f

Browse files
committed
Improved documentation
1 parent 60cd65d commit dac452f

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Next Release
2828
* ENH: New data grabbing interface that works over SSH connections, SSHDataGrabber
2929
* ENH: New color mode for write_graph
3030
* ENH: You can now force MapNodes to be run serially
31+
* ENH: Support for headless mode using Xvfb
3132
* FIX: MRTrix tracking algorithms were ignoring mask parameters.
3233
* FIX: FNIRT registration pathway and associated OpenFMRI example script
3334
* FIX: spm12b compatibility for Model estimate

doc/devel/interface_specs.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,9 @@ If you used genfile:
404404

405405
And optionally:
406406

407+
* ``_redirect_x``: If set to True it will make Nipype start Xvfb before running the interface and redirect X output to it. This is useful for
408+
commandlines that spawn a graphical user interface.
409+
407410
* ``_format_arg(name, spec, value)``: For extra formatting of the input values before passing them to generic ``_parse_inputs()`` method.
408411

409412
For example this is the class definition for Flirt, minus the docstring::

doc/users/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
model_specification
3737
saving_workflows
3838
spmmcr
39+
mipav
3940

4041

4142

nipype/testing/data/pyscript.m

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
fprintf(1,'Executing %s at %s:\n',mfilename,datestr(now));
22
ver,
3-
try,a=1;
3+
try,
4+
if isempty(which('spm')),
5+
throw(MException('SPMCheck:NotFound','SPM not in matlab path'));
6+
end;
7+
spm_path = spm('dir');
8+
[name, version] = spm('ver');
9+
fprintf(1, 'NIPYPE path:%s|name:%s|release:%s', spm_path, name, version);
10+
exit;
11+
412
,catch ME,
513
fprintf(2,'MATLAB code threw an exception:\n');
614
fprintf(2,'%s\n',ME.message);

tools/run_examples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def run_examples(example, pipelines, plugin):
2626
'fmri_spm_nested':['level1','l2pipeline'],
2727
'fmri_spm_dartel':['level1','l2pipeline'],
2828
'fmri_fsl_feeds':['l1pipeline']}
29-
plugins = ['Linear', 'MultiProc', 'IPython']
29+
plugins = ['IPython']
3030
for plugin in plugins:
3131
for example, pipelines in examples.items():
3232
run_examples(example, pipelines, plugin)

0 commit comments

Comments
 (0)