mh fix

Author: Remi-Gau

demos/CPP_waitForTriggerDemo.m

@@ -1,6 +1,5 @@
 addpath(genpath(fullfile(pwd, '..', 'src')));
 
-
 %%
 cfg.testingDevice = 'mri';
 
@@ -17,7 +16,6 @@
 quietMode = true;
 % waitForTrigger(cfg, [], quietMode);
 
-
 %%
 nbTriggersToWait = 1;
-waitForTrigger(cfg, [], quietMode, nbTriggersToWait);
+waitForTrigger(cfg, [], quietMode, nbTriggersToWait);

src/waitFor.m

@@ -2,15 +2,15 @@ function waitFor(cfg, timeToWait)
     % waitFor(cfg, timeToWait)
     %
     % Will either wait for a certain amount of time or a number of triggers
-    
+
     if cfg.pacedByTriggers.do
-        waitForTrigger(...
+        waitForTrigger( ...
             cfg, ...
             cfg.keyboard.responseBox, ...
             cfg.pacedByTriggers.quietMode, ...
             timeToWait);
     else
         WaitSecs(timeToWait);
     end
-    
-end
+
+end

src/waitForTrigger.m

@@ -23,58 +23,58 @@ function waitForTrigger(varargin)
     % the prompt
     %
     % - nbTriggersToWait
-    
+
     [cfg, nbTriggersToWait, deviceNumber, quietMode] = checkInputs(varargin);
-    
+
     triggerCounter = 0;
-    
+
     if strcmpi(cfg.testingDevice, 'mri')
-        
+
         msg = ['Experiment starting in ', ...
             num2str(nbTriggersToWait - triggerCounter), '...'];
-        
+
         talkToMe(cfg, msg, quietMode);
-        
+
         while triggerCounter < nbTriggersToWait
-            
+
             keyCode = []; %#ok<NASGU>
-            
+
             [~, keyCode] = KbPressWait(deviceNumber);
-            
+
             if strcmp(KbName(keyCode), cfg.mri.triggerKey)
-                
+
                 triggerCounter = triggerCounter + 1 ;
-                
+
                 msg = sprintf(' Trigger %i', triggerCounter);
-                
+
                 talkToMe(cfg, msg, quietMode);
-                
+
                 % we only wait if this is not the last trigger
                 if triggerCounter < nbTriggersToWait
                     pauseBetweenTriggers(cfg);
                 end
-                
+
             end
         end
     end
 end
 
 function [cfg, nbTriggersToWait, deviceNumber, quietMode] = checkInputs(varargin)
-    
+
     varargin = varargin{1};
-    
+
     if numel(varargin) < 1 || isempty(varargin{1}) || ~isstruct(varargin{1})
         error('First input must be a cfg structure.');
-    elseif isstruct(varargin{1})  
+    elseif isstruct(varargin{1})
         cfg = varargin{1};
     end
-    
+
     if numel(varargin) < 3 || isempty(varargin{3})
         quietMode = false;
     else
         quietMode = varargin{3};
     end
-    
+
     if numel(varargin) < 2 || isempty(varargin{2})
         deviceNumber = -1;
         if ~quietMode
@@ -83,45 +83,45 @@ function waitForTrigger(varargin)
     else
         deviceNumber = varargin{2};
     end
-    
+
     if numel(varargin) < 4 || isempty(varargin{4})
         nbTriggersToWait = cfg.mri.triggerNb;
     else
         nbTriggersToWait = varargin{4};
     end
-    
+
 end
 
 function talkToMe(cfg, msg, quietMode)
-    
+
     if ~quietMode
-        
+
         fprintf([msg, ' \n']);
-        
+
         if isfield(cfg, 'screen') && isfield(cfg.screen, 'win')
-            
+
             DrawFormattedText(cfg.screen.win, msg, ...
                 'center', 'center', cfg.text.color);
-            
+
             Screen('Flip', cfg.screen.win);
-            
+
         end
-        
+
     end
-    
+
 end
 
 function pauseBetweenTriggers(cfg)
     % we pause between triggers otherwise KbWait and KbPressWait might be too fast and could
     % catch several triggers in one go.
-    
+
     waitTime = 0.5;
     if isfield(cfg, 'mri') && isfield(cfg.mri, 'repetitionTime') && ~isempty(cfg.mri.repetitionTime)
         waitTime = cfg.mri.repetitionTime / 2;
     end
-    
+
     WaitSecs(waitTime);
-    
+
 end
 
 % function [MyPort] = WaitForScanTrigger(Parameters)