Skip to content

Commit 7b344a9

Browse files
kjy5kjy5
authored
featchorefix: Ephys Link and Copilot updates (#589)
* Fix probe option highlighting * Fix default driving speed not being set to 5 * Prep to split computation * Set driving back to target status text * bump version * WIP fixing drive system * Change namespaces * Tested out unified space, need to flip some axes * Created manipulator space, reworked 3-axis transform * Depth now working (can remove directional check) * 3 axis is incorrectly displaying depth drive * Fixed left handed manipulator * Right hand manipulator * Fix file rearrangement * Removed redundant code, debugging 3-axis * WIP trying to fix 3-axis rotations * WIP drew axes of transform and "fixed" rotations * Fix transform operations again * Renamed transforms * Add dimension setter * Removed old spaces * Added NumAxes and dimensions * Integrated axes and dimensions everywhere * Bump minimum ephys link version * Add shared dura position dictionary * Wrote state manager * Update JetBrains plugin * Allow beta versions of Ephys Link * Start implementing drive states * Compute landmark depths, begin implementing drive * WIP drive. Depth is not computed right... * Fixed drop to depth, not computing full depth correctly * Drive can complete * Exiting * Extract manipulatorId * Bump Ephys Link * Bump Ephys Link to 0.9.17 * Removed old code * Increase insertion drive ceiling * Return to surface button from stop * Exit with DV * Fixed coterminal function * Added UI, created demo JSON * Unable to read file from streaming assets, find alternative * WIP reading from file * Rig and brain scaling * Set probe to line * Got poster images, revert some steps * Parsed data, creating UI * Demo basic UI * Validate connection and show start * Move to idle * Runs calibration, stop button does something * Driven to entry coordinate * Fixed entry coordinate in data * Untested dura and insertion * Incorrect drive, but others work * Fixed depth coordinate * Full loop * Fixed bregma calibration step * Change color to show progress * Spin brain * Coroutine based timer * Stop demo when there are no manipulators * WIP debugging depth * Fixed demo retraction * Upgrade rider * Resolved immediate code errors * Fix merge errors for ManipulatorBehaviorController.cs * DrivePanelHandler.cs * EphysCopilotHandler.cs * InsertionSelectionPanelHandler.cs * ManipulatorSpace.cs * Remove Copilot demo * Remove Copilot demo UI * Echoing works with ump4 * Flip 3 axis pitch * Switch to dimension constructor
1 parent bca6a96 commit 7b344a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3449
-985
lines changed

‎Assets/Prefabs/UI/EphysCopilot/CopilotDemoPanel.prefab‎

Lines changed: 1611 additions & 0 deletions
Large diffs are not rendered by default.

‎Assets/Prefabs/UI/EphysCopilot/CopilotDemoPanel.prefab.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/UI/EphysCopilot/DrivePanel.prefab‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,7 +2750,7 @@ GameObject:
27502750
- component: {fileID: 4132892186996900426}
27512751
- component: {fileID: 2688848427838830438}
27522752
m_Layer: 5
2753-
m_Name: ReturnButton
2753+
m_Name: ExitButton
27542754
m_TagString: Untagged
27552755
m_Icon: {fileID: 0}
27562756
m_NavMeshLayer: 0
@@ -2774,7 +2774,7 @@ RectTransform:
27742774
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
27752775
m_AnchorMin: {x: 0, y: 1}
27762776
m_AnchorMax: {x: 0, y: 1}
2777-
m_AnchoredPosition: {x: 250, y: -116.292206}
2777+
m_AnchoredPosition: {x: 250, y: -205.83333}
27782778
m_SizeDelta: {x: 500, y: 55}
27792779
m_Pivot: {x: 0.5, y: 0.5}
27802780
--- !u!222 &5092748061186658588
@@ -2862,7 +2862,7 @@ MonoBehaviour:
28622862
- m_Target: {fileID: 4325646625566643338}
28632863
m_TargetAssemblyTypeName: TrajectoryPlanner.UI.EphysCopilot.DrivePanelHandler,
28642864
trajectoryplanner.ui.ephyscopilot
2865-
m_MethodName: DriveBackToSurface
2865+
m_MethodName: Exit
28662866
m_Mode: 1
28672867
m_Arguments:
28682868
m_ObjectArgument: {fileID: 0}
@@ -3454,8 +3454,8 @@ MonoBehaviour:
34543454
_drivePastDistanceInputField: {fileID: 1362464887898080331}
34553455
_stopButton: {fileID: 8950310822258812797}
34563456
_skipSettlingButton: {fileID: 3200770919843244483}
3457-
_returnButton: {fileID: 6315168989377721155}
3458-
_returnButtonText: {fileID: 3744103793431505929}
3457+
_exitButton: {fileID: 6315168989377721155}
3458+
_exitButtonText: {fileID: 3744103793431505929}
34593459
_statusText: {fileID: 3023744443413706275}
34603460
_timerText: {fileID: 6333824926798648489}
34613461
--- !u!114 &2376644107146004916

‎Assets/Prefabs/UI/EphysCopilot/EphysCopilotPanel.prefab‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ MonoBehaviour:
121121
m_TargetGraphic: {fileID: 8493615845065584824}
122122
m_HandleRect: {fileID: 8361295466311985757}
123123
m_Direction: 2
124-
m_Value: 0
125-
m_Size: 1
124+
m_Value: 1
125+
m_Size: 0.6180117
126126
m_NumberOfSteps: 0
127127
m_OnValueChanged:
128128
m_PersistentCalls:
@@ -987,8 +987,8 @@ MonoBehaviour:
987987
m_TargetGraphic: {fileID: 5041640443237617115}
988988
m_HandleRect: {fileID: 3068108255336848725}
989989
m_Direction: 2
990-
m_Value: 0
991-
m_Size: 1
990+
m_Value: 1
991+
m_Size: 0.6180117
992992
m_NumberOfSteps: 0
993993
m_OnValueChanged:
994994
m_PersistentCalls:
@@ -1783,7 +1783,7 @@ RectTransform:
17831783
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17841784
m_AnchorMin: {x: 0, y: 1}
17851785
m_AnchorMax: {x: 1, y: 1}
1786-
m_AnchoredPosition: {x: 0, y: -0.000024523586}
1786+
m_AnchoredPosition: {x: 0, y: -58.592503}
17871787
m_SizeDelta: {x: 0, y: 0}
17881788
m_Pivot: {x: 0, y: 1}
17891789
--- !u!114 &5868928366586953604
@@ -2427,8 +2427,8 @@ MonoBehaviour:
24272427
m_TargetGraphic: {fileID: 2824903185860898137}
24282428
m_HandleRect: {fileID: 604587447986236897}
24292429
m_Direction: 2
2430-
m_Value: 0
2431-
m_Size: 1
2430+
m_Value: 1
2431+
m_Size: 0.6180117
24322432
m_NumberOfSteps: 0
24332433
m_OnValueChanged:
24342434
m_PersistentCalls:
@@ -2544,7 +2544,7 @@ RectTransform:
25442544
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
25452545
m_AnchorMin: {x: 0, y: 1}
25462546
m_AnchorMax: {x: 1, y: 1}
2547-
m_AnchoredPosition: {x: 0, y: -0.000024523586}
2547+
m_AnchoredPosition: {x: 0, y: -58.592503}
25482548
m_SizeDelta: {x: 0, y: 0}
25492549
m_Pivot: {x: 0, y: 1}
25502550
--- !u!114 &4506754816824710980
@@ -2622,7 +2622,7 @@ RectTransform:
26222622
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
26232623
m_AnchorMin: {x: 0, y: 1}
26242624
m_AnchorMax: {x: 1, y: 1}
2625-
m_AnchoredPosition: {x: 0, y: 0}
2625+
m_AnchoredPosition: {x: 0, y: -58.592472}
26262626
m_SizeDelta: {x: 0, y: 0}
26272627
m_Pivot: {x: 0, y: 1}
26282628
--- !u!114 &5987856609131885523
@@ -3003,8 +3003,8 @@ MonoBehaviour:
30033003
m_TargetGraphic: {fileID: 5713203697382717340}
30043004
m_HandleRect: {fileID: 538386439288270413}
30053005
m_Direction: 2
3006-
m_Value: 0
3007-
m_Size: 1
3006+
m_Value: 1
3007+
m_Size: 0.6180117
30083008
m_NumberOfSteps: 0
30093009
m_OnValueChanged:
30103010
m_PersistentCalls:
@@ -3170,7 +3170,7 @@ RectTransform:
31703170
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
31713171
m_AnchorMin: {x: 0, y: 1}
31723172
m_AnchorMax: {x: 1, y: 1}
3173-
m_AnchoredPosition: {x: 0, y: -0.000024523586}
3173+
m_AnchoredPosition: {x: 0, y: -58.592503}
31743174
m_SizeDelta: {x: 0, y: 0}
31753175
m_Pivot: {x: 0, y: 1}
31763176
--- !u!114 &2245757367060331119

0 commit comments

Comments
 (0)