Skip to content

Commit 56cf2bf

Browse files
committed
refactor preTrialSetup and prepare for adapting FOV
1 parent 5158b97 commit 56cf2bf

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

subfun/preTrialSetup.m

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,36 @@
3434

3535
thisEvent.fixationPosition = cfg.design.blockFixationPosition{iBlock};
3636

37+
% cfg.aperture.xPosPix = cfg.design.xDisplacementAperturePix;
38+
3739
switch thisEvent.fixationPosition
3840

3941
case 'fixation_right'
4042
cfg.aperture.xPosPix = -abs(cfg.aperture.xPosPix);
41-
42-
thisEvent.dotCenterXPosPix = cfg.aperture.xPosPix;
43-
4443
thisFixation.fixation.xDisplacement = cfg.design.xDisplacementFixation;
45-
thisFixation = initFixation(thisFixation);
4644

4745
case 'fixation_left'
4846
cfg.aperture.xPosPix = +abs(cfg.aperture.xPosPix);
47+
thisFixation.fixation.xDisplacement = -cfg.design.xDisplacementFixation;
4948

50-
thisEvent.dotCenterXPosPix = cfg.aperture.xPosPix;
49+
otherwise
5150

52-
thisFixation.fixation.xDisplacement = -cfg.design.xDisplacementFixation;
53-
thisFixation = initFixation(thisFixation);
51+
error('WTF');
5452

5553
end
5654

55+
thisEvent.dotCenterXPosPix = cfg.aperture.xPosPix;
56+
57+
if isfield(cfg.fixation, 'xDisplacementPix')
58+
thisEvent.dotCenterXPosPix = thisEvent.dotCenterXPosPix + cfg.fixation.xDisplacementPix;
59+
thisFixation.fixation.xDisplacement = thisFixation.fixation.xDisplacement + ...
60+
cfg.fixation.xDisplacementPix;
61+
end
62+
if isfield(cfg.fixation, 'yDisplacementPix')
63+
end
64+
65+
thisFixation = initFixation(thisFixation);
66+
5767
end
5868

5969
varargout = {thisEvent, thisFixation, cfg};

0 commit comments

Comments
 (0)