implement scaling factor to bars to use whole screen width

Author: Remi-Gau

src/aperture/apertureTexture.m

@@ -119,7 +119,9 @@
                 % Draw aperture and we rotate to match the required condition
                 Screen('DrawTexture', cfg.screen.win, cfg.aperture.texture, ...
                     cfg.screen.winRect, ...
-                    cfg.screen.winRect, ...
+                    CenterRect(...
+                    cfg.screen.winRect * cfg.magnify.scalingFactor, ...
+                    cfg.screen.winRect), ...
                     thisEvent.condition - 90);
             else
 
@@ -163,13 +165,29 @@
             end
 
         case 'bar'
+            
+            extraPositons = 0;
+            if cfg.magnify.do
+                % we add some extra bar positions that we remove afterwards to
+                % prevent having nothing on screen for a long time
+                extraPositons = 12;
+            end
 
             % Set parameters drifting bars
-            cfg.aperture.barWidthPix = cfg.stimRect(3) / cfg.volsPerCycle;
-            cfg.aperture.barPosPix = ...
+            cfg.aperture.barWidthPix = cfg.stimRect(3) / (cfg.volsPerCycle + extraPositons);
+            
+            barPosPix = ...
                 [0:cfg.aperture.barWidthPix:cfg.stimRect(3) - cfg.aperture.barWidthPix] + ...
                 (cfg.screen.winRect(3) / 2 - cfg.stimRect(3) / 2) + ...
                 cfg.aperture.barWidthPix / 2; %#ok<NBRAK>
+            
+            % Those positions are removed because they are actually outside of
+            % the screen when magnification (fit to windows width) is on
+            if cfg.magnify.do
+                barPosPix([1:6, end-5:end]) = [];
+            end
+            
+            cfg.aperture.barPosPix = barPosPix;
 
             % Width of bar in degrees of VA (needed for saving)
             cfg.aperture.width = cfg.aperture.barWidthPix / cfg.screen.ppd;