From 0f19d5c6b0c6b71d00aff7ceabe32cd68509a007 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Sun, 12 Jul 2015 14:10:52 +0100
Subject: [PATCH] isFEATDir function wws accidentally callign op.splitext
instead of op.split.
---
fsl/data/featresults.py | 7 ++++---
fsl/fslview/overlay.py | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fsl/data/featresults.py b/fsl/data/featresults.py
index b26ec7be2..1b27dacc7 100644
--- a/fsl/data/featresults.py
+++ b/fsl/data/featresults.py
@@ -26,10 +26,11 @@ def isFEATDir(path):
if op.isfile(path):
- dirname, filename = op.splitext(path)
+ dirname, filename = op.split(path)
- if not filename.startswith('filtered_func_data'):
- return False
+ if filename.startswith('filtered_func_data'):
+ return True
+ return False
dirname = path
keys = ['.feat',
diff --git a/fsl/fslview/overlay.py b/fsl/fslview/overlay.py
index 6bf830d5f..ab751b823 100644
--- a/fsl/fslview/overlay.py
+++ b/fsl/fslview/overlay.py
@@ -285,7 +285,7 @@ def loadOverlays(paths, loadFunc='default', errorFunc='default'):
strings.messages['overlay.loadOverlays.unknownType'])
continue
- log.debug('Loading overlay {} (guessed data type: {}'.format(
+ log.debug('Loading overlay {} (guessed data type: {})'.format(
path, dtype.__name__))
try: overlays.append(dtype(path))
except Exception as e: errorFunc(path, e)
--
GitLab