From b41c630cbdc8fd1d9a00209d5c504d090c12d948 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 23 Jul 2019 15:18:52 +0100
Subject: [PATCH] RF: Adjust roi module to use new import
---
fsl/utils/image/__init__.py | 1 +
fsl/utils/image/roi.py | 8 ++++----
fsl/utils/transform.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fsl/utils/image/__init__.py b/fsl/utils/image/__init__.py
index 36bde925d..54dde4b2a 100644
--- a/fsl/utils/image/__init__.py
+++ b/fsl/utils/image/__init__.py
@@ -13,4 +13,5 @@ The following modules are available:
:nosignature
.image.resample
+ .image.roi
"""
diff --git a/fsl/utils/image/roi.py b/fsl/utils/image/roi.py
index 84aee2434..0b26d79d8 100644
--- a/fsl/utils/image/roi.py
+++ b/fsl/utils/image/roi.py
@@ -11,8 +11,8 @@ a region-of-interest from, or expand the field-of-view of, an :class:`.Image`.
import numpy as np
-import fsl.data.image as fslimage
-import fsl.utils.transform as transform
+import fsl.data.image as fslimage
+import fsl.transform.affine as affine
def _normaliseBounds(shape, bounds):
@@ -97,8 +97,8 @@ def roi(image, bounds):
# each spatial dimension
oldaff = image.voxToWorldMat
offset = [lo for lo, hi in bounds[:3]]
- offset = transform.scaleOffsetXform([1, 1, 1], offset)
- newaff = transform.concat(oldaff, offset)
+ offset = affine.scaleOffsetXform([1, 1, 1], offset)
+ newaff = affine.concat(oldaff, offset)
return fslimage.Image(newdata,
xform=newaff,
diff --git a/fsl/utils/transform.py b/fsl/utils/transform.py
index e682cc1be..b3d51afb2 100644
--- a/fsl/utils/transform.py
+++ b/fsl/utils/transform.py
@@ -16,6 +16,6 @@ from fsl.transform.flirt import (flirtMatrixToSform, # noqa
deprecated.warn('fsl.utils.transform',
- vin='2.2.0',
+ vin='2.4.0',
rin='3.0.0',
msg='Use the fsl.transform module instead')
--
GitLab