From dd7e8a2624b214269b822ef0134027c99df04e85 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Mon, 7 Dec 2015 10:39:41 +0000
Subject: [PATCH] Increased maximum render texture resolution, and GLLineVector
resolution. DisplayContext sync overlay order is off by default.
---
fsl/fsleyes/displaycontext/displaycontext.py | 5 +++--
fsl/fsleyes/gl/gllinevector.py | 4 ++--
fsl/fsleyes/gl/textures/rendertexture.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fsl/fsleyes/displaycontext/displaycontext.py b/fsl/fsleyes/displaycontext/displaycontext.py
index 304882b1a..1eef7a53e 100644
--- a/fsl/fsleyes/displaycontext/displaycontext.py
+++ b/fsl/fsleyes/displaycontext/displaycontext.py
@@ -178,10 +178,11 @@ class DisplayContext(props.SyncableHasProperties):
'displaySpace',
'bounds',
'autoDisplay'],
- nobind=[ 'syncOverlayDisplay'])
+ nobind=[ 'syncOverlayDisplay'],
+ state={'overlayOrder' : False})
self.__overlayList = overlayList
- self.__name = '{}_{}'.format(self.__class__.__name__, id(self))
+ self.__name = '{}_{}'.format(self.__class__.__name__, id(self))
# Keep track of the overlay list length so
# we can do some things in the
diff --git a/fsl/fsleyes/gl/gllinevector.py b/fsl/fsleyes/gl/gllinevector.py
index 2a6e9b361..f26812089 100644
--- a/fsl/fsleyes/gl/gllinevector.py
+++ b/fsl/fsleyes/gl/gllinevector.py
@@ -88,8 +88,8 @@ class GLLineVector(glvector.GLVector):
"""
res = list(glvector.GLVector.getDataResolution(self, xax, yax))
- res[xax] *= 16
- res[yax] *= 16
+ res[xax] *= 20
+ res[yax] *= 20
return res
diff --git a/fsl/fsleyes/gl/textures/rendertexture.py b/fsl/fsleyes/gl/textures/rendertexture.py
index f6278d8cb..ddfc513cc 100644
--- a/fsl/fsleyes/gl/textures/rendertexture.py
+++ b/fsl/fsleyes/gl/textures/rendertexture.py
@@ -295,7 +295,7 @@ class GLObjectRenderTexture(RenderTexture):
size can be re-calculated.
"""
- def __init__(self, name, globj, xax, yax, maxResolution=1024):
+ def __init__(self, name, globj, xax, yax, maxResolution=2048):
"""Create a ``GLObjectRenderTexture``.
:arg name: A unique name for this ``GLObjectRenderTexture``.
--
GitLab