From 6518537029588a423543cc6738f27cea8f23cb0f Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Tue, 8 Mar 2016 09:28:04 +0000
Subject: [PATCH] ClusterPanel was not disabling itself for in-memory images.
Bugfix to FeatImage.fit (caused I think by a numpy bug).
---
fsl/data/featimage.py | 4 ++--
fsl/fsleyes/controls/clusterpanel.py | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fsl/data/featimage.py b/fsl/data/featimage.py
index b18193e5b..59cc9ce89 100644
--- a/fsl/data/featimage.py
+++ b/fsl/data/featimage.py
@@ -286,8 +286,8 @@ class FEATImage(fslimage.Image):
"""
if not fullmodel:
- contrast = np.array(contrast)
- contrast /= np.sqrt((contrast ** 2).sum())
+ contrast = np.array(contrast)
+ contrast = contrast / np.sqrt((contrast ** 2).sum())
x, y, z = xyz
numEVs = self.numEVs()
diff --git a/fsl/fsleyes/controls/clusterpanel.py b/fsl/fsleyes/controls/clusterpanel.py
index 79cb70bbc..717407cf4 100644
--- a/fsl/fsleyes/controls/clusterpanel.py
+++ b/fsl/fsleyes/controls/clusterpanel.py
@@ -497,6 +497,7 @@ class ClusterPanel(fslpanel.FSLEyesPanel):
# Overlay is in-memory
if overlay.dataSource is None:
+ self.__disable(strings.messages[self, 'notFEAT'])
return
featDir = featresults.getAnalysisDir(overlay.dataSource)
--
GitLab