update from visual localizer to use textures

Author: Remi-Gau

apertureTexture.m

@@ -1,12 +1,18 @@
-
 function cfg = apertureTexture(action, cfg, thisEvent)
 
-    matrixSize = 400;
+    transparent = [0 0 0 0];
 
     switch action
 
         case 'init'
 
+            % we take the screen height as maximum aperture width if not
+            % specified.
+            if ~isfield(cfg.aperture, 'width') || isempty(cfg.aperture.width)
+                cfg.aperture.width = cfg.screen.winRect(4) / cfg.screen.ppd;
+            end
+            cfg.aperture = degToPix('width', cfg.aperture, cfg);
+
             cfg.aperture.texture = Screen('MakeTexture', cfg.screen.win, ...
                 cfg.color.background(1) * ones(cfg.screen.winRect([4 3])));
 
@@ -16,12 +22,14 @@
 
                 case 'none'
 
-                    Screen('Fillrect', cfg.aperture.texture, [0 0 0 0]);
+                    Screen('Fillrect', cfg.aperture.texture, transparent);
 
                 case 'circle'
 
-                    Screen('FillOval', cfg.aperture.texture, [0 0 0 0], ...
-                        CenterRectOnPoint([0 0 repmat(matrixSize, 1, 2)], ...
+                    diameter = cfg.aperture.widthPix;
+
+                    Screen('FillOval', cfg.aperture.texture, transparent, ...
+                        CenterRectOnPoint([0 0 repmat(diameter, 1, 2)], ...
                         cfg.screen.winRect(3) / 2, cfg.screen.winRect(4) / 2));
 
             end
@@ -30,15 +38,9 @@
 
             Screen('DrawTexture', cfg.screen.win, cfg.aperture.texture);
 
-            %         Screen('DrawTexture', cfg.screen.win, apertureTexture, ...
-            %             cfg.screen.winRect, cfg.screen.winRect, current.apertureAngle - 90);
-            
-            
+            % Screen('DrawTexture', cfg.screen.win, apertureTexture, ...
+            % cfg.screen.winRect, cfg.screen.winRect, current.apertureAngle - 90);
+                        
     end
-    
-    
-    
-    
-    
-    
+
 end

degToPix.m

@@ -8,6 +8,6 @@
     deg = getfield(structure, fieldName); %#ok<GFLD>
 
     structure = setfield(structure, [fieldName 'Pix'], ...
-        floor(cfg.screen.ppd * deg)) ; %#ok<SFLD>
+        floor(deg * cfg.screen.ppd)) ; %#ok<SFLD>
 
 end

dotTexture.m

@@ -10,7 +10,7 @@
 
             Screen('FillRect', cfg.dot.texture, cfg.color.background);
             Screen('DrawDots', cfg.dot.texture, ...
-                thisEvent.dot.position, ...
+                thisEvent.dot.positions, ...
                 cfg.dot.sizePix, ...
                 cfg.dot.color, ...
                 cfg.screen.center, ...

getExperimentEnd.m

@@ -8,7 +8,7 @@
     ExpmtDurMin = floor(ExpmtDur / 60);
     ExpmtDurSec = mod(ExpmtDur, 60);
     disp(['Experiment lasted ', ...
-        num2str(ExpmtDurMin), ' minutes', ...
+        num2str(ExpmtDurMin), ' minutes ', ...
         num2str(ExpmtDurSec), ' seconds']);
     disp(' ');
 

waitForTrigger.m

@@ -27,7 +27,7 @@ function waitForTrigger(cfg, deviceNumber)
 
     if strcmpi(cfg.testingDevice, 'mri')
 
-        msg = 'Waiting for trigger';
+        msg = 'Waiting for trigger...';
         talkToMe(cfg, msg);
 
         while triggerCounter < cfg.mri.triggerNb