WIP Build out demo UI

kjy5 · kjy5 · commit ebd894e7cbf3 · 2025-11-14T03:49:15.000-08:00
diff --git a/Assets/Scripts/Models/MainReducers.cs b/Assets/Scripts/Models/MainReducers.cs
@@ -13,11 +13,6 @@ public static MainState SetIsAutomationEnabledReducer(MainState state, IAction<b
             return state with { IsAutomationEnabled = action.payload };
         }
 
-        public static MainState SetIsDemoEnabledReducer(MainState state, IAction<bool> action)
-        {
-            return state with { IsDemoEnabled = action.payload };
-        }
-
         public static MainState SetMainSplitViewStateReducer(
             MainState state,
             IAction<SplitView.State> action
@@ -40,9 +35,6 @@ public static class MainActions
         public static readonly ActionCreator<bool> SET_IS_AUTOMATION_ENABLED =
             $"{SliceNames.MAIN_SLICE}/SetIsAutomationEnabled";
 
-        public static readonly ActionCreator<bool> SET_IS_DEMO_ENABLED =
-            $"{SliceNames.MAIN_SLICE}/SetIsDemoEnabled";
-
         public static readonly ActionCreator<SplitView.State> SET_MAIN_SPLIT_VIEW_STATE =
             $"{SliceNames.MAIN_SLICE}/SetMainSplitViewState";
 
diff --git a/Assets/Scripts/Models/Scene/ManipulatorState.cs b/Assets/Scripts/Models/Scene/ManipulatorState.cs
@@ -70,5 +70,15 @@ public record ManipulatorState
         public int DrivePastDistance;
 
         #endregion
+
+        #region Demo
+
+        public Vector4 DemoHomeCoordinate;
+        
+        public Vector4 DemoTargetCoordinate;
+
+        public bool IsDemoRunning;
+
+        #endregion
     }
 }
diff --git a/Assets/Scripts/Models/Scene/SceneReducers.cs b/Assets/Scripts/Models/Scene/SceneReducers.cs
@@ -680,6 +680,54 @@ public static SceneState SetManipulatorManualControlEnabledReducer(
             return state with { Manipulators = manipulatorsCopy };
         }
 
+        public static SceneState SetManipulatorDemoHomeCoordinateReducer(
+            SceneState state,
+            IAction<(string Id, Vector4 DemoHomeCoordinate)> action
+        )
+        {
+            var index = state.Manipulators.FindIndex(m => m.Id == action.payload.Id);
+            if (index == -1)
+                return state;
+            var manipulatorsCopy = state.Manipulators.ToList();
+            manipulatorsCopy[index] = manipulatorsCopy[index] with
+            {
+                DemoHomeCoordinate = action.payload.DemoHomeCoordinate,
+            };
+            return state with { Manipulators = manipulatorsCopy };
+        }
+
+        public static SceneState SetManipulatorDemoTargetCoordinateReducer(
+            SceneState state,
+            IAction<(string Id, Vector4 DemoTargetCoordinate)> action
+        )
+        {
+            var index = state.Manipulators.FindIndex(m => m.Id == action.payload.Id);
+            if (index == -1)
+                return state;
+            var manipulatorsCopy = state.Manipulators.ToList();
+            manipulatorsCopy[index] = manipulatorsCopy[index] with
+            {
+                DemoTargetCoordinate = action.payload.DemoTargetCoordinate,
+            };
+            return state with { Manipulators = manipulatorsCopy };
+        }
+
+        public static SceneState SetManipulatorDemoRunningReducer(
+            SceneState state,
+            IAction<(string Id, bool IsDemoRunning)> action
+        )
+        {
+            var index = state.Manipulators.FindIndex(m => m.Id == action.payload.Id);
+            if (index == -1)
+                return state;
+            var manipulatorsCopy = state.Manipulators.ToList();
+            manipulatorsCopy[index] = manipulatorsCopy[index] with
+            {
+                IsDemoRunning = action.payload.IsDemoRunning,
+            };
+            return state with { Manipulators = manipulatorsCopy };
+        }
+
         #endregion
 
         #region Automation Reducers
@@ -1138,6 +1186,24 @@ bool ManualControlEnabled
         )> SET_MANIPULATOR_MANUAL_CONTROL_ENABLED =
             $"{SliceNames.SCENE_SLICE}/SetManipulatorManualControlEnabled";
 
+        public static readonly ActionCreator<(
+            string Id,
+            Vector4 DemoHomeCoordinate
+        )> SET_MANIPULATOR_DEMO_HOME_COORDINATE =
+            $"{SliceNames.SCENE_SLICE}/SetManipulatorDemoHomeCoordinate";
+
+        public static readonly ActionCreator<(
+            string Id,
+            Vector4 DemoTargetCoordinate
+        )> SET_MANIPULATOR_DEMO_TARGET_COORDINATE =
+            $"{SliceNames.SCENE_SLICE}/SetManipulatorDemoTargetCoordinate";
+
+        public static readonly ActionCreator<(
+            string Id,
+            bool IsDemoRunning
+        )> SET_MANIPULATOR_DEMO_RUNNING =
+            $"{SliceNames.SCENE_SLICE}/SetManipulatorDemoRunning";
+
         #endregion
 
         #region Automation Actions
diff --git a/Assets/Scripts/Services/EphysLinkService.cs b/Assets/Scripts/Services/EphysLinkService.cs
@@ -669,13 +669,13 @@ public async Task SetManipulatorDuraOffsetToCurrentDepth(string manipulatorId)
             var visualizationProbeState = currentSceneState.Probes.FirstOrDefault(state =>
                 state.Name == currentSceneState.ActiveManipulatorState.VisualizationProbeName
             );
-            
+
             Debug.Log("Collecting info");
-            
+
             // Exit if we cannot find the visualization probe manager or state.
             if (visualizationProbeManager == null || visualizationProbeState == null)
                 return;
-            
+
             Debug.Log("Found viz states and manager");
 
             if (visualizationProbeManager.IsProbeInBrain())
@@ -693,7 +693,7 @@ public async Task SetManipulatorDuraOffsetToCurrentDepth(string manipulatorId)
                 // We need to calculate the surface coordinate ourselves
                 var (brainSurfaceCoordinateIdx, _) =
                     visualizationProbeManager.CalculateEntryCoordinate();
-                
+
                 // Exit if not in brain.
                 if (float.IsNaN(brainSurfaceCoordinateIdx.x))
                     return;
@@ -716,6 +716,28 @@ public async Task SetManipulatorDuraOffsetToCurrentDepth(string manipulatorId)
             );
         }
 
+        public async Task SetManipulatorDemoHomeCoordinateToCurrentPosition(string manipulatorId)
+        {
+            var currentPositionResponse = await GetPosition(manipulatorId);
+            if (HasError(currentPositionResponse.Error))
+                return;
+            _storeService.Store.Dispatch(
+                SceneActions.SET_MANIPULATOR_DEMO_HOME_COORDINATE,
+                (manipulatorId, currentPositionResponse.Position)
+            );
+        }
+
+        public async Task SetManipulatorDemoTargetCoordinateToCurrentPosition(string manipulatorId)
+        {
+            var currentPositionResponse = await GetPosition(manipulatorId);
+            if (HasError(currentPositionResponse.Error))
+                return;
+            _storeService.Store.Dispatch(
+                SceneActions.SET_MANIPULATOR_DEMO_TARGET_COORDINATE,
+                (manipulatorId, currentPositionResponse.Position)
+            );
+        }
+
         #endregion
     }
 }
diff --git a/Assets/Scripts/Services/StoreService.cs b/Assets/Scripts/Services/StoreService.cs
@@ -60,10 +60,6 @@ public StoreService(LocalStorageService localStorageService)
                             MainActions.SET_IS_AUTOMATION_ENABLED,
                             MainReducers.SetIsAutomationEnabledReducer
                         )
-                        .AddCase(
-                            MainActions.SET_IS_DEMO_ENABLED,
-                            MainReducers.SetIsDemoEnabledReducer
-                        )
                         .AddCase(
                             MainActions.SET_MAIN_SPLIT_VIEW_STATE,
                             MainReducers.SetMainSplitViewStateReducer
@@ -157,6 +153,18 @@ public StoreService(LocalStorageService localStorageService)
                             SceneActions.SET_MANIPULATOR_MANUAL_CONTROL_ENABLED,
                             SceneReducers.SetManipulatorManualControlEnabledReducer
                         )
+                        .AddCase(
+                            SceneActions.SET_MANIPULATOR_DEMO_HOME_COORDINATE,
+                            SceneReducers.SetManipulatorDemoHomeCoordinateReducer
+                        )
+                        .AddCase(
+                            SceneActions.SET_MANIPULATOR_DEMO_TARGET_COORDINATE,
+                            SceneReducers.SetManipulatorDemoTargetCoordinateReducer
+                        )
+                        .AddCase(
+                            SceneActions.SET_MANIPULATOR_DEMO_RUNNING,
+                            SceneReducers.SetManipulatorDemoRunningReducer
+                        )
                         // Automation.
                         .AddCase(
                             SceneActions.SET_TARGET_INSERTION_PROBE_NAME,
diff --git a/Assets/Scripts/UI/ViewModels/ManipulatorInspectorViewModel.cs b/Assets/Scripts/UI/ViewModels/ManipulatorInspectorViewModel.cs
@@ -48,6 +48,15 @@ public partial class ManipulatorInspectorViewModel
         [ObservableProperty]
         private bool _isManualControlEnabled;
 
+        [ObservableProperty]
+        private Vector4 _demoHomeCoordinate;
+
+        [ObservableProperty]
+        private Vector4 _demoTargetCoordinate;
+
+        [ObservableProperty]
+        private bool _isDemoRunning;
+
         #endregion
 
         public ManipulatorInspectorViewModel(
@@ -81,6 +90,9 @@ private void OnSceneStateChanged(SceneState sceneState)
             ReferenceCoordinateOffset = sceneState.ActiveManipulatorState.ReferenceCoordinateOffset;
             DuraOffset = sceneState.ActiveManipulatorState.DuraOffset;
             IsManualControlEnabled = sceneState.ActiveManipulatorState.ManualControlEnabled;
+            DemoHomeCoordinate = sceneState.ActiveManipulatorState.DemoHomeCoordinate;
+            DemoTargetCoordinate = sceneState.ActiveManipulatorState.DemoTargetCoordinate;
+            IsDemoRunning = sceneState.ActiveManipulatorState.IsDemoRunning;
         }
 
         private void OnShuttingDown()
@@ -162,6 +174,49 @@ private void SetManualControlEnabled(bool isEnabled)
             );
         }
 
+        [ICommand]
+        private void SetDemoHomeCoordinate(Vector4 coordinate)
+        {
+            _storeService.Store.Dispatch(
+                SceneActions.SET_MANIPULATOR_DEMO_HOME_COORDINATE,
+                (ActiveManipulatorId, coordinate)
+            );
+        }
+
+        [ICommand]
+        private async void SetDemoHomeToCurrentPosition()
+        {
+            await _ephysLinkService.SetManipulatorDemoHomeCoordinateToCurrentPosition(
+                ActiveManipulatorId
+            );
+        }
+
+        [ICommand]
+        private void SetDemoTargetCoordinate(Vector4 coordinate)
+        {
+            _storeService.Store.Dispatch(
+                SceneActions.SET_MANIPULATOR_DEMO_TARGET_COORDINATE,
+                (ActiveManipulatorId, coordinate)
+            );
+        }
+
+        [ICommand]
+        private async void SetDemoTargetToCurrentPosition()
+        {
+            await _ephysLinkService.SetManipulatorDemoTargetCoordinateToCurrentPosition(
+                ActiveManipulatorId
+            );
+        }
+
+        [ICommand]
+        private void SetIsDemoRunning(bool isRunning)
+        {
+            _storeService.Store.Dispatch(
+                SceneActions.SET_MANIPULATOR_DEMO_RUNNING,
+                (ActiveManipulatorId, isRunning)
+            );
+        }
+
         #endregion
     }
 }
diff --git a/Assets/Scripts/UI/Views/ManipulatorInspectorView.cs b/Assets/Scripts/UI/Views/ManipulatorInspectorView.cs
@@ -83,6 +83,19 @@ public ManipulatorInspectorView(ManipulatorInspectorViewModel manipulatorInspect
                 "manipulator-inspector__manual-control-toggle"
             );
 
+            var demoHomeCoordinateField = root.Q<Vector4Field>(
+                "manipulator-inspector__demo--home-field"
+            );
+            var demoSetHomeButton = root.Q<Button>("manipulator-inspector__demo--set-home-button");
+            var demoTargetCoordinateField = root.Q<Vector4Field>(
+                "manipulator-inspector__demo--target-field"
+            );
+            var demoSetTargetButton = root.Q<Button>(
+                "manipulator-inspector__demo--set-target-button"
+            );
+            var runDemoButton = root.Q<Button>("manipulator-inspector__demo--run-button");
+            var stopDemoButton = root.Q<Button>("manipulator-inspector__demo--stop-button");
+
             // Register event handlers.
             addNeuropixels10.clickable.clicked += () =>
                 manipulatorInspectorViewModel.AddVisualizationProbeCommand.Execute(
@@ -162,6 +175,24 @@ public ManipulatorInspectorView(ManipulatorInspectorViewModel manipulatorInspect
             {
                 manipulatorInspectorViewModel.SetManualControlEnabledCommand.Execute(evt.newValue);
             });
+            demoHomeCoordinateField.RegisterValueChangedCallback(evt =>
+            {
+                manipulatorInspectorViewModel.SetDemoHomeCoordinateCommand.Execute(evt.newValue);
+            });
+            demoSetHomeButton.clickable.clicked += manipulatorInspectorViewModel
+                .SetDemoHomeToCurrentPositionCommand
+                .Execute;
+            demoTargetCoordinateField.RegisterValueChangedCallback(evt =>
+            {
+                manipulatorInspectorViewModel.SetDemoTargetCoordinateCommand.Execute(evt.newValue);
+            });
+            demoSetTargetButton.clickable.clicked += manipulatorInspectorViewModel
+                .SetDemoTargetToCurrentPositionCommand
+                .Execute;
+            runDemoButton.clickable.clicked += () =>
+                manipulatorInspectorViewModel.SetIsDemoRunningCommand.Execute(true);
+            stopDemoButton.clickable.clicked += () =>
+                manipulatorInspectorViewModel.SetIsDemoRunningCommand.Execute(false);
 
             // Customize field units.
             anglesField.Q<FloatField>("appui-vector3field__x-field").unit = "Yaw";
@@ -219,6 +250,15 @@ public static void RegisterMainViewConverters()
                 "ManipulatorHandednessToRightButtonSelected",
                 (ref ManipulatorHandedness handedness) => handedness == ManipulatorHandedness.Right
             );
+
+            DataTypeConverters.RegisterUnidirectionalConverterGroup<bool, StyleEnum<DisplayStyle>>(
+                "DemoIsRunningToRunButtonVisibility",
+                (ref bool isDemoRunning) => isDemoRunning ? DisplayStyle.None : DisplayStyle.Flex
+            );
+            DataTypeConverters.RegisterUnidirectionalConverterGroup(
+                "DemoIsRunningToInputsEnabled",
+                (ref bool isDemoRunning) => !isDemoRunning
+            );
         }
     }
 }
diff --git a/Assets/UI/Views/ManipulatorInspector.uxml b/Assets/UI/Views/ManipulatorInspector.uxml
@@ -103,14 +103,36 @@
         </ui:VisualElement>
         <ui:VisualElement class="inspector-panel" style="flex-grow: 1;">
             <Unity.AppUI.UI.Heading text="Demo" size="S" />
-            <Unity.AppUI.UI.Heading text="Home" size="XS" />
-            <Unity.AppUI.UI.Vector4Field />
-            <Unity.AppUI.UI.Button title="Use Current Position" />
-            <Unity.AppUI.UI.Heading text="Target" size="XS" />
-            <Unity.AppUI.UI.Vector4Field />
-            <Unity.AppUI.UI.Button title="Use Current Position" />
+            <ui:VisualElement>
+                <Unity.AppUI.UI.Heading text="Home" size="XS" />
+                <Unity.AppUI.UI.Vector4Field name="manipulator-inspector__demo--home-field">
+                    <Bindings>
+                        <ui:DataBinding property="value" data-source-path="DemoHomeCoordinate" binding-mode="ToTarget" />
+                    </Bindings>
+                </Unity.AppUI.UI.Vector4Field>
+                <Unity.AppUI.UI.Button title="Use Current Position" name="manipulator-inspector__demo--set-home-button" />
+                <Unity.AppUI.UI.Heading text="Target" size="XS" />
+                <Unity.AppUI.UI.Vector4Field name="manipulator-inspector__demo--target-field">
+                    <Bindings>
+                        <ui:DataBinding property="value" data-source-path="DemoTargetCoordinate" binding-mode="ToTarget" />
+                    </Bindings>
+                </Unity.AppUI.UI.Vector4Field>
+                <Unity.AppUI.UI.Button title="Use Current Position" name="manipulator-inspector__demo--set-target-button" />
+                <Bindings>
+                    <ui:DataBinding property="enabledSelf" data-source-path="IsDemoRunning" binding-mode="ToTarget" source-to-ui-converters="DemoIsRunningToInputsEnabled" />
+                </Bindings>
+            </ui:VisualElement>
             <Unity.AppUI.UI.Spacer />
-            <Unity.AppUI.UI.Button title="Open Demo Mode" variant="Accent" />
+            <Unity.AppUI.UI.Button title="Run" variant="Accent" name="manipulator-inspector__demo--run-button">
+                <Bindings>
+                    <ui:DataBinding property="style.display" data-source-path="IsDemoRunning" binding-mode="ToTarget" source-to-ui-converters="DemoIsRunningToRunButtonVisibility" />
+                </Bindings>
+            </Unity.AppUI.UI.Button>
+            <Unity.AppUI.UI.Button title="Stop" variant="Destructive" name="manipulator-inspector__demo--stop-button">
+                <Bindings>
+                    <ui:DataBinding property="style.display" data-source-path="IsDemoRunning" binding-mode="ToTarget" />
+                </Bindings>
+            </Unity.AppUI.UI.Button>
         </ui:VisualElement>
     </ui:VisualElement>
 </ui:UXML>
