Merge pull request #75 from iqrashahzad14/target_same

TargetsRepeat

Author: Remi-Gau

setParameters.m

@@ -133,8 +133,12 @@
     cfg.fixation.xDisplacement = 0;
     cfg.fixation.yDisplacement = 0;
 
+    % target
     cfg.target.maxNbPerBlock = 1;
     cfg.target.duration = 0.1; % In secs
+    cfg.target.type = 'fixation_cross';  
+    % 'fixation_cross' : the fixation cross changes color
+    % 'static_repeat' : dots are in the same position
 
     cfg.extraColumns = { ...
                         'direction', ...

subfun/doDotMo.m

@@ -1,7 +1,7 @@
 % (C) Copyright 2018 Mohamed Rezk
 % (C) Copyright 2020 CPP visual motion localizer developpers
 
-function [onset, duration] = doDotMo(cfg, thisEvent, thisFixation)
+function [onset, duration, dots] = doDotMo(cfg, thisEvent, thisFixation, dots)
     % Draws the stimulation of static/moving in 4 directions dots or static
     %
     % DIRECTIONS
@@ -18,8 +18,10 @@
     % We then draw an aperture on top to hide the certain dots.
 
     %% Get parameters
-
-    dots = initDots(cfg, thisEvent);
+    if ~(strcmp(thisEvent.trial_type, 'static') && thisEvent.target == 1) ...
+        || isempty(dots)
+        dots = initDots(cfg, thisEvent);
+    end
 
     % Set for how many frames this event will last
     framesLeft = floor(cfg.timing.eventDuration / cfg.screen.ifi);

visualMotionLocalizer.m

@@ -77,7 +77,8 @@
         fprintf('\n - Running Block %.0f \n', iBlock);
 
         eyeTracker('Message', cfg, ['start_block-', num2str(iBlock)]);
-
+        dots=[];
+        previousEvent.target = 0;
         % For each event in the block
         for iEvent = 1:cfg.design.nbEventsPerBlock
 
@@ -98,8 +99,16 @@
             eyeTracker('Message', cfg, ...
                        ['start_trial-', num2str(iEvent), '_', thisEvent.trial_type]);
 
+            % we want to initialize the dots position when targets type is fixation cross
+            % or if this the first event of a target pair
+            if strcmp(cfg.target.type, 'static_repeat') && ...
+                    thisEvent.target == previousEvent.target
+            else
+                dots = [];
+            end
+                
             % play the dots and collect onset and duraton of the event
-            [onset, duration] = doDotMo(cfg, thisEvent, thisFixation);
+            [onset, duration, dots] = doDotMo(cfg, thisEvent, thisFixation, dots);
 
             thisEvent = preSaveSetup( ...
                                      thisEvent, ...
@@ -121,6 +130,8 @@
             eyeTracker('Message', cfg, ...
                        ['end_trial-', num2str(iEvent), '_', thisEvent.trial_type]);
 
+                   previousEvent = thisEvent;
+                   
             waitFor(cfg, cfg.timing.ISI);
 
         end