Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions nipype/interfaces/meshfix.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ class MeshFixInputSpec(CommandLineInputSpec):
dont_clean = traits.Bool(argstr='--no-clean', desc="Don't Clean")

save_as_stl = traits.Bool(
xor=['save_as_vmrl', 'save_as_freesurfer_mesh'],
xor=['save_as_vrml', 'save_as_freesurfer_mesh'],
argstr='--stl',
desc="Result is saved in stereolithographic format (.stl)")
save_as_vmrl = traits.Bool(
save_as_vrml = traits.Bool(
argstr='--wrl',
xor=['save_as_stl', 'save_as_freesurfer_mesh'],
desc="Result is saved in VRML1.0 format (.wrl)")
Expand Down Expand Up @@ -210,7 +210,7 @@ def _gen_outfilename(self):
if self.inputs.save_as_stl or self.inputs.output_type == 'stl':
self.inputs.output_type = 'stl'
self.inputs.save_as_stl = True
if self.inputs.save_as_vmrl or self.inputs.output_type == 'vmrl':
self.inputs.output_type = 'vmrl'
self.inputs.save_as_vmrl = True
if self.inputs.save_as_vrml or self.inputs.output_type == 'vrml':
self.inputs.output_type = 'vrml'
self.inputs.save_as_vrml = True
return name + '_fixed.' + self.inputs.output_type
4 changes: 2 additions & 2 deletions nipype/interfaces/tests/test_auto_MeshFix.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def test_MeshFix_inputs():
),
save_as_stl=dict(
argstr='--stl',
xor=['save_as_vmrl', 'save_as_freesurfer_mesh'],
xor=['save_as_vrml', 'save_as_freesurfer_mesh'],
),
save_as_vmrl=dict(
save_as_vrml=dict(
argstr='--wrl',
xor=['save_as_stl', 'save_as_freesurfer_mesh'],
),
Expand Down