Merge pull request #191 from Remi-Gau/misc

[ENH] save SoftwarePresentation details if present

Author: Remi-Gau

runTests.m

@@ -24,8 +24,9 @@ function runTests()
     folderToCover = fullfile(pwd, 'src');
     testFolder = fullfile(pwd, 'tests');
 
-    success = moxunit_runtests( ...
-                               testFolder, ...
+    addpath(fullfile(testFolder, 'utils'));
+
+    success = moxunit_runtests(testFolder, ...
                                '-verbose', '-recursive', '-with_coverage', ...
                                '-cover', folderToCover, ...
                                '-cover_xml_file', 'coverage.xml', ...

src/createDataDictionary.m

@@ -17,21 +17,23 @@ function createDataDictionary(cfg, logFile)
     fileName = strrep(logFile(1).filename, '.tsv', '.json');
     fullFilename = getFullFilename(fileName, cfg);
 
-    jsonContent = setJsonContent(logFile);
+    jsonContent = setJsonContent(logFile, cfg);
 
-    opts.Indent = '    ';
-
-    bids.util.jsonencode(fullFilename, jsonContent, opts);
+    bids.util.jsonencode(fullFilename, jsonContent);
 
 end
 
-function jsonContent = setJsonContent(logFile)
+function jsonContent = setJsonContent(logFile, cfg)
 
     % regular _events file: add default _event file fields to the json content
     if ~isfield(logFile, 'isStim') || isempty(logFile.isStim) || ~logFile.isStim
 
         jsonContent = logFile.columns;
 
+        if isfield(cfg, 'StimulusPresentation')
+            jsonContent.StimulusPresentation = cfg.StimulusPresentation;
+        end
+
         % _stim file: write stim-specific fields to the json content
     elseif logFile.isStim
 

src/createJson.m

@@ -13,10 +13,12 @@ function createJson(varargin)
     %
     % :param cfg: Configuration. See ``checkCFG()``.
     % :type cfg: structure
+    %
     % :param modality: can be any of the following ``'beh'``, ``'func'``, ``'eeg'``,
     %                  ``'ieeg'``, ``'meg'``) to specify which JSON to save. If it is not
     %                  provided it will read from ``cfg.fileName.modality``.
     % :type modality: string
+    %
     % :param extraInfo: contains information in the JSON file. Beware
     %                   that the BIDS validator is pretty strict on what information can
     %                   go in a JSON so this can be useful to store additional information
@@ -55,8 +57,7 @@ function createJson(varargin)
     end
 
     %% save
-    opts.Indent = '    ';
-    bids.util.jsonencode(fullFilename, jsonContent, opts);
+    bids.util.jsonencode(fullFilename, jsonContent);
 
 end
 

templates/.bidsignore

@@ -1,11 +1,12 @@
-*_beh.*
-*_eeg.*
-*_ieeg.*
-*_meg.*
-
-# *_beh.tsv
-# *_eeg.edf
-# *_ieeg.edf
-# *_meg.fif
+*_eeg.json
+*_eeg.edf
+
+*_ieeg.json
+*_ieeg.edf
+
+*_meg.json
+*_meg.fif
+
+*_beh.tsv
 
 # *_bold.nii.gz