Merge pull request #47 from bachlab/issue45_bug_get_viewpoints

Fixes issue #45: changes in import_viewpoint function

src/Import/viewpoint/import_viewpoint.m

@@ -49,6 +49,7 @@
     [channels, marker, chan_info] = parse_messages(messages, channels, marker, chan_info, file_info.eyesObserved);
 
     sess_beg_indices = [find(contains(marker, '+')); size(dataraw, 1) + 1];
+
     for sn = 1:numel(sess_beg_indices) - 1
         begidx = sess_beg_indices(sn);
         endidx = sess_beg_indices(sn + 1) - 1;

src/pspm_get_viewpoint.m

@@ -309,6 +309,17 @@
 end
 
 function import_cell = import_marker_chan(import_cell, markers, mi_names, mi_values, n_rows, sampling_rate)
+    % Put here all characters which do not belong to markers. 
+    % They have to be separated by a '|'
+    non_markers = [',','|','+','|','='];
+
+    mi_names_tmp = regexprep(mi_names,non_markers,'');
+    non_empty = find(~cellfun('isempty',mi_names_tmp));
+
+    mi_names = mi_names(non_empty,1); 
+    markers = markers(non_empty,1);     
+    mi_values = mi_values(non_empty,1);
+
     import_cell.marker = 'continuous';
     import_cell.flank = 'ascending';
     import_cell.sr     = sampling_rate;