From e7651b54e37686b91c3dbb36730aaff88a26f9b1 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 22 Jan 2016 15:49:50 +0000
Subject: [PATCH] LightBoxCanvas was ignoring cursor colour.
---
fsl/fsleyes/gl/lightboxcanvas.py | 9 +++++++--
fsl/tools/fsleyes.py | 1 -
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fsl/fsleyes/gl/lightboxcanvas.py b/fsl/fsleyes/gl/lightboxcanvas.py
index e03fd7877..7be390ecc 100644
--- a/fsl/fsleyes/gl/lightboxcanvas.py
+++ b/fsl/fsleyes/gl/lightboxcanvas.py
@@ -731,9 +731,14 @@ class LightBoxCanvas(slicecanvas.SliceCanvas):
annot = self.getAnnotations()
- annot.line(xverts[0], xverts[1], colour=(0, 1, 0), width=1)
- annot.line(yverts[0], yverts[1], colour=(0, 1, 0), width=1)
+ kwargs = {
+ 'colour' : self.cursorColour,
+ 'width' : 1
+ }
+ annot.line(xverts[0], xverts[1], **kwargs)
+ annot.line(yverts[0], yverts[1], **kwargs)
+
def _draw(self, *a):
"""Draws the current scene to the canvas. """
diff --git a/fsl/tools/fsleyes.py b/fsl/tools/fsleyes.py
index b9750a98f..8ed4d6352 100644
--- a/fsl/tools/fsleyes.py
+++ b/fsl/tools/fsleyes.py
@@ -219,7 +219,6 @@ def interface(parent, args, ctx):
splashFrame.Update()
wx.CallLater(250, splashFrame.Close)
-
# If a perspective has been specified,
# we load the perspective
if args.scene is not None:
--
GitLab