Merge branch 'rel/0.31.1' into 'v0.31'

Rel/0.31.1

See merge request fsl/fsleyes/fsleyes!157

CHANGELOG.rst

@@ -9,6 +9,19 @@ This document contains the ``fsleyes`` release history in reverse
 chronological order.
 
 
+0.31.1 (Tuesday October 8th 2019)
+---------------------------------
+
+
+Fixed
+^^^^^
+
+
+* Fixed a bug in edit mode where the image texture would not get updated
+  correctly in restricted environments (e.g. VNC) with certain image data
+  types.
+
+
 0.31.0 (Thursday September 10th 2019)
 -------------------------------------
 

fsleyes/gl/textures/imagetexture.py

@@ -280,6 +280,16 @@ class ImageTextureBase(object):
                        that was changed.
         """
 
+        # TODO If the change has caused the image
+        #      data range to change, and texture
+        #      data normalisation is on, you have
+        #      to refresh the full texture.
+        #
+        #      The Image instance does follow up
+        #      data change notifications with a
+        #      data range notification; perhaps
+        #      you can use this somehow.
+
         # If the data change was performed using
         # normal array indexing, we can just replace
         # that part of the image texture.

fsleyes/gl/textures/texture.py

@@ -944,7 +944,14 @@ class Texture(notifier.Notifier, TextureBase, TextureSettingsMixin):
             newshape = list(data.shape) + [1] * (self.ndim - len(data.shape))
             data     = data.reshape(newshape)
 
-        data = texdata.prepareData(data)[0]
+        data = texdata.prepareData(
+            data,
+            prefilter=self.prefilter,
+            prefilterRange=self.prefilterRange,
+            resolution=self.resolution,
+            scales=self.scales,
+            normalise=self.normalise,
+            normaliseRange=self.normaliseRange)[0]
 
         self.doPatch(data, offset)
 

fsleyes/version.py

@@ -14,7 +14,7 @@ version number. See also the :mod:`fsl.version` module.
 """
 
 
-__version__ = '0.31.0'
+__version__ = '0.31.1'
 """Current version number, as a string. The FSLeyes version number consists
 of three numbers, separated by a period, which roughly obeys the Semantic
 Versioning conventions (http://semver.org/).