From e884e07e026e13ca6bb9e642211af66c38b5168c Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Mon, 19 Oct 2015 16:03:50 +0100
Subject: [PATCH] A couple of little fixes related to handling FEAT images
---
fsl/data/featresults.py | 8 ++++++--
fsl/fsleyes/views/timeseriespanel.py | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fsl/data/featresults.py b/fsl/data/featresults.py
index 61f9596b3..218626e3a 100644
--- a/fsl/data/featresults.py
+++ b/fsl/data/featresults.py
@@ -161,8 +161,12 @@ def loadContrasts(featdir):
tkns = line.split(None, 1)
num = [c for c in tkns[0] if c.isdigit()]
num = int(''.join(num))
- name = tkns[1].strip()
- names[num] = name
+
+ # The /ContrastName field may not
+ # actually have a name specified
+ if len(tkns) > 1:
+ name = tkns[1].strip()
+ names[num] = name
elif line.startswith('/NumContrasts'):
numContrasts = int(line.split()[1])
diff --git a/fsl/fsleyes/views/timeseriespanel.py b/fsl/fsleyes/views/timeseriespanel.py
index 84eca0000..7a39d1217 100644
--- a/fsl/fsleyes/views/timeseriespanel.py
+++ b/fsl/fsleyes/views/timeseriespanel.py
@@ -634,7 +634,7 @@ class FEATModelFitTimeSeries(TimeSeries):
"""
if not TimeSeries.update(self, coords):
return
- self.updateModelFit()
+ self.__updateModelFit()
def __updateModelFit(self):
--
GitLab