Merge branch 'release/3.1.4'

hbp-HiBoP · Jan 26, 2022 · ed9e3bc · ed9e3bc
2 parents ba554e6 + a1bd8ab
commit ed9e3bc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/Assets/Plugins/x86_64/Linux/libhbp_math.so b/Assets/Plugins/x86_64/Linux/libhbp_math.so
diff --git a/Assets/Plugins/x86_64/MacOS/hbp_math.bundle/Contents/MacOS/libhbp_math b/Assets/Plugins/x86_64/MacOS/hbp_math.bundle/Contents/MacOS/libhbp_math
diff --git a/Assets/Plugins/x86_64/Windows/hbp_math.dll b/Assets/Plugins/x86_64/Windows/hbp_math.dll
diff --git a/Assets/Scripts/HBP/Data/Dataset/Dataset.cs b/Assets/Scripts/HBP/Data/Dataset/Dataset.cs
@@ -340,7 +340,11 @@ string GetDownsamplingString(DirectoryInfo dir)
                             Protocol.Protocol protocol = ApplicationState.ProjectLoaded.Protocols.FirstOrDefault(p => p.Name == splits[3]);
                             if (protocol != null)
                             {
-                                datasetByProtocol[protocol].AddData(new IEEGDataInfo("raw", new Container.Elan(Path.Combine(subdir.FullName, subdir.Name + ".eeg"), Path.Combine(subdir.FullName, subdir.Name + ".pos"), ""), patient, IEEGDataInfo.NormalizationType.Auto));
+                                FileInfo rawEEG = new FileInfo(Path.Combine(subdir.FullName, subdir.Name + ".eeg"));
+                                FileInfo rawPos = new FileInfo(Path.Combine(subdir.FullName, subdir.Name + ".pos"));
+                                if (rawEEG.Exists && rawPos.Exists)
+                                    datasetByProtocol[protocol].AddData(new IEEGDataInfo("raw", new Container.Elan(rawEEG.FullName, rawPos.FullName, ""), patient, IEEGDataInfo.NormalizationType.Auto));
+
                                 string ds = GetDownsamplingString(subdir);
                                 if (!string.IsNullOrEmpty(ds))
                                 {

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset