Merge pull request #12 from cpp-lln-lab/remi-fix

[FIX] minor fixes and typos

Author: Remi-Gau

src/roi/createRoi.m

@@ -1,6 +1,6 @@
 % (C) Copyright 2021 CPP ROI developers
 
-function mask = createRoi(type, specification, volumeDefiningImage, outputDir, saveImg)
+function [mask, outputFile] = createRoi(type, specification, volumeDefiningImage, outputDir, saveImg)
   %
   % Returns a mask to be used as a ROI by ``spm_summarize``.
   % Can also save the ROI as binary image.
@@ -210,8 +210,9 @@
 
   end
 
+  outputFile = [];
   if saveImg
-    saveRoi(mask, volumeDefiningImage, outputDir);
+    outputFile = saveRoi(mask, volumeDefiningImage, outputDir);
   end
 
 end
@@ -283,7 +284,7 @@
 
 end
 
-function saveRoi(mask, volumeDefiningImage, outputDir)
+function outputFile = saveRoi(mask, volumeDefiningImage, outputDir)
 
   if strcmp(mask.def, 'sphere')
 
@@ -307,8 +308,11 @@ function saveRoi(mask, volumeDefiningImage, outputDir)
                       'mat');
   saveroi(roiObject, ...
           fullfile(outputDir, tempFile));
+
+  outputFile = fullfile(outputDir, roiName);
+      
   mars_rois2img(fullfile(outputDir, tempFile), ...
-                fullfile(outputDir, roiName), ...
+                outputFile, ...
                 spm_vol(volumeDefiningImage));
   delete(fullfile(outputDir, tempFile));
 

src/utils/converToValidCamelCase.m renamed to src/utils/convertToValidCamelCase.m

@@ -1,6 +1,6 @@
 % (C) Copyright 2021 CPP ROI developers
 
-function str = converToValidCamelCase(str)
+function str = convertToValidCamelCase(str)
   %
   % Removes non alphanumeric characters and uppercase first letter of all
   % words but the first

src/utils/createFilename.m

@@ -11,7 +11,7 @@
 
     if ~any(strcmp(thisEntity, {'filename', 'type', 'ext'})) && ...
             ~isempty(p.(thisEntity))
-      thisLabel = converToValidCamelCase(p.(thisEntity));
+      thisLabel = convertToValidCamelCase(p.(thisEntity));
       newName = [newName '_' thisEntity '-' thisLabel]; %#ok<AGROW>
     end
 

src/utils/renameFile.m

@@ -1,6 +1,6 @@
 % (C) Copyright 2021 CPP ROI developers
 
-function file = renameFile(file, specification)
+function newName = renameFile(file, specification)
 
   pth = spm_fileparts(file);
   p = bids.internal.parse_filename(file);