Merge branch 'release/4.3.2'

hbp-HiBoP · Aug 4, 2023 · efb1729 · efb1729
2 parents 211ff83 + 48611eb
commit efb1729
Show file tree

Hide file tree

Showing 39 changed files with 1,130 additions and 635 deletions.
diff --git a/Assets/Plugins/x86_64/Linux/libEEGFormat.so.meta b/Assets/Plugins/x86_64/Linux/libEEGFormat.so.meta
diff --git a/Assets/Plugins/x86_64/Linux/libhbp_export.so.meta b/Assets/Plugins/x86_64/Linux/libhbp_export.so.meta
diff --git a/Assets/Plugins/x86_64/Linux/libhbp_math.so.meta b/Assets/Plugins/x86_64/Linux/libhbp_math.so.meta
diff --git a/Assets/Plugins/x86_64/Windows/opencv_core3416.dll.meta b/Assets/Plugins/x86_64/Windows/opencv_core3416.dll.meta
diff --git a/Assets/Plugins/x86_64/Windows/opencv_imgcodecs3416.dll.meta b/Assets/Plugins/x86_64/Windows/opencv_imgcodecs3416.dll.meta
diff --git a/Assets/Plugins/x86_64/Windows/opencv_imgproc3416.dll.meta b/Assets/Plugins/x86_64/Windows/opencv_imgproc3416.dll.meta
diff --git a/Assets/Plugins/x86_64/Windows/opencv_videoio3416.dll.meta b/Assets/Plugins/x86_64/Windows/opencv_videoio3416.dll.meta
diff --git a/Assets/Prefabs/3D/UI/3D Menu.prefab b/Assets/Prefabs/3D/UI/3D Menu.prefab
diff --git a/Assets/Prefabs/CustomUI/ColorPicker.prefab b/Assets/Prefabs/CustomUI/ColorPicker.prefab
diff --git a/Assets/Prefabs/CustomUI/Range Slider.prefab b/Assets/Prefabs/CustomUI/Range Slider.prefab
diff --git a/Assets/Prefabs/Elements/Content/Sections/Fields/Range Slider With Values.prefab b/Assets/Prefabs/Elements/Content/Sections/Fields/Range Slider With Values.prefab
diff --git a/Assets/Prefabs/Graph/pref_Legend.prefab b/Assets/Prefabs/Graph/pref_Legend.prefab
diff --git a/Assets/Prefabs/Graph/pref_SimpleLegend.prefab b/Assets/Prefabs/Graph/pref_SimpleLegend.prefab
diff --git a/Assets/Prefabs/Informations/Graph/Graph.prefab b/Assets/Prefabs/Informations/Graph/Graph.prefab
diff --git a/Assets/Resources/Prefabs/UI/Windows/Icon modifier window.prefab b/Assets/Resources/Prefabs/UI/Windows/Icon modifier window.prefab
diff --git a/Assets/Resources/Prefabs/UI/Windows/Quick start window.prefab b/Assets/Resources/Prefabs/UI/Windows/Quick start window.prefab
diff --git a/Assets/Resources/Prefabs/UI/Windows/SubBloc modifier window.prefab b/Assets/Resources/Prefabs/UI/Windows/SubBloc modifier window.prefab
diff --git a/Assets/Resources/Prefabs/UI/Windows/Treatment modifier window.prefab b/Assets/Resources/Prefabs/UI/Windows/Treatment modifier window.prefab
diff --git a/Assets/Scripts/HBP/Data/Module3D/Modules/AtlasManager.cs b/Assets/Scripts/HBP/Data/Module3D/Modules/AtlasManager.cs
@@ -39,7 +39,6 @@ public bool DisplayMarsAtlas
                 if (m_Scene.MeshManager.SelectedMesh.Type == MeshType.MNI)
                 {
                     UpdateAtlasIndices();
-                    UpdateAtlasColors();
                 }
             }
         }
@@ -59,7 +58,6 @@ public bool DisplayJuBrainAtlas
                 m_DisplayJuBrainAtlas = value;
                 m_Scene.BrainMaterials.SetDisplayAtlas(m_DisplayJuBrainAtlas);
                 UpdateAtlasIndices();
-                UpdateAtlasColors();
             }
         }
 
@@ -138,6 +136,7 @@ public void UpdateAtlasIndices()
         {
             m_JuBrainAtlasIndices = Object3DManager.JuBrain.GetSurfaceAreaLabels(m_Scene.MeshManager.BrainSurface);
             m_MarsAtlasIndices = Object3DManager.MarsAtlas.GetSurfaceAreaLabels(m_Scene.MeshManager.BrainSurface);
+            UpdateAtlasColors();
         }
         /// <summary>
         /// Update all colors for the atlas for all vertices

diff --git a/Assets/Scripts/HBP/Data/Module3D/Modules/TriangleEraser.cs b/Assets/Scripts/HBP/Data/Module3D/Modules/TriangleEraser.cs
@@ -184,6 +184,8 @@ public void ResetEraser()
 
             m_Scene.ResetGenerators();
             m_Scene.MeshManager.UpdateMeshesFromDLL();
+            m_Scene.FMRIManager.UpdateSurfaceFMRIValues();
+            m_Scene.AtlasManager.UpdateAtlasColors();
             Module3DMain.OnRequestUpdateInToolbar.Invoke();
         }
         /// <summary>
@@ -210,6 +212,7 @@ public void EraseTriangles(Vector3 rayDirection, Vector3 hitPoint)
             m_Scene.ResetGenerators();
             m_Scene.MeshManager.UpdateMeshesFromDLL();
             m_Scene.FMRIManager.UpdateSurfaceFMRIValues();
+            m_Scene.AtlasManager.UpdateAtlasColors();
             Module3DMain.OnRequestUpdateInToolbar.Invoke();
         }
         /// <summary>
@@ -226,6 +229,7 @@ public void CancelLastAction()
             m_Scene.ResetGenerators();
             m_Scene.MeshManager.UpdateMeshesFromDLL();
             m_Scene.FMRIManager.UpdateSurfaceFMRIValues();
+            m_Scene.AtlasManager.UpdateAtlasColors();
             Module3DMain.OnRequestUpdateInToolbar.Invoke();
         }
         #endregion

diff --git a/Assets/Scripts/HBP/UI/Toolbar/Activity/ActivityGlobal.cs b/Assets/Scripts/HBP/UI/Toolbar/Activity/ActivityGlobal.cs
@@ -48,12 +48,11 @@ public override void UpdateInteractable()
             m_Toggle.interactable = true;
         }
         /// <summary>
-        /// Set the global mode
+        /// 
         /// </summary>
-        /// <param name="isOn">Global mode activated</param>
-        public void Set(bool isOn)
+        public override void UpdateStatus()
         {
-            m_Toggle.isOn = isOn;
+            m_Toggle.isOn = GetComponentInParent<ActivitySettingsToolbar>(true).IsGlobal;
         }
         #endregion
     }

diff --git a/Assets/Scripts/HBP/UI/Toolbar/Activity/ActivitySettingsToolbar.cs b/Assets/Scripts/HBP/UI/Toolbar/Activity/ActivitySettingsToolbar.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using HBP.Data.Module3D;
+using UnityEngine;
 
 namespace HBP.UI.Toolbar
 {
@@ -93,18 +94,10 @@ protected override void AddListeners()
             m_ActivityGlobal.OnChangeValue.AddListener((global) =>
             {
                 IsGlobal = global;
+                m_ToolbarMenu.TimelineToolbar.IsGlobal = global;
+                Module3DMain.OnRequestUpdateInToolbar.Invoke();
             });
         }
         #endregion
-
-        #region Public Methods
-        /// <summary>
-        /// Called when showing this toolbar
-        /// </summary>
-        public override void ShowToolbarCallback()
-        {
-            m_ActivityGlobal.Set(m_ToolbarMenu.TimelineToolbar.IsGlobal);
-        }
-        #endregion
     }
 }
diff --git a/Assets/Scripts/HBP/UI/Toolbar/Timeline/TimelineGlobal.cs b/Assets/Scripts/HBP/UI/Toolbar/Timeline/TimelineGlobal.cs
@@ -52,12 +52,11 @@ public override void UpdateInteractable()
             m_Toggle.interactable = isColumnDynamicOrFMRI && areAmplitudesComputed;
         }
         /// <summary>
-        /// Set the global mode
+        /// 
         /// </summary>
-        /// <param name="isOn">Global mode activated</param>
-        public void Set(bool isOn)
+        public override void UpdateStatus()
         {
-            m_Toggle.isOn = isOn;
+            m_Toggle.isOn = GetComponentInParent<TimelineToolbar>(true).IsGlobal;
         }
         #endregion
     }

diff --git a/Assets/Scripts/HBP/UI/Toolbar/Timeline/TimelineToolbar.cs b/Assets/Scripts/HBP/UI/Toolbar/Timeline/TimelineToolbar.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using HBP.Data.Module3D;
+using UnityEngine;
 
 namespace HBP.UI.Toolbar
 {
@@ -73,18 +74,10 @@ protected override void AddListeners()
             m_TimelineGlobal.OnChangeValue.AddListener((global) =>
             {
                 IsGlobal = global;
+                m_ToolbarMenu.ActivitySettingsToolbar.IsGlobal = global;
+                Module3DMain.OnRequestUpdateInToolbar.Invoke();
             });
         }
         #endregion
-
-        #region Public Methods
-        /// <summary>
-        /// Called when showing this toolbar
-        /// </summary>
-        public override void ShowToolbarCallback()
-        {
-            m_TimelineGlobal.Set(m_ToolbarMenu.ActivitySettingsToolbar.IsGlobal);
-        }
-        #endregion
     }
 }
diff --git a/Assets/_Scenes/HiBoP.unity b/Assets/_Scenes/HiBoP.unity