fix: lots of fixes to B-L behavior, probe panel height settings, and quick settings color

Author: dbirman

Assets/Prefabs/UI/SettingsMenu/Menus/AtlasMenu.prefab

@@ -9,8 +9,6 @@
 
 public class PinpointAtlasManager : MonoBehaviour
 {
-    [SerializeField] BregmaLambdaBehavior _blBehavior;
-
     [SerializeField] private TMP_Dropdown _atlasDropdown;
     [SerializeField] List<string> _atlasNames;
     [SerializeField] List<string> _atlasMappings;

Assets/Scenes/TrajectoryPlanner.unity

@@ -262,6 +262,8 @@ private void Start()
         if (_probeRenderer) _probeRenderer.material.color = _color;
 
         UIUpdateEvent.Invoke();
+        if (ActiveProbeManager == this)
+            ActiveProbeUIUpdateEvent.Invoke();
     }
 
     /// <summary>

Assets/Scripts/Pinpoint/PinpointAtlasManager.cs

@@ -11,7 +11,7 @@ public class ProbePanelManager : MonoBehaviour
 {
     #region Constants
     private const int MAX_VISIBLE_PROBE_PANELS = 16;
-    public float DEFAULT_PROBE_PANEL_HEIGHT {get; private set; }
+    public float _probePanelHeight {get; private set; }
     #endregion
 
     #region Public vars / Properties
@@ -23,7 +23,7 @@ public class ProbePanelManager : MonoBehaviour
     #region Unity
     private void Awake()
     {
-        DEFAULT_PROBE_PANEL_HEIGHT = 1440f;
+        _probePanelHeight = 1440f;
     }
 
     #endregion
@@ -55,7 +55,7 @@ public void CountProbePanels()
 
     public void SetPanelHeight(float newHeight)
     {
-        DEFAULT_PROBE_PANEL_HEIGHT = newHeight;
+        _probePanelHeight = newHeight;
         RecalculateProbePanels();
     }
 
@@ -74,27 +74,27 @@ public void RecalculateProbePanels()
             // Increase the layout to have two rows, by shrinking all the ProbePanel objects to be 500 pixels tall
             GridLayoutGroup probePanelParent = GameObject.Find("ProbePanelParent").GetComponent<GridLayoutGroup>();
             Vector2 cellSize = probePanelParent.cellSize;
-            cellSize.y = DEFAULT_PROBE_PANEL_HEIGHT/2;
+            cellSize.y = _probePanelHeight/2;
             probePanelParent.cellSize = cellSize;
 
             // now resize all existing probeUIs to be 720 tall
             foreach (ProbeManager probeManager in ProbeManager.Instances)
             {
-                probeManager.ResizeProbePanel(Mathf.RoundToInt(DEFAULT_PROBE_PANEL_HEIGHT/2));
+                probeManager.ResizeProbePanel(Mathf.RoundToInt(_probePanelHeight/2));
             }
         }
         else if (VisibleProbePanels <= 4)
         {
-            Debug.Log("Resizing panels to be 1440");
+            Debug.Log($"Resizing panels to be {_probePanelHeight}");
             // now resize all existing probeUIs to be 1400 tall
             GridLayoutGroup probePanelParent = GameObject.Find("ProbePanelParent").GetComponent<GridLayoutGroup>();
             Vector2 cellSize = probePanelParent.cellSize;
-            cellSize.y = DEFAULT_PROBE_PANEL_HEIGHT;
+            cellSize.y = _probePanelHeight;
             probePanelParent.cellSize = cellSize;
 
             foreach (ProbeManager probeManager in ProbeManager.Instances)
             {
-                probeManager.ResizeProbePanel(Mathf.RoundToInt(DEFAULT_PROBE_PANEL_HEIGHT));
+                probeManager.ResizeProbePanel(Mathf.RoundToInt(_probePanelHeight));
             }
         }
 

Assets/Scripts/Pinpoint/Probes/ProbeManager.cs

@@ -168,7 +168,6 @@ public async void Startup()
 
             // Set the reference coordinate before anything else happen
             // if this is the first time, load bregma
-            Debug.Log((_firstTime, _atlasReset));
             if (_firstTime || _atlasReset)
             {
                 if (Utils.BregmaDefaults.ContainsKey(Settings.AtlasName))
@@ -201,8 +200,6 @@ public async void Startup()
 
             // Now that the areas are loaded we can also set the BLDistance values
             SetBLUI();
-            if (Settings.BregmaLambdaDistance > 0f)
-                ChangeBLDistance(Settings.BregmaLambdaDistance);
 
             StartupEvent_RefAtlasLoaded.Invoke();
             StartupEvent_AnnotationTextureLoaded.Invoke(BrainAtlasManager.ActiveReferenceAtlas.AnnotationTexture);

Assets/Scripts/Pinpoint/Probes/UI/ProbePanelManager.cs

@@ -1,12 +1,19 @@
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class BregmaLambdaBehavior : MonoBehaviour
 {
-    private float _blDistance = 4.15f;
+    private float _blDistance = -1f;
     public float DefaultBLDistance { get { return _blDistance; } }
 
     [SerializeField] Slider _blSlider;
+    [SerializeField] TMP_Text _sliderText;
+
+    private void Awake()
+    {
+        _blSlider.onValueChanged.AddListener(SetSetting);
+    }
 
     public void ResetBLDistance()
     {
@@ -21,10 +28,22 @@ public void ResetBLDistance()
     /// <param name="blDistance"></param>
     public void SetBLRange(float min, float max, float blDistance)
     {
+        Debug.Log("Range set");
         _blDistance = blDistance;
 
         _blSlider.minValue = min;
         _blSlider.maxValue = max;
-        _blSlider.value = blDistance;
+        _blSlider.SetValueWithoutNotify(blDistance);
+    }
+
+    public void SetText(float value)
+    {
+        Debug.Log("Text set");
+        _sliderText.text = $"{Mathf.RoundToInt(value * 100f) / 100f}";
+    }
+
+    private void SetSetting(float value)
+    {
+        Settings.BregmaLambdaDistance = value;
     }
 }

Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ProbePanelHeightSlider : MonoBehaviour
+{
+    [SerializeField] private Slider _slider;
+
+    private void Awake()
+    {
+        _slider.onValueChanged.AddListener(SetSetting);
+    }
+
+    private void SetSetting(float value)
+    {
+        Settings.ProbePanelHeight = value;
+    }
+}

Assets/Scripts/Pinpoint/UI/BregmaLambdaBehavior.cs

@@ -262,7 +262,6 @@ public static bool ShowAllProbePanels
 
 
     private const float PROBE_PANEL_HEIGHT_DEFAULT = 1440f;
-    [SerializeField] private Slider _probePanelHeightSlider;
     public UnityEvent<float> ProbePanelHeightChangedEvent;
 
     public static float ProbePanelHeight
@@ -342,7 +341,6 @@ public static string AtlasTransformName
     }
 
     private const float BREGMALAMBDA_DEFAULT = -1f;
-    [SerializeField] private Slider _blSlider;
     public UnityEvent<float> BregmaLambdaChangedEvent;
 
     public static float BregmaLambdaDistance
@@ -694,7 +692,7 @@ private void Apply()
         _ghostInactiveAreasToggle.SetIsOnWithoutNotify(GhostInactiveAreas);
 
         // Probes
-        _probePanelHeightSlider.SetValueWithoutNotify(ProbePanelHeight);
+        ProbePanelHeight = data.ProbePanelHeight;
         ProbeSpeedChangedEvent.Invoke(data.ProbeSpeed);
 
         // Default to Bregma
@@ -715,7 +713,7 @@ private void Apply()
 
         // the relative coordinate needs to be set, since it gets propagated downstream
         ReferenceCoord = data.RelativeCoord;
-        _blSlider.SetValueWithoutNotify(BregmaLambdaDistance);
+        BregmaLambdaDistance = data.BregmaLambdaDistance;
 
         // Accounts
         _stayLoggedInToggle.SetIsOnWithoutNotify(StayLoggedIn);