Skip to content

Commit ce0b4a8

Browse files
committed
move calibration parameters in setDefaultsPTB
1 parent bc0fd24 commit ce0b4a8

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

src/eyeTracker.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141

4242
% Calibration has silver background with black targets, sound and smaller
4343
% targets
44-
el.backgroundcolour = [192 192 192, (cfg.screen.win)];
45-
el.msgfontcolour = BlackIndex(cfg.screen.win);
46-
el.calibrationtargetcolour = BlackIndex(cfg.screen.win);
47-
el.calibrationtargetsize = 1;
48-
el.calibrationtargetwidth = 0.5;
49-
el.displayCalResults = 1;
44+
el.backgroundcolour = [cfg.eyeTracker.backgroundColor, (cfg.screen.win)];
45+
el.msgfontcolour = cfg.eyeTracker.fontColor;
46+
el.calibrationtargetcolour = cfg.eyeTracker.calibrationTargetColor
47+
el.calibrationtargetsize = cfg.eyeTracker.calibrationTargetSize
48+
el.calibrationtargetwidth = cfg.eyeTracker.calibrationTargetWidth
49+
el.displayCalResults = cfg.eyeTracker.displayCalResults
5050

5151
% Call this function for changes to the calibration structure to take
5252
% affect.

src/setDefaultsPTB.m

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,17 @@
6060

6161
end
6262

63-
if isfield(cfg, 'eyeTracker') && ~isfield(cfg.eyeTracker, 'defaultCalibration')
63+
if isfield(cfg, 'eyeTracker')
64+
65+
% Calibration environment
6466
fieldsToSet.eyeTracker.defaultCalibration = true;
67+
fieldsToSet.eyeTracker.backgroundColor = [192 192 192];
68+
fieldsToSet.eyeTracker.fontColor = [0 0 0];
69+
fieldsToSet.eyeTracker.calibrationTargetColor = [0 0 0];
70+
fieldsToSet.eyeTracker.calibrationTargetSize = 1;
71+
fieldsToSet.eyeTracker.calibrationTargetWidth = 0.5;
72+
fieldsToSet.eyeTracker.displayCalResults = 1;
73+
6574
end
6675

6776
if isfield(cfg, 'testingDevice') && strcmpi(cfg.testingDevice, 'mri')

0 commit comments

Comments
 (0)