From 635fa0ee9db08b6e651450dd86f7b447265296c2 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 10 Jul 2015 10:20:13 +0100
Subject: [PATCH] TimeSeriesListPanel uses display.name instead of
overlay.name.
---
fsl/fslview/controls/timeserieslistpanel.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/fsl/fslview/controls/timeserieslistpanel.py b/fsl/fslview/controls/timeserieslistpanel.py
index f9d231c4e..e6d0f060a 100644
--- a/fsl/fslview/controls/timeserieslistpanel.py
+++ b/fsl/fslview/controls/timeserieslistpanel.py
@@ -103,7 +103,9 @@ class TimeSeriesListPanel(fslpanel.FSLViewPanel):
def __makeLabel(self, ts):
- return '{} [{} {} {}]'.format(ts.overlay.name,
+ display = self._displayCtx.getDisplay(ts.overlay)
+
+ return '{} [{} {} {}]'.format(display.name,
ts.coords[0],
ts.coords[1],
ts.coords[2])
@@ -113,6 +115,9 @@ class TimeSeriesListPanel(fslpanel.FSLViewPanel):
import fsl.fslview.views.timeseriespanel as tsp
+ overlay = modelTs.overlay
+ display = self._displayCtx.getDisplay(overlay)
+
if isinstance(modelTs, tsp.FEATResidualTimeSeries):
return '{} ({})'.format(
parentTs.label,
@@ -120,9 +125,9 @@ class TimeSeriesListPanel(fslpanel.FSLViewPanel):
elif isinstance(modelTs, tsp.FEATEVTimeSeries):
return '{} EV{} ({})'.format(
- modelTs.overlay.name,
+ display.name,
modelTs.idx + 1,
- modelTs.overlay.evNames()[modelTs.idx])
+ overlay.evNames()[modelTs.idx])
label = '{} ({})'.format(
parentTs.label,
@@ -134,7 +139,7 @@ class TimeSeriesListPanel(fslpanel.FSLViewPanel):
elif modelTs.fitType == 'cope':
return label.format(
modelTs.idx + 1,
- modelTs.overlay.contrastNames()[modelTs.idx])
+ overlay.contrastNames()[modelTs.idx])
elif modelTs.fitType == 'pe':
return label.format(modelTs.idx + 1)
--
GitLab