From 98608763e6fd2bd89d7c57ad0f2e4ceb54b481c7 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 20 Nov 2015 16:55:10 +0000
Subject: [PATCH] OrthoEditProfile canvas update was broken due to recent
changes to performance levels.
---
fsl/fsleyes/displaycontext/sceneopts.py | 7 ++++++-
fsl/fsleyes/profiles/orthoeditprofile.py | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fsl/fsleyes/displaycontext/sceneopts.py b/fsl/fsleyes/displaycontext/sceneopts.py
index 9ad77c9ef..b9b0681d7 100644
--- a/fsl/fsleyes/displaycontext/sceneopts.py
+++ b/fsl/fsleyes/displaycontext/sceneopts.py
@@ -55,7 +55,12 @@ class SceneOpts(props.HasProperties):
to the colour bar, if it is being shown.
"""
-
+
+ # NOTE: If you change the maximum performance value,
+ # make sure you update all references to
+ # performance because, for example, the
+ # OrthoEditProfile does numerical comparisons
+ # to it.
performance = props.Choice((1, 2, 3, 4), default=4)
"""User controllable performance setting.
diff --git a/fsl/fsleyes/profiles/orthoeditprofile.py b/fsl/fsleyes/profiles/orthoeditprofile.py
index 895318e90..b5b583541 100644
--- a/fsl/fsleyes/profiles/orthoeditprofile.py
+++ b/fsl/fsleyes/profiles/orthoeditprofile.py
@@ -643,7 +643,7 @@ class OrthoEditProfile(orthoviewprofile.OrthoViewProfile):
# performance mode, the cursor
# is only drawn on the current
# canvas.
- if self._viewPanel.getSceneOptions().performance < 5:
+ if self._viewPanel.getSceneOptions().performance < 4:
cursors = [cursors[canvases.index(canvas)]]
canvases = [canvas]
@@ -733,7 +733,7 @@ class OrthoEditProfile(orthoviewprofile.OrthoViewProfile):
On all lower performance settings, only the source canvas is updated.
"""
perf = self._viewPanel.getSceneOptions().performance
- if perf == 5:
+ if perf == 4:
if mousePos is None or canvasPos is None:
self._viewPanel.Refresh()
--
GitLab