diff --git a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController.cs b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController.cs
index 89e74f17..3a34e3b7 100644
--- a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController.cs
+++ b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController.cs
@@ -41,19 +41,19 @@ public partial class ManipulatorBehaviorController : MonoBehaviour
/// Getter and setter or the zero coordinate offset of the manipulator.
/// If passed a NaN value, the previous value is kept.
///
- public Vector4 ZeroCoordinateOffset
+ public Vector4 ReferenceCoordinateOffset
{
- get => _zeroCoordinateOffset;
+ get => _referenceCoordinateOffset;
set
{
- _zeroCoordinateOffset = new Vector4(
- float.IsNaN(value.x) ? _zeroCoordinateOffset.x : value.x,
- float.IsNaN(value.y) ? _zeroCoordinateOffset.y : value.y,
- float.IsNaN(value.z) ? _zeroCoordinateOffset.z : value.z,
- float.IsNaN(value.w) ? _zeroCoordinateOffset.w : value.w
+ _referenceCoordinateOffset = new Vector4(
+ float.IsNaN(value.x) ? _referenceCoordinateOffset.x : value.x,
+ float.IsNaN(value.y) ? _referenceCoordinateOffset.y : value.y,
+ float.IsNaN(value.z) ? _referenceCoordinateOffset.z : value.z,
+ float.IsNaN(value.w) ? _referenceCoordinateOffset.w : value.w
);
- ZeroCoordinateOffsetChangedEvent.Invoke(_zeroCoordinateOffset);
+ ZeroCoordinateOffsetChangedEvent.Invoke(_referenceCoordinateOffset);
}
}
@@ -89,7 +89,7 @@ public bool IsRightHanded
#region Private internal fields
private Vector4 _lastLoggedManipulatorPosition = Vector4.zero;
- private Vector4 _zeroCoordinateOffset = Vector4.zero;
+ private Vector4 _referenceCoordinateOffset = Vector4.zero;
private float _brainSurfaceOffset;
private bool _isRightHanded;
private float _lastLoggedTime;
@@ -124,7 +124,7 @@ private void Awake()
private void OnDisable()
{
ManipulatorID = null;
- _zeroCoordinateOffset = Vector4.zero;
+ _referenceCoordinateOffset = Vector4.zero;
_brainSurfaceOffset = 0;
}
@@ -210,7 +210,7 @@ public Vector4 ConvertInsertionAPMLDVToManipulatorPosition(Vector3 insertionAPML
posInManipulatorTransform.w -= float.IsNaN(BrainSurfaceOffset) ? 0 : BrainSurfaceOffset;
// Apply coordinate offsets and return result
- return posInManipulatorTransform + ZeroCoordinateOffset;
+ return posInManipulatorTransform + ReferenceCoordinateOffset;
}
///
@@ -327,7 +327,7 @@ public async Awaitable MoveBackToZeroCoordinate()
var setPositionResponse = await CommunicationManager.Instance.SetPosition(
new SetPositionRequest(
ManipulatorID,
- ZeroCoordinateOffset,
+ ReferenceCoordinateOffset,
AUTOMATIC_MOVEMENT_SPEED
)
);
@@ -362,7 +362,7 @@ private async Awaitable UpdateProbePositionFromManipulator()
// Apply zero coordinate offset.
var zeroCoordinateAdjustedManipulatorPosition =
- positionResponse.Position - ZeroCoordinateOffset;
+ positionResponse.Position - ReferenceCoordinateOffset;
// Convert to coordinate space.
var manipulatorSpacePosition = CoordinateTransform.T2U(
diff --git a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_Insertion.cs b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_Insertion.cs
index 8e134789..30bc89d1 100644
--- a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_Insertion.cs
+++ b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_Insertion.cs
@@ -380,7 +380,7 @@ private Vector3 GetOffsetAdjustedTargetCoordinate(ProbeManager targetInsertionPr
var offsetAdjustedTargetCoordinateWorldT =
targetWorldT + offsetAdjustedRelativeTargetPositionWorldT;
- // Converting worldT to AtlasT (to capture new Bregma offset when there is scaling)
+ // Converting worldT to AtlasT (to capture new reference coordinate offset when there is scaling)
// then switch axes to get APMLDV.
var offsetAdjustedTargetCoordinateAtlasT =
BrainAtlasManager.ActiveReferenceAtlas.World2Atlas(
diff --git a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_BregmaCalibration.cs b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_ReferenceCoordinate.cs
similarity index 90%
rename from Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_BregmaCalibration.cs
rename to Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_ReferenceCoordinate.cs
index 9dd20878..dd41123d 100644
--- a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_BregmaCalibration.cs
+++ b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_ReferenceCoordinate.cs
@@ -18,13 +18,13 @@ public partial class ManipulatorBehaviorController
#endregion
///
- /// Reset zero coordinate of the manipulator
+ /// Reset reference coordinate of the manipulator
///
///
/// Alerts user of 4-axis manipulators if depth axis is not at 0 and 3-axis manipulators if depth is too far from
/// center.
///
- public async Awaitable ResetZeroCoordinate()
+ public async Awaitable ResetReferenceCoordinate()
{
// Query current position.
var positionalResponse = await CommunicationManager.Instance.GetPosition(ManipulatorID);
@@ -70,18 +70,18 @@ when Mathf.Abs(Dimensions.z / 2f - positionalResponse.Position.w)
return false;
// Complete reset.
- ZeroCoordinateOffset = positionalResponse.Position;
+ ReferenceCoordinateOffset = positionalResponse.Position;
BrainSurfaceOffset = 0;
// Log event.
OutputLog.Log(
new[]
{
- "Copilot",
+ "Automation",
DateTime.Now.ToString(CultureInfo.InvariantCulture),
- "ResetZeroCoordinate",
+ "ResetReferenceCoordinate",
ManipulatorID,
- ZeroCoordinateOffset.ToString()
+ ReferenceCoordinateOffset.ToString()
}
);
return true;
diff --git a/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_BregmaCalibration.cs.meta b/Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_ReferenceCoordinate.cs.meta
similarity index 100%
rename from Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_BregmaCalibration.cs.meta
rename to Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController_Automation_ReferenceCoordinate.cs.meta
diff --git a/Assets/Scripts/Pinpoint/Probes/ProbeAutomationState.cs b/Assets/Scripts/Pinpoint/Probes/ProbeAutomationState.cs
index 0add000b..a26df5d9 100644
--- a/Assets/Scripts/Pinpoint/Probes/ProbeAutomationState.cs
+++ b/Assets/Scripts/Pinpoint/Probes/ProbeAutomationState.cs
@@ -11,7 +11,7 @@ public enum ProbeAutomationState
IsUncalibrated,
///
- /// Is calibrated to Bregma. Could be positioned anywhere.
+ /// Is calibrated to the reference coordinate. Could be positioned anywhere.
///
IsCalibrated,
diff --git a/Assets/Scripts/Pinpoint/Probes/ProbeManager.cs b/Assets/Scripts/Pinpoint/Probes/ProbeManager.cs
index 08a45bd9..a8a14106 100644
--- a/Assets/Scripts/Pinpoint/Probes/ProbeManager.cs
+++ b/Assets/Scripts/Pinpoint/Probes/ProbeManager.cs
@@ -1275,7 +1275,7 @@ public static ProbeManagerData ProbeManager2ProbeData(ProbeManager probeManager)
data.NumAxes = probeManager.ManipulatorBehaviorController.NumAxes;
data.ManipulatorID = probeManager.ManipulatorBehaviorController.ManipulatorID;
- data.ZeroCoordOffset = probeManager.ManipulatorBehaviorController.ZeroCoordinateOffset;
+ data.ZeroCoordOffset = probeManager.ManipulatorBehaviorController.ReferenceCoordinateOffset;
data.Dimensions = probeManager.ManipulatorBehaviorController.Dimensions;
data.BrainSurfaceOffset = probeManager.ManipulatorBehaviorController.BrainSurfaceOffset;
// data.Drop2SurfaceWithDepth = probeManager
diff --git a/Assets/Scripts/Pinpoint/TP_ProbeQuickSettings.cs b/Assets/Scripts/Pinpoint/TP_ProbeQuickSettings.cs
index fa6f4ee9..e175bcf9 100644
--- a/Assets/Scripts/Pinpoint/TP_ProbeQuickSettings.cs
+++ b/Assets/Scripts/Pinpoint/TP_ProbeQuickSettings.cs
@@ -149,7 +149,7 @@ public void ResetZeroCoordinate()
if (ProbeManager.ActiveProbeManager.IsEphysLinkControlled)
{
_communicationManager.GetPosition(ProbeManager.ActiveProbeManager.ManipulatorBehaviorController.ManipulatorID,
- zeroCoordinate => ProbeManager.ActiveProbeManager.ManipulatorBehaviorController.ZeroCoordinateOffset = zeroCoordinate);
+ zeroCoordinate => ProbeManager.ActiveProbeManager.ManipulatorBehaviorController.ReferenceCoordinateOffset = zeroCoordinate);
ProbeManager.ActiveProbeManager.ManipulatorBehaviorController.BrainSurfaceOffset = 0;
}
else
diff --git a/Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs b/Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs
index 80ae13a2..5e3a8502 100644
--- a/Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs
+++ b/Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs
@@ -485,7 +485,7 @@ public ProbeManager AddNewProbe(ProbeProperties.ProbeType probeType, ProbeInsert
// Repopulate Ephys Link information
probeManager.ManipulatorBehaviorController.NumAxes = numAxes;
- probeManager.ManipulatorBehaviorController.ZeroCoordinateOffset = zeroCoordinateOffset;
+ probeManager.ManipulatorBehaviorController.ReferenceCoordinateOffset = zeroCoordinateOffset;
probeManager.ManipulatorBehaviorController.BrainSurfaceOffset = brainSurfaceOffset;
// probeManager.ManipulatorBehaviorController.IsSetToDropToSurfaceWithDepth = dropToSurfaceWithDepth;
// probeManager.ManipulatorBehaviorController.IsSetToDropToSurfaceWithDepth = dropToSurfaceWithDepth;
diff --git a/Assets/Scripts/Pinpoint/UI/EphysCopilot/ResetZeroCoordinatePanelHandler.cs b/Assets/Scripts/Pinpoint/UI/EphysCopilot/ResetZeroCoordinatePanelHandler.cs
index 77ac413e..ec6b1ac7 100644
--- a/Assets/Scripts/Pinpoint/UI/EphysCopilot/ResetZeroCoordinatePanelHandler.cs
+++ b/Assets/Scripts/Pinpoint/UI/EphysCopilot/ResetZeroCoordinatePanelHandler.cs
@@ -30,7 +30,7 @@ public void ResetZeroCoordinate()
ProbeManager.ManipulatorBehaviorController.ManipulatorID,
zeroCoordinate =>
{
- ProbeManager.ManipulatorBehaviorController.ZeroCoordinateOffset =
+ ProbeManager.ManipulatorBehaviorController.ReferenceCoordinateOffset =
zeroCoordinate;
ProbeManager.ManipulatorBehaviorController.BrainSurfaceOffset = 0;
}
@@ -44,7 +44,7 @@ public void ResetZeroCoordinate()
DateTime.Now.ToString(CultureInfo.InvariantCulture),
"ResetZeroCoordinate",
ProbeManager.ManipulatorBehaviorController.ManipulatorID,
- ProbeManager.ManipulatorBehaviorController.ZeroCoordinateOffset.ToString()
+ ProbeManager.ManipulatorBehaviorController.ReferenceCoordinateOffset.ToString()
}
);
}
diff --git a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/ManipulatorConnectionPanel.cs b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/ManipulatorConnectionPanel.cs
index 259d3d8a..a2e3f69a 100644
--- a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/ManipulatorConnectionPanel.cs
+++ b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/ManipulatorConnectionPanel.cs
@@ -250,7 +250,7 @@ public void OnLinkedProbeSelectionChanged(int value)
/// New offset X-axis value
public void UpdateZeroCoordinateOffsetX(string newValue)
{
- _attachedProbe.ManipulatorBehaviorController.ZeroCoordinateOffset = new Vector4(
+ _attachedProbe.ManipulatorBehaviorController.ReferenceCoordinateOffset = new Vector4(
float.Parse(newValue),
float.NaN,
float.NaN,
@@ -264,7 +264,7 @@ public void UpdateZeroCoordinateOffsetX(string newValue)
/// New offset Y-axis value
public void UpdateZeroCoordinateOffsetY(string newValue)
{
- _attachedProbe.ManipulatorBehaviorController.ZeroCoordinateOffset = new Vector4(
+ _attachedProbe.ManipulatorBehaviorController.ReferenceCoordinateOffset = new Vector4(
float.NaN,
float.Parse(newValue),
float.NaN,
@@ -278,7 +278,7 @@ public void UpdateZeroCoordinateOffsetY(string newValue)
/// New offset Z-axis value
public void UpdateZeroCoordinateOffsetZ(string newValue)
{
- _attachedProbe.ManipulatorBehaviorController.ZeroCoordinateOffset = new Vector4(
+ _attachedProbe.ManipulatorBehaviorController.ReferenceCoordinateOffset = new Vector4(
float.NaN,
float.NaN,
float.Parse(newValue),
@@ -292,7 +292,7 @@ public void UpdateZeroCoordinateOffsetZ(string newValue)
/// New offset D-axis value
public void UpdateZeroCoordinateOffsetD(string newValue)
{
- _attachedProbe.ManipulatorBehaviorController.ZeroCoordinateOffset = new Vector4(
+ _attachedProbe.ManipulatorBehaviorController.ReferenceCoordinateOffset = new Vector4(
float.NaN,
float.NaN,
float.NaN,
@@ -402,7 +402,7 @@ private void UpdateProbePropertiesSectionState()
{
_probePropertiesSection.SetActive(true);
UpdateZeroCoordinateOffsetInputFields(
- _attachedProbe.ManipulatorBehaviorController.ZeroCoordinateOffset
+ _attachedProbe.ManipulatorBehaviorController.ReferenceCoordinateOffset
);
UpdateBrainSurfaceOffsetInputField(
_attachedProbe.ManipulatorBehaviorController.BrainSurfaceOffset
diff --git a/Assets/Scripts/UI/AutomationStack/AutomationStackHandler.cs b/Assets/Scripts/UI/AutomationStack/AutomationStackHandler.cs
index 7f208f69..305ddf01 100644
--- a/Assets/Scripts/UI/AutomationStack/AutomationStackHandler.cs
+++ b/Assets/Scripts/UI/AutomationStack/AutomationStackHandler.cs
@@ -34,9 +34,9 @@ public partial class AutomationStackHandler : MonoBehaviour
// Panels.
private VisualElement _automationStackPanel;
- #region Bregma Calibration
+ #region Reference Coordinate Calibration
- private Button _resetBregmaCalibrationButton;
+ private Button _resetReferenceCoordinateButton;
#endregion
@@ -83,8 +83,8 @@ private void OnEnable()
{
// Get components.
_automationStackPanel = _root.Q("automation-stack-panel");
- _resetBregmaCalibrationButton = _automationStackPanel.Q
///
- /// Returns true if the active probe manager is Ephys Link controlled, calibrated to Bregma, and has a selected target.
+ /// Returns true if the active probe manager is Ephys Link controlled, calibrated to reference coordinate, and has a selected target.
///
[CreateProperty]
public bool IsDriveToTargetEntryCoordinateButtonEnabled =>
diff --git a/Assets/UI/Components/AutomationStack.uxml b/Assets/UI/Components/AutomationStack.uxml
index b83a2ae2..57692a59 100644
--- a/Assets/UI/Components/AutomationStack.uxml
+++ b/Assets/UI/Components/AutomationStack.uxml
@@ -7,7 +7,7 @@
-
+
@@ -42,7 +42,7 @@
-
+