migrated mrkodef_relax and added to loadmatlab

bbci · Oct 11, 2013 · 9e4f2aa · 9e4f2aa
1 parent 0942156
commit 9e4f2aa
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/fileio/file_loadMatlab.m b/fileio/file_loadMatlab.m
@@ -72,7 +72,7 @@
 end
 
 props = {'Path',            BBCI.MatDir     'CHAR';
-         'Vars',            vars(1:nargout) 'CELL{CHAR}';
+         'Vars',            vars(1:nargout) 'CELL{CHAR}|CHAR';
          'CLab'             '*'             'CHAR|CELL{CHAR}';
          'Ival'             []              'DOUBLE[2]';
          'Fs'               []          	  'DOUBLE[1]';
@@ -83,7 +83,9 @@
 [opt, isdefault]= opt_setDefaults(opt, props);
 opt_checkProplist(opt, props);
 
-
+if ~iscell(opt.Vars)
+  opt.Vars= {opt.Vars};
+end
 
 if iscell(file),
   varargout= cell(1, length(opt.Vars));

diff --git a/markers/marker_definitions/mrkodef_relax.m b/markers/marker_definitions/mrkodef_relax.m
@@ -0,0 +1,28 @@
+function mrk= mrkodef_relax(mrko)
+
+stimDef= {1, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20;
+          'stop', ...
+          'mc_left', ...                    
+          'mc_right', ...                   
+          'mc_foot', ...                    
+          'look_center', ...                  
+          'look_left', ...                    
+          'look_right', ...                   
+          'look_up', ...                      
+          'look_down', ...                    
+          'blink', ...                   
+          'press_your_eyelids_shut', ... 
+          'eyes_closed', ...             
+          'eyes_open', ...               
+          'swallow', ...                 
+          'press_tongue_to_the_roof_of_your_mouth', ...
+          'lift_shoulders', ...
+          'clench_teeth',  ... 
+          'over'}; 
+%          'maximum_compression', ...     %% corresponds to #02
+%          'look', ...                    %% corresponds to #06
+
+miscDef= {252, 253;
+          'start', 'end'};
+mrk= mrk_defineClasses(mrko, stimDef);
+mrk.misc= mrk_defineClasses(mrko, miscDef);