From b44807311046822ac3d620f2ac1f5095ab6053be Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Sat, 17 Oct 2020 13:37:04 +0200 Subject: [PATCH 1/4] suppress more for octave during intialization --- src/initPTB.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/initPTB.m b/src/initPTB.m index ba29173..3e1bd9e 100644 --- a/src/initPTB.m +++ b/src/initPTB.m @@ -21,6 +21,10 @@ % % % + + % for octave: make sure information is not presented on prompt one screen at + % a time + more off; checkPtbVersion(); From f4804e85e62677c5ce6e059fb209409324429f72 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Sat, 17 Oct 2020 13:37:40 +0200 Subject: [PATCH 2/4] make farewellScreen more robust can run even when no cfg.mri field is present --- src/screen/farewellScreen.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/screen/farewellScreen.m b/src/screen/farewellScreen.m index abbe0ab..b826e93 100644 --- a/src/screen/farewellScreen.m +++ b/src/screen/farewellScreen.m @@ -5,6 +5,8 @@ function farewellScreen(cfg) Screen('FillRect', cfg.screen.win, cfg.color.background, cfg.screen.winRect); DrawFormattedText(cfg.screen.win, 'Thank you!', 'center', 'center', cfg.text.color); Screen('Flip', cfg.screen.win); - WaitSecs(cfg.mri.repetitionTime * 2); + if isfield(cfg, 'mri') + WaitSecs(cfg.mri.repetitionTime * 2); + end end From 47b6cc2868516f862b9e2df5699fd0b17a3e8a60 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Sat, 17 Oct 2020 13:38:16 +0200 Subject: [PATCH 3/4] allow for drawing non centered fielf of view --- src/drawFieldOfVIew.m | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/drawFieldOfVIew.m b/src/drawFieldOfVIew.m index f3c314b..6885690 100644 --- a/src/drawFieldOfVIew.m +++ b/src/drawFieldOfVIew.m @@ -1,24 +1,33 @@ % (C) Copyright 2020 CPP_PTB developers -function drawFieldOfVIew(cfg) +function fov = drawFieldOfVIew(cfg, centerOnScreen) % drawFieldOfVIew(cfg) % % draws a red rectangle on the screen to materialize the field of view of % the participant. This can be used during debugging to help design the % stimuli if you know the FOV of the participant will be obstructed by % something + + if nargin < 2 + centerOnScreen = true; + end + + fov = []; if isfield(cfg.screen, 'effectiveFieldOfView') && ... - numel(cfg.screen.effectiveFieldOfView) == 2 + numel(cfg.screen.effectiveFieldOfView) == 4 RED = [255 0 0]; penWidth = 2; fov = cfg.screen.effectiveFieldOfView; - - fov = CenterRect( ... - [0, 0, fov(1), fov(2)], ... - cfg.screen.winRect); + + if centerOnScreen + fov = CenterRect( ... + fov, ... + cfg.screen.winRect); + end + Screen('FrameRect', ... cfg.screen.win, ... From 935dab35e41c1bcf9d0dcfc026d118c9bebe357d Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Sat, 17 Oct 2020 13:38:46 +0200 Subject: [PATCH 4/4] mh fix --- src/drawFieldOfVIew.m | 11 +++++------ src/initPTB.m | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/drawFieldOfVIew.m b/src/drawFieldOfVIew.m index 6885690..b41ddf4 100644 --- a/src/drawFieldOfVIew.m +++ b/src/drawFieldOfVIew.m @@ -7,11 +7,11 @@ % the participant. This can be used during debugging to help design the % stimuli if you know the FOV of the participant will be obstructed by % something - + if nargin < 2 centerOnScreen = true; end - + fov = []; if isfield(cfg.screen, 'effectiveFieldOfView') && ... @@ -21,13 +21,12 @@ penWidth = 2; fov = cfg.screen.effectiveFieldOfView; - + if centerOnScreen fov = CenterRect( ... - fov, ... - cfg.screen.winRect); + fov, ... + cfg.screen.winRect); end - Screen('FrameRect', ... cfg.screen.win, ... diff --git a/src/initPTB.m b/src/initPTB.m index 3e1bd9e..986858f 100644 --- a/src/initPTB.m +++ b/src/initPTB.m @@ -21,7 +21,7 @@ % % % - + % for octave: make sure information is not presented on prompt one screen at % a time more off;