From d0e362f89a60439c2306dff72c6ce80b523f47c0 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Wed, 13 Sep 2017 15:55:57 +0100
Subject: [PATCH] Remove uses of deprecated voxelsToScaledVoxels method
---
fsl/utils/transform.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/fsl/utils/transform.py b/fsl/utils/transform.py
index 4fe7fe8e4..6ff409b27 100644
--- a/fsl/utils/transform.py
+++ b/fsl/utils/transform.py
@@ -555,10 +555,10 @@ def flirtMatrixToSform(flirtMat, srcImage, refImage):
:arg refImage: Reference :class:`.Image`
"""
- srcScaledVoxelMat = srcImage.voxelsToScaledVoxels()
- refScaledVoxelMat = refImage.voxelsToScaledVoxels()
+ srcScaledVoxelMat = srcImage.voxToScaledVoxMat
+ refInvScaledVoxelMat = refImage.voxToScaledVoxMat
+ refInvScaledVoxelMat = refImage.scaledVoxToVoxMat
refVoxToWorldMat = refImage.voxToWorldMat
- refInvScaledVoxelMat = invert(refScaledVoxelMat)
return concat(refVoxToWorldMat,
refInvScaledVoxelMat,
@@ -581,15 +581,15 @@ def sformToFlirtMatrix(srcImage, refImage, srcXform=None):
:attr:`.Nifti.voxToWorldMat`
"""
- srcScaledVoxelsToVoxelsMat = invert(srcImage.voxelsToScaledVoxels())
- srcVoxToWorldMat = srcImage.voxToWorldMat
- refWorldToVoxMat = invert(refImage.voxToWorldMat)
- refVoxelsToScaledVoxelsMat = refImage.voxelsToScaledVoxels()
+ srcScaledVoxToVoxMat = srcImage.scaledVoxToVoxMat
+ srcVoxToWorldMat = srcImage.voxToWorldMat
+ refWorldToVoxMat = refImage.worldToVoxMat
+ refVoxToScaledVoxMat = refImage.voxToScaledVoxMat
if srcXform is not None:
srcVoxToWorldMat = srcXform
- return concat(refVoxelsToScaledVoxelsMat,
+ return concat(refVoxToScaledVoxMat,
refWorldToVoxMat,
srcVoxToWorldMat,
- srcScaledVoxelsToVoxelsMat)
+ srcScaledVoxToVoxMat)
--
GitLab