diff --git a/fsl/utils/image/resample.py b/fsl/utils/image/resample.py index 4ddfd2bc6b29ff287a0be09cb044fbf14838c144..bf11d7a4e9872298864fdefde0c285a4f8957555 100644 --- a/fsl/utils/image/resample.py +++ b/fsl/utils/image/resample.py @@ -15,12 +15,12 @@ sub-functions of :func:`resample`. """ -import collections.abc as abc +import collections.abc as abc -import numpy as np -import scipy.ndimage as ndimage +import numpy as np +import scipy.ndimage as ndimage -import fsl.utils.transform as transform +import fsl.transform.affine as affine def resampleToPixdims(image, newPixdims, **kwargs): @@ -64,7 +64,7 @@ def resampleToReference(image, reference, **kwargs): # Align the two images together # via their vox-to-world affines. - matrix = transform.concat(image.worldToVoxMat, reference.voxToWorldMat) + matrix = affine.concat(image.worldToVoxMat, reference.voxToWorldMat) # If the input image is >3D, we # have to adjust the resampling @@ -218,7 +218,7 @@ def resample(image, matrix[:3, :3] = rotmat matrix[:3, -1] = offsets - matrix = transform.concat(image.voxToWorldMat, matrix) + matrix = affine.concat(image.voxToWorldMat, matrix) return data, matrix @@ -241,7 +241,7 @@ def applySmoothing(data, matrix, newShape): :returns: A smoothed copy of ``data``. """ - ratio = transform.decompose(matrix[:3, :3])[0] + ratio = affine.decompose(matrix[:3, :3])[0] if len(newShape) > 3: ratio = np.concatenate(( diff --git a/fsl/utils/transform.py b/fsl/utils/transform.py index 77ba362ca4788d01cd14dd94983b50fe0e7efa2d..03c65f8d169900d04e4fc3686d909fa98a7a9694 100644 --- a/fsl/utils/transform.py +++ b/fsl/utils/transform.py @@ -9,8 +9,8 @@ """ -import fsl.utils.deprecated as deprecated -from fsl.transform import * # noqa +import fsl.utils.deprecated as deprecated +from fsl.affine import * # noqa deprecated.warn('fsl.utils.transform',