update files from retinotopy aperture refactoring

Author: Remi-Gau

apertureTexture.m renamed to src/aperture/apertureTexture.m

@@ -1,4 +1,4 @@
-function cfg = apertureTexture(action, cfg, thisEvent)
+function [cfg, thisEvent] = apertureTexture(action, cfg, thisEvent)
 
     transparent = [0 0 0 0];
 
@@ -15,6 +15,25 @@
                         cfg.aperture.width = cfg.screen.winRect(4) / cfg.screen.ppd;
                     end
                     cfg.aperture = degToPix('width', cfg.aperture, cfg);
+                    
+                case 'ring'
+                    
+                    % Set parameters for rings
+                    if strcmp(cfg.aperture.type ,'ring')
+                        % scale of outer ring (exceeding screen until
+                        % inner ring reaches window boarder)
+                        cfg.ring.maxEcc = ...
+                            cfg.screen.FOV / 2 + ...
+                            cfg.aperture.width + ...
+                            log(cfg.screen.FOV / 2 + 1) ;
+                        % ring.CsFuncFact is used to expand with log increasing speed so
+                        % that ring is at ring.maxEcc at end of cycle
+                        cfg.ring.csFuncFact = ...
+                            1 / ...
+                            ((cfg.ring.maxEcc + exp(1)) * ...
+                            log(cfg.ring.maxEcc + exp(1)) - ...
+                            (cfg.ring.maxEcc + exp(1))) ;
+                    end
             end
 
             cfg.aperture.texture = Screen('MakeTexture', cfg.screen.win, ...
@@ -48,6 +67,9 @@
 
                 case 'ring'
 
+                    % expansion speed is log over eccentricity
+                    [cfg] = eccenLogSpeed(cfg, thisEvent.time);
+                    
                     Screen('Fillrect', cfg.aperture.texture, cfg.color.background);
 
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
@@ -62,6 +84,22 @@
 
                 case 'wedge'
 
+                    cycleDuration = cfg.mri.repetitionTime * cfg.volsPerCycle;
+                    
+                    % Update angle for rotation of background and for apperture for wedge
+                    switch cfg.direction
+                        
+                        case '+'
+                            thisEvent.angle = 90 - ...
+                                cfg.aperture.width / 2 + ...
+                                (thisEvent.time / cycleDuration) * 360;
+                        case '-'
+                            thisEvent.angle = 90 - ...
+                                cfg.aperture.width / 2 - ...
+                                (thisEvent.time / cycleDuration) * 360;
+                            
+                    end
+                    
                     Screen('Fillrect', cfg.aperture.texture, cfg.color.background);
 
                     Screen('FillArc', cfg.aperture.texture, transparent, ...

src/aperture/eccenLogSpeed.m

@@ -0,0 +1,61 @@
+function [cfg] = eccenLogSpeed(cfg, time)
+    % vary CurrScale so that expansion speed is log over eccentricity
+    % cf. Tootell 1997; Swisher 2007; Warnking 2002 etc
+
+    TR = cfg.mri.repetitionTime;
+    cycleDuration = TR * cfg.volsPerCycle;
+
+    % CurrScale only influences  ring
+    if strcmp(cfg.aperture.type, 'ring')
+
+        csFuncFact = cfg.ring.csFuncFact;
+        ringWidthVA = cfg.ring.ringWidthVA;
+        maxEcc = cfg.ring.maxEcc;
+
+        switch cfg.direction
+            case '+'
+                % current visual angle linear in time
+                outerRimVA = 0 + mod(time, cycleDuration) / cycleDuration * maxEcc;
+                % ensure some foveal stimulation at beginning (which is hidden by 
+                % fixation cross otherwise)
+                if outerRimVA < cfg.fixation.size
+                    outerRimVA = cfg.fixation.size + .1;
+                end
+            case '-'
+                outerRimVA = maxEcc - mod(time, cycleDuration) / cycleDuration * maxEcc;
+                if outerRimVA > maxEcc
+                    outerRimVA = maxEcc;
+                end
+        end
+
+        % near-exp visual angle
+        newOuterRimVA = ((outerRimVA + exp(1)) * log(outerRimVA + exp(1)) - ...
+            (outerRimVA + exp(1))) * maxEcc * csFuncFact;
+        outerRimPix = newOuterRimVA * cfg.screen.ppd; % in pixel
+
+        % width of apperture changes logarithmically with eccentricity of inner ring
+        oldScaleInnerVA = outerRimVA - ringWidthVA;
+        if oldScaleInnerVA < 0
+            oldScaleInnerVA = 0;
+        end
+
+        % growing with inner ring ecc
+        ringWidthVA = cfg.aperture.width + log(oldScaleInnerVA + 1);
+        innerRimVA = newOuterRimVA - ringWidthVA;
+
+        if innerRimVA < 0
+            innerRimVA = 0;
+        end
+
+         % in pixel
+        innerRimPix =  innerRimVA * cfg.screen.ppd;
+
+        % update cfg that we are about to return
+        cfg.ring.outerRimPix = outerRimPix;
+        cfg.ring.innerRimPix = innerRimPix;
+        cfg.ring.ring_outer_rim = newOuterRimVA;
+        cfg.ring.ring_inner_rim = innerRimVA;
+
+    end
+
+end