Bugfix in imagewrapper data range update - was not notifying on range

changes. Bugfix in Image.__getitem__ - was potentially returning data
with trailing dimensions of size 1.

fsl/data/image.py

@@ -564,7 +564,15 @@ class Image(Nifti1, notifier.Notifier):
 
         :arg sliceobj: Something which can slice the image data.
         """
-        return self.__imageWrapper.__getitem__(sliceobj)
+        data = self.__imageWrapper.__getitem__(sliceobj)
+
+        if len(data.shape) > len(self.shape):
+
+            shape = data.shape[:len(self.shape)]
+            data  = np.reshape(data, shape)
+
+        return data
+
 
 
 class ProxyImage(Image):

fsl/data/imagewrapper.py

@@ -197,14 +197,11 @@ class ImageWrapper(notifier.Notifier):
         dmin = float(np.nanmin(data))
         dmax = float(np.nanmax(data))
 
-        if oldmin is None: oldmin = dmin
-        if oldmax is None: oldmax = dmax
+        if oldmin is None or dmin < oldmin: newmin = dmin
+        else:                               newmin = oldmin
 
-        if dmin < oldmin: newmin = dmin
-        else:             newmin = oldmin
-
-        if dmax > oldmax: newmax = dmax
-        else:             newmax = oldmax
+        if oldmax is None or dmax > oldmax: newmax = dmax
+        else:                               newmax = oldmax
 
         self.__range = (newmin, newmax)
         self.__updateSliceCoverage(slices)