From 2aa1b89da4df6618c3fbfda5616ed96e8a310563 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Tue, 29 Mar 2016 11:12:02 +0100
Subject: [PATCH] Choice properties which mix types need to have
'allowStr=True' for command-line processing to work.
---
fsl/fsleyes/displaycontext/canvasopts.py | 3 ++-
fsl/fsleyes/displaycontext/sceneopts.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fsl/fsleyes/displaycontext/canvasopts.py b/fsl/fsleyes/displaycontext/canvasopts.py
index ed0121406..3a494fe71 100644
--- a/fsl/fsleyes/displaycontext/canvasopts.py
+++ b/fsl/fsleyes/displaycontext/canvasopts.py
@@ -59,7 +59,8 @@ class SliceCanvasOpts(props.HasProperties):
zax = props.Choice((0, 1, 2),
- alternates=[['x', 'X'], ['y', 'Y'], ['z', 'Z']])
+ alternates=[['x', 'X'], ['y', 'Y'], ['z', 'Z']],
+ allowStr=True)
"""The display coordinate system axis to be used as the screen *depth*
axis.
"""
diff --git a/fsl/fsleyes/displaycontext/sceneopts.py b/fsl/fsleyes/displaycontext/sceneopts.py
index b9b0681d7..1f076bda1 100644
--- a/fsl/fsleyes/displaycontext/sceneopts.py
+++ b/fsl/fsleyes/displaycontext/sceneopts.py
@@ -61,7 +61,7 @@ class SceneOpts(props.HasProperties):
# performance because, for example, the
# OrthoEditProfile does numerical comparisons
# to it.
- performance = props.Choice((1, 2, 3, 4), default=4)
+ performance = props.Choice((1, 2, 3, 4), default=4, allowStr=True)
"""User controllable performance setting.
This property is linked to the :attr:`renderMode` and
--
GitLab