RF: Switch to spatial_axes_first

Author: effigies

nibabel/minc1.py

@@ -319,49 +319,6 @@ def from_file_map(klass, file_map):
             data = klass.ImageArrayProxy(minc_file)
         return klass(data, affine, header, extra=None, file_map=file_map)
 
-    @property
-    def _spatial_dims(self):
-        if len(self.shape) > 3:
-            return slice(1, 4)
-        return slice(0, 3)
-
-    def _check_slicing(self, slicer, return_spatial=False):
-        ''' Canonicalize slicers and check for scalar indices in spatial dims
-
-        Parameters
-        ----------
-        slicer : object
-            something that can be used to slice an array as in
-            ``arr[sliceobj]``
-        return_spatial : bool
-            return only slices along spatial dimensions (x, y, z)
-
-        Returns
-        -------
-        slicer : object
-            Validated slicer object that will slice image's `dataobj`
-            without collapsing spatial dimensions
-        '''
-        slicer = canonical_slicers(slicer, self.shape)
-        try:
-            all_slices = super(Minc1Image, self)._check_slicing(slicer, False)
-            sp_dims = self._spatial_dims
-        except IndexError:
-            # Prepending a new axis for 3D images is valid in Minc
-            if slicer[0] is None and self._spatial_dims == slice(0, 3):
-                all_slices = (None,) + super(Minc1Image, self)._check_slicing(slicer[1:], False)
-                sp_dims = slice(1, 4)
-            else:
-                raise
-        # Added complications of first axis being time
-        if self._spatial_dims == slice(1, 4) and all_slices[0] is None:
-            raise IndexError("New temporal axis is not permitted in 4D Minc images")
-        elif (self._spatial_dims == slice(0, 3) and len(all_slices) > 3 and
-              all_slices[0] is not None):
-            raise IndexError("New axes cannot be added to 3D Minc image "
-                             "without new temporal axis (first dimension)")
-        return all_slices[sp_dims] if return_spatial else all_slices
-
 
 load = Minc1Image.load
 

nibabel/parrec.py

@@ -1222,7 +1222,6 @@ class PARRECImage(SpatialImage):
     header_class = PARRECHeader
     valid_exts = ('.rec', '.par')
     files_types = (('image', '.rec'), ('header', '.par'))
-    _spatial_dims = slice(0, 3)
 
     makeable = False
     rw = False

nibabel/spatialimages.py

@@ -325,7 +325,6 @@ class ImageDataError(Exception):
 class SpatialImage(DataobjImage):
     ''' Template class for volumetric (3D/4D) images '''
     header_class = SpatialHeader
-    _spatial_dims = None
 
     class Slicer(object):
         ''' Slicing interface that returns a new image with an updated affine
@@ -496,7 +495,7 @@ def _check_slicing(self, slicer, return_spatial=False):
             without collapsing spatial dimensions
         '''
         slicer = canonical_slicers(slicer, self.shape)
-        spatial_slices = slicer[self._spatial_dims]
+        spatial_slices = slicer[:3]
         for subslicer in spatial_slices:
             if subslicer is None:
                 raise IndexError("New axis not permitted in spatial dimensions")
@@ -559,6 +558,10 @@ def slicer(self):
 
         .. _aliasing: https://en.wikipedia.org/wiki/Aliasing
         """
+        from .imageclasses import spatial_axes_first
+        if not spatial_axes_first(self):
+            raise ValueError("Cannot predict position of spatial axes for "
+                             "Image type " + self.__class__.__name__)
         return self.Slicer(self)