Skip to content

Commit 2d963db

Browse files
committed
add vtk version checking in fsl interfaces
1 parent da894b0 commit 2d963db

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

nipype/interfaces/fsl/utils.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,9 +1860,18 @@ def _vtk_to_coords(self, in_file, out_file=None):
18601860
except ImportError:
18611861
raise ImportError('This interface requires tvtk to run.')
18621862

1863+
vtk_major = 5
1864+
try:
1865+
from tvtk.tvtk_classes.vtk_version import vtk_build_version
1866+
vtk_major = int(vtk_build_version[0])
1867+
except ImportError:
1868+
iflogger.warning('VTK version-major inspection using tvtk failed.')
1869+
18631870
reader = tvtk.PolyDataReader(file_name=in_file+'.vtk')
18641871
reader.update()
1865-
points = reader.output.points
1872+
1873+
mesh = reader.output if vtk_major < 6 else reader.get_output()
1874+
points = mesh.points
18661875

18671876
if out_file is None:
18681877
out_file, _ = op.splitext(in_file) + '.txt'
@@ -1877,12 +1886,24 @@ def _coords_to_vtk(self, points, out_file):
18771886
except ImportError:
18781887
raise ImportError('This interface requires tvtk to run.')
18791888

1889+
vtk_major = 5
1890+
try:
1891+
from tvtk.tvtk_classes.vtk_version import vtk_build_version
1892+
vtk_major = int(vtk_build_version[0])
1893+
except ImportError:
1894+
iflogger.warning('VTK version-major inspection using tvtk failed.')
1895+
18801896
reader = tvtk.PolyDataReader(file_name=self.inputs.in_file)
18811897
reader.update()
1882-
mesh = reader.output
1898+
1899+
mesh = reader.output if vtk_major < 6 else reader.get_output()
18831900
mesh.points = points
18841901

1885-
writer = tvtk.PolyDataWriter(file_name=out_file, input=mesh)
1902+
writer = tvtk.PolyDataWriter(file_name=out_file)
1903+
if vtk_major < 6:
1904+
writer.input = mesh
1905+
else:
1906+
writer.set_input_data_object(mesh)
18861907
writer.write()
18871908

18881909
def _trk_to_coords(self, in_file, out_file=None):

0 commit comments

Comments
 (0)