Skip to content

Commit 6dba643

Browse files
committed
Docstrings update part 2.
Classes folder structure reorganisation. Minor bug fixes.
1 parent 09c3e77 commit 6dba643

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1455
-1512
lines changed

+CFSVM/+Element/+Evidence/ImgMAFC.m

+25-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,19 @@
3737
% Defaults to ``0.75``.
3838
% xy_ratio: :attr:`~CFSVM.Element.Stimulus.Stimulus.xy_ratio`
3939
% Defaults to ``1``.
40-
%
40+
% rotation: :attr:`CFSVM.Element.Stimulus.Stimulus.rotation`.
41+
% Defaults to ``0``.
42+
% contrast: :attr:`CFSVM.Element.SpatialElement.contrast`.
43+
% Defaults to ``1``.
4144

4245
arguments
4346
kwargs.keys = {'LeftArrow', 'RightArrow'}
4447
kwargs.title = 'Which one have you seen?'
4548
kwargs.position = 'Center'
4649
kwargs.size = 0.75
4750
kwargs.xy_ratio = 1
51+
kwargs.rotation = 0
52+
kwargs.contrast = 1
4853
end
4954

5055
kwargs_names = fieldnames(kwargs);
@@ -141,9 +146,26 @@ function show(obj, experiment)
141146
end
142147

143148
for i = 1:obj.n_options
144-
Screen('DrawTexture', screen.window, obj.options{i}, [], obj.rects{1}(i,:));
149+
Screen( ...
150+
'DrawTexture', ...
151+
screen.window, ...
152+
obj.options{i}, ...
153+
[], ...
154+
obj.rects{1}(i,:), ...
155+
obj.rotation, ...
156+
[], ...
157+
obj.contrast);
158+
145159
if length(screen.fields) > 1
146-
Screen('DrawTexture', screen.window, obj.options{i}, [], obj.rects{2}(i,:));
160+
Screen( ...
161+
'DrawTexture', ...
162+
screen.window, ...
163+
obj.options{i}, ...
164+
[], ...
165+
obj.rects{2}(i,:), ...
166+
obj.rotation, ...
167+
[], ...
168+
obj.contrast);
147169
end
148170
end
149171

+CFSVM/+Element/+Evidence/TextMAFC.m

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111

1212

1313
properties
14-
15-
text_size {mustBeNonnegative, mustBeInteger} % ``Nonnegative int``
14+
15+
% ``Nonnegative int``
16+
text_size {mustBeNonnegative, mustBeInteger}
1617

1718
end
1819

+CFSVM/+Element/+Screen/@CheckFrame/CheckFrame.m

-60
This file was deleted.

+CFSVM/+Element/+Screen/@CheckFrame/initiate.m

-20
This file was deleted.

+CFSVM/+Element/+Screen/@CheckFrame/rects_and_colors.m

-85
This file was deleted.

+CFSVM/+Element/+Screen/@CheckFrame/reset.m

-9
This file was deleted.

+CFSVM/+Element/+Screen/@CustomScreen/CustomScreen.m

-66
This file was deleted.

0 commit comments

Comments
 (0)