Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Jesse Heckman
pbtoolbox
Commits
b585e07e
Commit
b585e07e
authored
Jan 09, 2019
by
Jesse Heckman
Browse files
new years update
parent
1e4db666
Changes
4
Hide whitespace changes
Inline
Side-by-side
setups/vestibular chair/vPrime/core/experiment/block/vc/pb_vCheckVelSignal.m
View file @
b585e07e
...
...
@@ -9,7 +9,7 @@ function [safe,threshold] = pb_vCheckVelSignal(signal)
% PBToolbox (2018): JJH: j.heckman@donders.ru.nl
safe
=
true
;
threshold
=
5
0
;
% Should be 50 d/s: DO NOT CHANGE!!
threshold
=
6
0
;
% Should be 50 d/s: DO NOT CHANGE!!
SR
=
10
;
mvel
=
SR
*
max
(
abs
(
diff
(
signal
)));
...
...
setups/vestibular chair/vPrime/core/experiment/pb_vReadExp.m
View file @
b585e07e
...
...
@@ -224,16 +224,10 @@ function signal = readVest(line)
n
=
str2num
(
erase
(
sscanf
(
line
,
'%s'
,
2
),
sscanf
(
line
,
'%s'
,
1
)));
type
=
types
{
n
};
signal
.
type
=
type
;
if
~
strcmp
(
type
,
'none'
)
signal
.
amplitude
=
str2double
(
erase
(
sscanf
(
line
,
'%s'
,
3
),
sscanf
(
line
,
'%s'
,
2
)));
signal
.
duration
=
str2double
(
erase
(
sscanf
(
line
,
'%s'
,
4
),
sscanf
(
line
,
'%s'
,
3
)));
signal
.
frequency
=
str2double
(
erase
(
sscanf
(
line
,
'%s'
,
5
),
sscanf
(
line
,
'%s'
,
4
)));
else
signal
.
amplitude
=
0
;
signal
.
duration
=
0
;
signal
.
frequency
=
0.1
;
end
signal
.
amplitude
=
str2double
(
erase
(
sscanf
(
line
,
'%s'
,
3
),
sscanf
(
line
,
'%s'
,
2
)));
signal
.
duration
=
str2double
(
erase
(
sscanf
(
line
,
'%s'
,
4
),
sscanf
(
line
,
'%s'
,
3
)));
signal
.
frequency
=
str2double
(
erase
(
sscanf
(
line
,
'%s'
,
5
),
sscanf
(
line
,
'%s'
,
4
)));
end
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
...
...
utilities/graphics/desgin/pb_defsubplot.m
View file @
b585e07e
...
...
@@ -22,6 +22,7 @@ function [n,p] = pb_defsubplot(fig)
length
(
findobj
(
h
(
i
),
'Type'
,
'Bar'
))
+
...
length
(
findobj
(
h
(
i
),
'Type'
,
'Area'
))
+
...
length
(
findobj
(
h
(
i
),
'Type'
,
'ErrorBar'
))
+
...
length
(
findobj
(
h
(
i
),
'Type'
,
'Stem'
))
+
...
length
(
findobj
(
h
(
i
),
'Type'
,
'Histogram'
));
end
end
...
...
utilities/graphics/desgin/pb_nicegraph.m
View file @
b585e07e
...
...
@@ -159,6 +159,19 @@ function pb_nicegraph(varargin)
'EdgeColor'
,
[
0
0
0
]
,
...
'FaceAlpha'
,
0.3
);
end
% STEM:
%
% Use as 'primary' data
h_stem
=
pb_fobj
(
ax
(
i
),
'Type'
,
'Stem'
);
for
iStem
=
1
:
length
(
h_stem
)
set
(
h_stem
(
length
(
h_stem
)
+
1
-
iStem
),
...
'Color'
,
col
(
iStem
,:)
,
...
'MarkerFaceColor'
,
col
(
iStem
,:)
,
...
'LineWidth'
,
linewidth
*
1.5
);
end
end
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment