Skip to content

Fix Bdv too frequent navigation deadlock #372

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
tinevez merged 1 commit into from
Sep 8, 2025
Merged

Fix Bdv too frequent navigation deadlock #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 22 additions & 5 deletions src/main/java/org/mastodon/views/bdv/overlay/OverlayNavigation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ public class OverlayNavigation< V extends OverlayVertex< V, E >, E extends Overl

private NavigationBehaviour< V, E > navigationBehaviour;

private long lastNavigationTime = 0;

private static final int ANIMATION_DURATION = 300;

public OverlayNavigation(
final AbstractViewerPanel panel,
final OverlayGraph< V, E > graph )
Expand Down Expand Up @@ -82,6 +86,9 @@ public void setNavigationEtiquette( final NavigationEtiquette navigationEtiquett
@Override
public void navigateToVertex( final V vertex )
{
if (shouldThrottle())
return; // Throttle navigation requests.

// Always move in T.
final int tp = vertex.getTimepoint();
panel.state().setCurrentTimepoint( tp );
Expand All @@ -90,17 +97,20 @@ public void navigateToVertex( final V vertex )
final double[] target = navigationBehaviour.navigateToVertex( vertex, currentTransform );
if ( target != null )
{
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, 300 );
animator.setTime( System.currentTimeMillis() );
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, ANIMATION_DURATION );
lastNavigationTime = System.currentTimeMillis();
animator.setTime( lastNavigationTime );
panel.setTransformAnimator( animator );
}

panel.requestRepaint();
}

@Override
public void navigateToEdge( final E edge )
{
if ( shouldThrottle() )
return; // Throttle navigation requests.

// Always move in T.
final V ref = graph.vertexRef();
final int tp = edge.getTarget( ref ).getTimepoint();
Expand All @@ -111,14 +121,21 @@ public void navigateToEdge( final E edge )
final double[] target = navigationBehaviour.navigateToEdge( edge, currentTransform );
if ( target != null )
{
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, 300 );
animator.setTime( System.currentTimeMillis() );
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, ANIMATION_DURATION );
lastNavigationTime = System.currentTimeMillis();
animator.setTime( lastNavigationTime );
panel.setTransformAnimator( animator );
}

panel.requestRepaint();
}

private boolean shouldThrottle()
{
final long now = System.currentTimeMillis();
return ( now - lastNavigationTime < ANIMATION_DURATION );
}

/*
* Navigation behaviours
*/
Expand Down
Loading