Skip to content

chore: Pathfinder probe names #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjy5 merged 2 commits into from
Aug 22, 2023
Merged

chore: Pathfinder probe names #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
561d036
Use nsp names
kjy5 Aug 22, 2023
b8c6c32
Undo inside brain locking
kjy5 Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Assets/Scripts/TrajectoryPlanner/Probes/ManipulatorBehaviorController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ private void Awake()
enabled = false;

// Update manipulator inside brain state
_probeController.MovedThisFrameEvent.AddListener(() =>
{
if (_isSetToInsideBrain != _probeManager.IsProbeInBrain())
CommunicationManager.Instance.SetInsideBrain(ManipulatorID, _probeManager.IsProbeInBrain(),
insideBrain =>
{
_isSetToInsideBrain = insideBrain;
_probeController.UnlockedDir = insideBrain ? new Vector4(0, 0, 0, 1) : Vector4.one;
});
});
// _probeController.MovedThisFrameEvent.AddListener(() =>
// {
// if (_isSetToInsideBrain != _probeManager.IsProbeInBrain())
// CommunicationManager.Instance.SetInsideBrain(ManipulatorID, _probeManager.IsProbeInBrain(),
// insideBrain =>
// {
// _isSetToInsideBrain = insideBrain;
// _probeController.UnlockedDir = insideBrain ? new Vector4(0, 0, 0, 1) : Vector4.one;
// });
// });
}

private void OnDisable()
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/TrajectoryPlanner/UI/EphysLinkSettings/ManipulatorConnectionPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public void Initialize(EphysLinkSettings settingsMenu, string manipulatorID, str
// Set type to pathfinder and register with Ephys Link
newProbe.ManipulatorBehaviorController.ManipulatorType = type;
newProbe.Color = Color.magenta;
newProbe.name = "nsp_" + manipulatorID;
newProbe.SetIsEphysLinkControlled(true, manipulatorID);
}
else
Expand Down Expand Up @@ -375,7 +376,6 @@ private void UpdateBrainSurfaceOffsetInputField(float brainSurfaceOffset)
[SerializeField] private InputField _brainSurfaceOffsetInputField;
[SerializeField] private Button _returnToZeroCoordinateButton;
[SerializeField] private Text _returnToZeroCoordinateButtonText;
[SerializeField] private GameObject _manualControlGroup;
[SerializeField] private Toggle _enableManualControlToggle;

private ProbeManager _attachedProbe;
Expand Down