From e7b1bbf9db50096cbee2154350681eb2f85b4523 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Wed, 9 Jul 2014 11:27:19 +0100
Subject: [PATCH] ImageDisplay parameter is no longer optional when creating a
GLImageData object.
---
fsl/fslview/gl/glimagedata.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/fsl/fslview/gl/glimagedata.py b/fsl/fslview/gl/glimagedata.py
index 201ba02b5..fd8f08ea1 100644
--- a/fsl/fslview/gl/glimagedata.py
+++ b/fsl/fslview/gl/glimagedata.py
@@ -59,7 +59,7 @@ import OpenGL.GL.ARB.texture_rg as arbrg
class GLImageData(object):
- def __init__(self, image, xax, yax, imageDisplay=None):
+ def __init__(self, image, xax, yax, imageDisplay):
"""
Initialise the OpenGL data buffers required to render the given image.
Parameters:
@@ -70,15 +70,10 @@ class GLImageData(object):
- yax: The image axis which maps to the screen y axis.
- - imageDisplay: Optional. A fsl.data.image.ImageDisplay object
+ - imageDisplay: A fsl.fslview.displaycontext.ImageDisplay object
which describes how the image is to be displayed.
- If not provided, the default image.display instance
- is used (see fsl.data.image.ImageDisplay for
- details).
"""
- if imageDisplay is None: imageDisplay = image.display
-
self.image = image
self.display = imageDisplay
--
GitLab