Skip to content

646 null pointer when copilot window opens without any probes #654

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 3 commits into from
Feb 16, 2024
Merged

646 null pointer when copilot window opens without any probes #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f302591
Reset target selection if none are found
kjy5 Feb 16, 2024
6825ecf
Fix null id error
kjy5 Feb 16, 2024
481ee76
Only enable copilot toggle if there are connected probes
kjy5 Feb 16, 2024
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
2 changes: 1 addition & 1 deletion Assets/Prefabs/UI/SettingsMenu/Menus/EphysLinkMenu.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2565,7 +2565,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_Interactable: 0
m_TargetGraphic: {fileID: 6487466997665187127}
toggleTransition: 1
graphic: {fileID: 2477337667047670143}
Expand Down
16 changes: 12 additions & 4 deletions Assets/Scripts/Pinpoint/UI/EphysCopilot/InsertionSelectionPanelHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,21 @@ public void UpdateTargetInsertionOptions()
.Select(probeManager => (probeManager.OverrideName ?? probeManager.name) + ": " +
SurfaceCoordinateToString(probeManager.GetSurfaceCoordinateT())).ToList());

// Return early if no manipulator ID
if (ProbeManager.ManipulatorBehaviorController.ManipulatorID == null) return;

// Restore selection (if possible)
var selectedProbeManager = ManipulatorIDToSelectedTargetProbeManager.GetValueOrDefault(
ProbeManager.ManipulatorBehaviorController.ManipulatorID, null);
_targetInsertionDropdown.SetValueWithoutNotify(
_targetProbeManagerOptions.ToList()
.IndexOf(selectedProbeManager) + 1
);
if (selectedProbeManager == null)
// Select none if no previous selection.
_targetInsertionDropdown.SetValueWithoutNotify(0);
else
_targetInsertionDropdown.SetValueWithoutNotify(
_targetProbeManagerOptions.ToList()
.IndexOf(selectedProbeManager) + 1
);


// Color dropdown to match probe color
if (!selectedProbeManager) return;
Expand Down
7 changes: 3 additions & 4 deletions Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,11 @@ private void UpdateConnectionPanel()
private void UpdateManipulatorPanels()
{
// Default Copilot to be disabled unless the right manipulator type is found
_copilotToggle.interactable = false;

if (CommunicationManager.Instance.IsConnected)
{
CommunicationManager.Instance.GetManipulators((availableIDs, numAxes, _) =>
{
// Enable Copilot button if using Sensapex or New Scale
_copilotToggle.interactable = numAxes > 0;

// Keep track of handled manipulator panels
var handledManipulatorIds = new HashSet<string>();

Expand Down Expand Up @@ -232,6 +228,9 @@ public void ToggleCopilotPanel(bool isEnabled)
public void InvokeShouldUpdateProbesListEvent()
{
ShouldUpdateProbesListEvent.Invoke();

// Enable/Disable Copilot toggle based on if there are any probes that can be controlled by it.
_copilotToggle.interactable = LinkedProbes.Count > 0;
}

#endregion
Expand Down