diff --git a/fsl/fsleyes/gl/__init__.py b/fsl/fsleyes/gl/__init__.py index 52af7866c80c6afdd26dbd0acc829e1bec028b5d..19a296927d79cabc84e622d0045e68ad46387a4c 100644 --- a/fsl/fsleyes/gl/__init__.py +++ b/fsl/fsleyes/gl/__init__.py @@ -343,6 +343,10 @@ def bootstrap(glVersion=None): import fsl.fsleyes.displaycontext.display as fsldisplay dc.VolumeOpts .interpolation.removeChoice('spline') dc.RGBVectorOpts.interpolation.removeChoice('spline') + dc.VolumeOpts .interpolation.updateChoice('linear', + newAlt=['spline']) + dc.RGBVectorOpts.interpolation.updateChoice('linear', + newAlt=['spline']) # Tensor overlays are not available in GL14 dc .ALL_OVERLAY_TYPES .remove('tensor') @@ -365,20 +369,8 @@ def bootstrap(glVersion=None): 'lowering default performance settings.') import fsl.fsleyes.displaycontext as dc - dc.SceneOpts.performance.setConstraint(None, 'default', 2) - # And disable some fancy options - spline - # may have been disabled above, so absorb - # the ValueError if it occurs - - # TODO Remove this code duplication - try: - dc.VolumeOpts .interpolation.removeChoice('spline') - dc.RGBVectorOpts.interpolation.removeChoice('spline') - - except ValueError: pass - thismod.GL_VERSION = verstr thismod.glvolume_funcs = glpkg.glvolume_funcs thismod.glrgbvector_funcs = glpkg.glrgbvector_funcs