Merge pull request #107 from Remi-Gau/remi-change_read_filter_save

[FIX] make data saving after filtering all the relevant lines  #105

Author: Remi-Gau

src/readAndFilterLogfile.m

@@ -63,6 +63,8 @@
     for iField = 1:numel(listFields)
         output.(listFields{iField})(~filterIdx) = [];
     end
+    
+    output = convertStruct(output);
 
     % Convert the structure to dataset
     try
@@ -79,3 +81,21 @@
     end
 
 end
+
+function structure = convertStruct(structure)
+    % changes the structure
+    %
+    % from struct.field(i,1) to struct(i,1).field(1)
+    
+    fieldsList = fieldnames(structure);
+    tmp = struct();
+    
+    for iField = 1:numel(fieldsList)
+        for i = 1:numel(structure.(fieldsList{iField}))
+            tmp(i,1).(fieldsList{iField}) =  structure.(fieldsList{iField})(i,1);
+        end
+    end
+    
+    structure = tmp;
+    
+end

src/subfun/utilsForTests/setUp.m

@@ -2,17 +2,13 @@
 
 function [cfg, logFile] = setUp()
 
-    outputDir = fullfile(fileparts(mfilename('fullpath')), 'output');
-
     cfg.verbose = true;
 
     cfg.subject.subjectNb = 1;
     cfg.subject.runNb = 1;
 
     cfg.task.name = 'testtask';
 
-    cfg.dir.output = outputDir;
-
     cfg.testingDevice = 'mri';
 
     cfg = createFilename(cfg);

tests/test_readAndFilterLogfile.m

@@ -9,7 +9,7 @@
 function test_readAndFilterLogfileBasic()
 
     %% set up
-
+    cfg.dir.output = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
     [cfg, logFile] = setUp();
 
     % create the events file and header
@@ -29,6 +29,20 @@ function test_readAndFilterLogfileBasic()
     logFile(end, 1).Speed = 2;
     logFile(end, 1).is_Fixation = true;
     logFile(end, 1).LHL24 = 2:13;
+    
+    logFile(3, 1).onset = 2;
+    logFile(end, 1).trial_type = 'motion_up';
+    logFile(end, 1).duration = 3;
+    logFile(end, 1).Speed = 2;
+    logFile(end, 1).is_Fixation = true;
+    logFile(end, 1).LHL24 = 1:12;
+    
+    logFile(4, 1).onset = 2;
+    logFile(end, 1).trial_type = 'motion_down';
+    logFile(end, 1).duration = 3;
+    logFile(end, 1).Speed = 2;
+    logFile(end, 1).is_Fixation = true;
+    logFile(end, 1).LHL24 = 2:13;
 
     logFile = saveEventsFile('save', cfg, logFile);
 
@@ -48,8 +62,11 @@ function test_readAndFilterLogfileBasic()
     assertEqual(exist(expectedFile, 'file'), 2);
 
     content = bids.util.tsvread(expectedFile);
+    
+    assertEqual(size(content.trial_type), [2, 1]);
 
     assertEqual(content.trial_type{1}, 'motion_down');
+    assertEqual(content.trial_type{2}, 'motion_down');
 
 end