Small changes

Changes based on Remi-Gau's comments.

Author: TomasLenc

src/createDataDictionary.m

@@ -27,8 +27,14 @@ function createDataDictionary(cfg, logFile)
 
 function jsonContent = setJsonContent(fullFilename, logFile)
 
-    if logFile.isStim == 1
+    % add default _event file fields to the json content
+    if ~logFile.isStim
+        
+        jsonContent = logFile.columns; 
 
+    % write json fields if this is a _stim file
+    elseif logFile.isStim
+        
         samplingFrequency = nan;
         startTime = nan;
 
@@ -43,14 +49,8 @@ function createDataDictionary(cfg, logFile)
                              'SamplingFrequency', samplingFrequency, ...
                              'StartTime',  startTime, ...
                              'Columns', []);
-
-    elseif logFile.isStim == 1
-    
-        % add holy trininty columns to the json content
-        jsonContent = logFile.columns; 
-    
     end
-    
+        
     % transfer content of extra fields to json content
     namesExtraColumns = returnNamesExtraColumns(logFile);
 
@@ -62,10 +62,8 @@ function createDataDictionary(cfg, logFile)
 
             headerName = returnHeaderName(namesExtraColumns{iExtraColumn}, nbCol, iCol);
 
-            if ismember('_stim', fullFilename)
-
+            if logFile.isStim
                 jsonContent.Columns{end + 1} = headerName;
-
             end
 
             jsonContent.(headerName) = ...

src/saveEventsFile.m

@@ -72,12 +72,9 @@
     %
     %
 
-    if nargin < 1
-        error('Missing action input');
-    end
-
     if nargin < 2
-        cfg = struct();
+        error(['Missing arguments. Please specify <action input> ',...
+               'and <cfg file> as the first two arguments']);
     end
 
     if nargin < 3 || isempty(logFile)
@@ -89,7 +86,7 @@
         case 'init'
 
             % flag to indicate that this will be an _events file
-            logFile.isStim = 0; 
+            logFile(1).isStim = 0; 
 
             logFile(1).filename = cfg.fileName.events;
 
@@ -98,7 +95,7 @@
         case 'init_stim'
 
             % flag to indicate that this will be an _stim file
-            logFile.isStim = 1; 
+            logFile(1).isStim = 1; 
 
             logFile(1).filename = cfg.fileName.stim;
 
@@ -214,7 +211,7 @@
                                        logFile.filename), ...
                               'w');
 
-    if logFile(1,1).isStim == 0 
+    if logFile(1).isStim == 0 
         % print the basic BIDS columns
         fprintf(logFile(1).fileID, '%s\t%s\t%s', 'onset', 'duration', 'trial_type');
         fprintf(1, '%s\t%s\t%s', 'onset', 'duration', 'trial_type');
@@ -225,7 +222,7 @@
         fprintf(logFile(1).fileID, '\n');
         fprintf(1, '\n');
 
-    elseif logFile(1,1).isStim == 1 
+    elseif logFile(1).isStim == 1 
         % don't print column headers for _stim.tsv
 
     end
@@ -343,9 +340,12 @@ function printHeaderExtraColumns(logFile)
 
         logFile = checklLogFile('fields', logFile, iEvent, cfg);
 
+        % check if this event should be skipped
+        skipEvent = false; 
+        
         % if this is _events file, we skip events with onset or duration 
         % that are empty, nan or char. 
-        if logFile(1,1).isStim==0 
+        if logFile(1).isStim==0 
 
             onset = logFile(iEvent).onset;
             duration = logFile(iEvent).duration;
@@ -355,41 +355,54 @@ function printHeaderExtraColumns(logFile)
                any(cellfun(@ischar, {onset duration})) || ...
                any(isempty({onset duration})) 
 
-                warning('saveEventsFile:emptyEvent', ...
-                        '\nSkipping saving this event.\n onset: %s \n duration: %s\n', ...
+                skipEvent = true; 
+
+                warningMessage = sprintf(['saveEventsFile:emptyEvent', ...
+                        '\nSkipping saving this event.\n onset: %s \n duration: %s\n'], ...
                         onset, ...
                         duration);
-            else
-                printData(logFile(1).fileID, onset, cfg);
-                printData(logFile(1).fileID, duration, cfg);
-                printData(logFile(1).fileID, trial_type, cfg);
-                
-                printExtraColumns(logFile, iEvent, cfg);
-
-                fprintf(logFile(1).fileID, '\n');
-                fprintf(1, '\n');
-
             end
 
         % if this is _stim file, we skip missing events (i.e. events where 
         % all extra columns have NO values)
-        elseif logFile(1,1).isStim==1
+        elseif logFile(1).isStim==1
 
-            skipEvent = false; 
             namesExtraColumns = returnNamesExtraColumns(logFile);
+            isValid = ones(1,numel(namesExtraColumns))
             for iExtraColumn = 1:numel(namesExtraColumns)
                 data = logFile(iEvent).(namesExtraColumns{iExtraColumn}); 
                 if isempty(data) || isnan(data) || ( ischar(data) && strcmp(data,'n/a') )
-                    skipEvent = true; 
+                    isValid(iExtraColumn) = 0; 
                 end
             end
-            if ~skipEvent
-                printExtraColumns(logFile, iEvent, cfg);
+            if ~any(isValid) 
+                skipEvent = true; 
+                
+                warningMessage = sprintf(['saveEventsFile:emptyEvent', ...
+                        '\nSkipping saving this event.\n No values defined. \n']); 
+            end
+        end
+        
+        % now save the event to log file (if not skipping)
+        if skipEvent   
+           
+            warning(warningMessage); 
+            
+        else
+            
+            if logFile(1).isStim==0 
+                
+                printData(logFile(1).fileID, onset, cfg);
+                printData(logFile(1).fileID, duration, cfg);
+                printData(logFile(1).fileID, trial_type, cfg);
 
-                fprintf(logFile(1).fileID, '\n');
-                fprintf(1, '\n');
             end
 
+            printExtraColumns(logFile, iEvent, cfg);
+
+            fprintf(logFile(1).fileID, '\n');
+            fprintf(1, '\n');
+
         end
 
     end
@@ -441,9 +454,8 @@ function printData(output, data, cfg)
 
     logFile(2:end) = [];
 
-    if logFile(1,1).isStim == 0 
-        namesColumns = {'onset', 'duration', 'trial_type'};
-    elseif logFile(1,1).isStim == 1 
+    namesColumns = {'onset', 'duration', 'trial_type'};
+    if logFile(1).isStim == 1 
         namesColumns = {};
     end
     namesExtraColumns = returnNamesExtraColumns(logFile);