-
Notifications
You must be signed in to change notification settings - Fork 532
fix: undeprecate dcm2niix source_names option #2550
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b876f4f
fix: undeprecate dcm2niix source_names option
satra dd6ab0b
doc: update docs to guide user about dcm2niix based file list conversion
satra 47655ca
Merge remote-tracking branch 'upstream/master' into fix/dcm2niix
satra d752ce7
add specific version to set precedence
satra 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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -263,15 +263,18 @@ class Dcm2niixInputSpec(CommandLineInputSpec): | |
argstr="%s", | ||
position=-1, | ||
copyfile=False, | ||
deprecated='1.0.2', | ||
new_name='source_dir', | ||
mandatory=True, | ||
desc=('A set of filenames to be converted. Note that the current ' | ||
'version (1.0.20180328) of dcm2niix converts any files in the ' | ||
'directory. To only convert specific files they should be in an ' | ||
'isolated directory'), | ||
xor=['source_dir']) | ||
source_dir = Directory( | ||
exists=True, | ||
argstr="%s", | ||
position=-1, | ||
mandatory=True, | ||
desc='A directory containing dicom files to be converted', | ||
xor=['source_names']) | ||
out_filename = traits.Str( | ||
argstr="-f %s", | ||
|
@@ -378,6 +381,18 @@ class Dcm2niix(CommandLine): | |
>>> converter.cmdline | ||
'dcm2niix -b y -z y -5 -x n -t n -m n -o ds005 -s n -v n dicomdir' | ||
>>> converter.run() # doctest: +SKIP | ||
|
||
# In the example below, we note that the current version of dcm2niix | ||
# converts any files in the directory containing the files in the list. We | ||
# also do not support nested filenames with this option. Thus all files | ||
# should have a common root directory. | ||
>>> converter = Dcm2niix() | ||
>>> converter.inputs.source_names = ['functional_1.dcm', 'functional_2.dcm'] | ||
>>> converter.inputs.compression = 5 | ||
>>> converter.inputs.output_dir = 'ds005' | ||
>>> converter.cmdline | ||
'dcm2niix -b y -z y -5 -x n -t n -m n -o ds005 -s n -v n .' | ||
>>> converter.run() # doctest: +SKIP | ||
""" | ||
|
||
input_spec = Dcm2niixInputSpec | ||
|
@@ -399,7 +414,7 @@ def _format_arg(self, opt, spec, val): | |
spec.argstr += ' n' | ||
val = True | ||
if opt == 'source_names': | ||
return spec.argstr % val[0] | ||
return spec.argstr % (os.path.dirname(val[0]) or '.') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since the dicoms are copied to the node, couldn't this just be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not when used as an interface. |
||
return super(Dcm2niix, self)._format_arg(opt, spec, val) | ||
|
||
def _run_interface(self, runtime): | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably specify the latest as being
1.0.20180328
in case this behavior changes down the lineThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
roger