Skip to content

Commit 0ab3ab8

Browse files
committed
mh fix
1 parent d234c83 commit 0ab3ab8

File tree

12 files changed

+29
-23
lines changed

12 files changed

+29
-23
lines changed

src/aperture/getApertureName.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
switch cfg.aperture
66
case 'Bar'
77
apertureName = sprintf('bar_angle-%i_position-%02.2f.tif', ...
8-
apertures.barAngle(iApert), ...
9-
apertures.barPostion(iApert));
8+
apertures.barAngle(iApert), ...
9+
apertures.barPostion(iApert));
1010
case 'Wedge'
1111
apertureName = sprintf('wedge_nb-%i.tif', iApert);
1212
case 'Ring'

src/aperture/saveAperture.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
CurApImg = rgb2gray(CurApImg);
1919
CurApImg = imresize(CurApImg, [Rect(4) Rect(3)]);
2020
Fxy = round(CenterRect(FrameRect, Rect) + ...
21-
[Parameters.Image_Position Parameters.Image_Position]);
21+
[Parameters.Image_Position Parameters.Image_Position]);
2222
CurApImg = CurApImg(Fxy(2):Fxy(4), Fxy(1):Fxy(3));
2323
CurApImg = double(abs(double(CurApImg) - 127) > 1);
2424
CurApImg = imresize(CurApImg, [100 100]);

src/aperture/saveApertures.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function saveApertures(saveAps, cfg, apertures)
66
if saveAps
77

88
matFile = fullfile( ...
9-
cfg.outputDir, ...
10-
strrep(cfg.fileName.events, '.tsv', '_AperturesPRF.mat'));
9+
cfg.outputDir, ...
10+
strrep(cfg.fileName.events, '.tsv', '_AperturesPRF.mat'));
1111
if IsOctave
1212
save(matFile, '-mat7-binary');
1313
else
@@ -34,8 +34,8 @@ function saveApertures(saveAps, cfg, apertures)
3434
apertureName = getApertureName(cfg, apertures, iApert);
3535

3636
print(gcf, ...
37-
fullfile(cfg.aperture.outputDir, [ApertureName '.tif']), ...
38-
'-dtiff');
37+
fullfile(cfg.aperture.outputDir, [ApertureName '.tif']), ...
38+
'-dtiff');
3939
end
4040

4141
end

src/aperture/smoothOval.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ function smoothOval(win, color, rect, fringe)
1111

1212
for f = 0:fringe - 1
1313
Screen('FillOval', win, ...
14-
[color alphas(f + 1)], ...
15-
[rect(1) + f rect(2) + f rect(3) - f rect(4) - f]);
14+
[color alphas(f + 1)], ...
15+
[rect(1) + f rect(2) + f rect(3) - f rect(4) - f]);
1616
end

src/aperture/smoothRect.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ function smoothRect(win, color, rect, fringe)
1111

1212
for f = 0:fringe - 1
1313
Screen('FillRect', win, ...
14-
[color alphas(f + 1)], ...
15-
[rect(1) + f rect(2) + f rect(3) - f rect(4) - f]);
14+
[color alphas(f + 1)], ...
15+
[rect(1) + f rect(2) + f rect(3) - f rect(4) - f]);
1616
end

src/dot/dotMotionSimulation.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
% (C) Copyright 2020 CPP_PTB developers
2+
13
function relativeDensityContrast = dotMotionSimulation(cfg, thisEvent, nbEvents, doPlot)
4+
% relativeDensityContrast = dotMotionSimulation(cfg, thisEvent, nbEvents, doPlot)
5+
%
26
% to simulate where the dots are more dense on the screen
37
% relativeDensityContrast : hard to get it below 0.10
48

src/dot/seedDots.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
% (C) Copyright 2020 CPP_PTB developers
2+
13
function [positions, speeds, time] = seedDots(varargin)
24

35
[dots, cfg, isSignal] = deal(varargin{:});
@@ -22,7 +24,7 @@
2224

2325
%% Create a vector to update to dotlife time of each dot
2426
% Not all set to 1 so the dots will die at different times
25-
% The maximum value is the duraion of the event in frames
27+
% The maximum value is the duration of the event in frames
2628
time = floor(rand(nbDots, 1) * cfg.timing.eventDuration / cfg.screen.ifi);
2729

2830
end

src/eyeTracker.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
% coordinates, here for 6 dots.
103103

104104
% [width, height]=Screen('WindowSize', screenNumber);
105-
105+
106106
% TODO - update those values with the content set up by
107107
% CPP_PTB in the cfg
108108
% fieldsToSet.eyeTracker.CalibrationPosition = '';
@@ -135,7 +135,7 @@
135135

136136
% Enter Eyetracker camera setup mode, calibration and validation.
137137
EyelinkDoTrackerSetup(el);
138-
138+
139139
% TODO - update content of cfg after initializing and
140140
% calibration
141141
% fieldsToSet.eyeTracker.SamplingFrequency = [];
@@ -144,7 +144,7 @@
144144
% fieldsToSet.eyeTracker.SoftwareVersions = '';
145145
% fieldsToSet.eyeTracker.MaximalCalibrationError = [];
146146
% fieldsToSet.eyeTracker.AverageCalibrationError = [];
147-
147+
148148
% Go back to default screen background color.
149149
Screen('FillRect', cfg.screen.win, cfg.color.background);
150150
Screen('Flip', cfg.screen.win);

src/readAndFilterLogfile.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
tsvFile = varargin{1};
2929
elseif isstruct(varargin{1})
3030
tsvFile = fullfile(varargin{1}.dir.outputSubject, ...
31-
varargin{1}.fileName.modality, ...
32-
varargin{1}.fileName.events);
31+
varargin{1}.fileName.modality, ...
32+
varargin{1}.fileName.events);
3333
end
3434

3535
% Check if the file exists

src/utils/makeGif.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
output_folder = fullfile(pwd, 'ouputs');
88
screen_capture_folder = fullfile(output_folder, 'screen_capture');
99
screen_capture_filename = fullfile(screen_capture_folder, ...
10-
'EMCL_kaks_frame-');
10+
'EMCL_kaks_frame-');
1111

1212
gif_file = fullfile(screen_capture_folder, ...
13-
'EMCL_kaks_frame.gif');
13+
'EMCL_kaks_frame.gif');
1414

1515
FigDim = [100, 100, 1000, 1500];
1616
Visibility = 'on';
@@ -20,8 +20,8 @@
2020
filename = fullfile([screen_capture_filename sprintf('%04.0f', tif_img) '.tif']);
2121

2222
h = figure('name', 'test', ...
23-
'Position', FigDim, 'Color', [1 1 1], ...
24-
'Visible', Visibility);
23+
'Position', FigDim, 'Color', [1 1 1], ...
24+
'Visible', Visibility);
2525

2626
imshow(imread(filename));
2727

0 commit comments

Comments
 (0)