Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9db438f
Merge remote-tracking branch 'upstream/master'
mick-d Oct 15, 2013
a9c41c7
Merge remote-tracking branch 'upstream/master'
mick-d Oct 15, 2013
59d2fd4
AFNI issue
mick-d Oct 19, 2013
5360d04
Merge remote-tracking branch 'upstream/master'
mick-d Oct 19, 2013
930c756
AFNI fixed by latest master
mick-d Oct 19, 2013
9b22a64
New interface for Camino dtshape. Minor correction to Camino ComputeE…
mick-d Oct 27, 2013
25bf37b
Correct PEP8
mick-d Oct 30, 2013
83a925a
Merge remote-tracking branch 'upstream/master' into camino
Nov 9, 2013
e09fc2d
Add header option for camino.dti.DTMetric
mick-d Nov 9, 2013
bf7f5bc
Merge remote-tracking branch 'upstream/master' into camino
mick-d Nov 15, 2013
446118a
Merge remote-tracking branch 'origin/camino' into camino
mick-d Nov 15, 2013
fa9ccdc
Camino update
mick-d Nov 18, 2013
f717526
Merge branch 'camino' of https://github.com/mick-d/nipype into camino
mick-d Nov 18, 2013
26c8280
Commiting again same thing
mick-d Nov 18, 2013
7001996
Merge branch 'camino' of github.com:mick-d/nipype into camino
mick-d Nov 18, 2013
38e1cc4
Merge remote-tracking branch 'upstream/master'
mick-d Nov 18, 2013
ca19159
New interface for Camino dtshape. Minor correction to Camino ComputeE…
mick-d Oct 27, 2013
1af343e
Correct PEP8
mick-d Oct 30, 2013
b22f5cc
Add header option for camino.dti.DTMetric
mick-d Nov 9, 2013
4516073
Camino update
mick-d Nov 18, 2013
508c797
Merge branch 'camino' of github.com:mick-d/nipype into camino
mick-d Nov 18, 2013
fe65593
fix: auto test
satra Nov 19, 2013
6d30d9a
Merge pull request #1 from satra/tst/mike
mick-d Nov 20, 2013
ae52aa8
Autotest file of camino/dti.py DTMetric interface
mick-d Nov 20, 2013
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
AFNI fixed by latest master
  • Loading branch information
mick-d committed Oct 19, 2013
commit 930c756530e1fc1959dde27e33978502dd671f36
17 changes: 0 additions & 17 deletions nipype/interfaces/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1472,23 +1472,6 @@ def _filename_from_source(self, name):
if trait_spec.keep_extension and ext:
return retval
return self._overload_extension(retval)
elif isdefined(retval):
if "%s" in retval:
if isinstance(trait_spec.name_source, list):
for ns in trait_spec.name_source:
if isdefined(getattr(self.inputs, ns)):
name_source = ns
break
else:
name_source = trait_spec.name_source
if name_source.endswith(os.path.sep):
name_source = name_source[:-len(os.path.sep)]
_, base, _ = split_filename(getattr(self.inputs, name_source))
retval = os.path.abspath(retval % base)
_, _, ext = split_filename(retval)
if trait_spec.keep_extension and ext:
return retval
return self._overload_extension(retval)
return retval

def _gen_filename(self, name):
Expand Down