support case of several contrasts

Author: Remi-Gau

src/stats/utils/returnContrastImageFile.m

@@ -45,6 +45,9 @@
 
   contrastNb = getContrastNb(result, opt, SPM);
 
-  conImageFile = fullfile(SPM.swd, sprintf('con_%04.0f.nii', contrastNb));
+  for i = 1:numel(contrastNb)
+    conImageFile{i, 1} = fullfile(SPM.swd, ...
+                                  sprintf('con_%04.0f.nii', contrastNb(i))); %#ok<AGROW>
+  end
 
 end

tests/tests_stats/utils/test_getContrastNb.m

@@ -31,6 +31,29 @@ function test_getContrastNb_basic()
 
 end
 
+function test_getContrastNb_several_contrast()
+
+  %% GIVEN
+
+  opt = setTestCfg();
+
+  result.dir = pwd;
+  result.name = '.*bar';
+
+  result.name = regexify(result.name);
+
+  SPM.xCon(1, 1).name = 'foo';
+  SPM.xCon(2, 1).name = 'bar';
+  SPM.xCon(3, 1).name = 'foobar';
+
+  %% WHEN
+  contrastNb = getContrastNb(result, opt, SPM);
+
+  %% THEN
+  assertEqual(contrastNb, [2; 3]);
+
+end
+
 function test_getContrastNb_missing()
 
   if isOctave

tests/tests_stats/utils/test_returnContrastImageFile.m

@@ -20,11 +20,29 @@ function test_returnContrastImageFile_basic()
   SPM.xCon(3, 1).name = 'foobar';
 
   conImageFile = returnContrastImageFile(SPM, 'bar');
-  assertEqual(conImageFile, fullfile(pwd, 'con_0002.nii'));
+  assertEqual(conImageFile, {fullfile(pwd, 'con_0002.nii')});
 
   save(fullfile(pwd, 'SPM.mat'), 'SPM');
   conImageFile = returnContrastImageFile(SPM, 'foobar');
-  assertEqual(conImageFile, fullfile(pwd, 'con_0003.nii'));
+  assertEqual(conImageFile, {fullfile(pwd, 'con_0003.nii')});
   delete(fullfile(pwd, 'SPM.mat'));
 
 end
+
+function test_returnContrastImageFile_several()
+
+  %% GIVEN
+
+  opt = setTestCfg();
+
+  SPM.swd = pwd;
+  SPM.xCon(1, 1).name = 'foo';
+  SPM.xCon(2, 1).name = 'bar';
+  SPM.xCon(3, 1).name = 'foobar';
+
+  conImageFile = returnContrastImageFile(SPM, '.*bar');
+  assertEqual(conImageFile, ...
+              {fullfile(pwd, 'con_0002.nii'); ...
+               fullfile(pwd, 'con_0003.nii')});
+
+end