Fixed reading EEGLAB epoched .set files: Latency of events was incorrect

brainstorm-tools · Apr 12, 2018 · e7775d3 · e7775d3
1 parent 691dae2
commit e7775d3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/doc/license.html b/doc/license.html
@@ -3,7 +3,7 @@
 
 </head>
 <body alink="#fff000" link="#fff000" vlink="#fff000">
-<!-- LICENCE_START -->Version: 3.4 (29-Mar-2018)<br>
+<!-- LICENCE_START -->Version: 3.4 (12-Apr-2018)<br>
 <span style="font-style: italic;">COPYRIGHT &copy; 2000-2018
 USC &amp; McGill University.<br>
 </span>

diff --git a/doc/updates.txt b/doc/updates.txt
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------
+April 2018
+- Bug fix: Reading EEGLAB epoched .set files: Latency of additional events was incorrect
+---------------------------------------------------------------
 March 2018
 - Bug fix: "Filter" processes were replacing the actual data with the "Std" field
 - Bug fix: Exporting vox2ras transformation to .nii when volume was not initially .nii

diff --git a/doc/version.txt b/doc/version.txt
@@ -1,2 +1,2 @@
 % Brainstorm
-% v. 3.4 180329 (29-Mar-2018)
+% v. 3.4 180412 (12-Apr-2018)
diff --git a/toolbox/io/in_fopen_eeglab.m b/toolbox/io/in_fopen_eeglab.m
@@ -398,7 +398,7 @@
         end
         % For epoched files: convert events to samples local to each epoch 
         if ~hdr.isRaw
-            events(iEvt).samples = events(iEvt).samples - (events(iEvt).epochs - 1) * (sFile.prop.samples(2) - sFile.prop.samples(1) + 1);
+            events(iEvt).samples = events(iEvt).samples - (events(iEvt).epochs - 1) * (sFile.prop.samples(2) - sFile.prop.samples(1) + 1) + sFile.prop.samples(1) - 1;
         end
         % Compute times
         events(iEvt).times = events(iEvt).samples ./ sFile.prop.sfreq;