Commit 0700bf5f authored by Jesse Heckman's avatar Jesse Heckman
Browse files

optitrack implementation

parent 7f2ac0c0
...@@ -24,7 +24,7 @@ function pb_vRunExp(handles) ...@@ -24,7 +24,7 @@ function pb_vRunExp(handles)
% set block information % set block information
block = handles.block; block = handles.block;
nblocks = handles.cfg.Blocks; nblocks = handles.cfg.Blocks;
Dat(nblocks) = struct('VS',[],'EV',[],'PL_Gaze',[],'PL_Python',[],'PL_Primitive',[],'OT',[]); Dat(nblocks) = struct('VS',[],'EV',[],'PL_Gaze',[],'PL_Python',[],'PL_Primitive',[],'OT_Rigid',[]);
% initialize recordings % initialize recordings
% rc = pb_runPupil; % rc = pb_runPupil;
...@@ -98,7 +98,7 @@ function pb_vRunExp(handles) ...@@ -98,7 +98,7 @@ function pb_vRunExp(handles)
Dat(iBlck).PL_Python = streams(2).read; Dat(iBlck).PL_Python = streams(2).read;
Dat(iBlck).PL_Gaze = streams(3).read; Dat(iBlck).PL_Gaze = streams(3).read;
Dat(iBlck).PL_Primitive = streams(4).read; Dat(iBlck).PL_Primitive = streams(4).read;
%Dat(iBlck).OT = streams(5).read; Dat(iBlck).OT_Rigid = streams(5).read;
% update block information % update block information
handles.cfg = updateCount(handles.cfg,'block','count'); handles.cfg = updateCount(handles.cfg,'block','count');
......
...@@ -11,7 +11,7 @@ function [ses,str] = pb_runLSL(varargin) ...@@ -11,7 +11,7 @@ function [ses,str] = pb_runLSL(varargin)
pl = pb_keyval('pl', varargin, true); pl = pb_keyval('pl', varargin, true);
gz = pb_keyval('gz', varargin, true); gz = pb_keyval('gz', varargin, true);
pd = pb_keyval('pd', varargin, true); pd = pb_keyval('pd', varargin, true);
ot = pb_keyval('ot', varargin, false); ot = pb_keyval('ot', varargin, true);
tmp = {}; tmp = {};
...@@ -19,7 +19,7 @@ function [ses,str] = pb_runLSL(varargin) ...@@ -19,7 +19,7 @@ function [ses,str] = pb_runLSL(varargin)
'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Python Representation - Eye 0''', ... 'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Python Representation - Eye 0''', ...
'type=''Pupil Capture @ pupil-desktop'' and name=''Gaze Python Representation''', ... 'type=''Pupil Capture @ pupil-desktop'' and name=''Gaze Python Representation''', ...
'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Primitive Data - Eye 0''', ... 'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Primitive Data - Eye 0''', ...
'type=''OptiTrack Mocap @ DCN-VSO3'' and name=''Labeled Markers'''}; 'type=''OptiTrack Mocap @ DCN-VSO3'' and name=''Rigid Bodies'''};
if de; tmp(end+1) = streams(1); end if de; tmp(end+1) = streams(1); end
......
...@@ -10,10 +10,13 @@ function pb_savefig(varargin) ...@@ -10,10 +10,13 @@ function pb_savefig(varargin)
n = nargin; n = nargin;
fig = pb_keyval('fig',varargin); fig = pb_keyval('fig',varargin);
fname = pb_keyval('fname',varargin); fname = pb_keyval('fname',varargin);
dir = pb_keyval('dir',varargin,[pb_datadir 'PhD/Figure/']); dir = pb_keyval('dir',varargin,[pb_datadir 'PhD/Figures/']);
ext = pb_keyval('ext',varargin,'pdf');
cd(dir); cd(dir);
figure(fig);
g = groot; g = groot;
if n == 0 && ~isempty(g.Children) if n == 0 && ~isempty(g.Children)
...@@ -26,7 +29,8 @@ function pb_savefig(varargin) ...@@ -26,7 +29,8 @@ function pb_savefig(varargin)
h = get(g,'currentFigure'); h = get(g,'currentFigure');
path = [path '/' fname]; path = [path '/' fname];
savefig(h,path) savefig(h,path);
saveas(h,path,ext);
end end
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment