Skip to content

Commit 4dc176b

Browse files
author
Stefan Hahmann
committed
Revert workaround for BDV bug
1 parent 964cb34 commit 4dc176b

1 file changed

Lines changed: 4 additions & 23 deletions

File tree

src/main/java/org/mastodon/views/bdv/overlay/OverlayNavigation.java

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ public class OverlayNavigation< V extends OverlayVertex< V, E >, E extends Overl
4646

4747
private NavigationBehaviour< V, E > navigationBehaviour;
4848

49-
private long lastNavigationTime = 0;
50-
51-
private static final int ANIMATION_DURATION = 300;
52-
5349
public OverlayNavigation(
5450
final AbstractViewerPanel panel,
5551
final OverlayGraph< V, E > graph )
@@ -86,9 +82,6 @@ public void setNavigationEtiquette( final NavigationEtiquette navigationEtiquett
8682
@Override
8783
public void navigateToVertex( final V vertex )
8884
{
89-
if (shouldThrottle())
90-
return; // Throttle navigation requests.
91-
9285
// Always move in T.
9386
final int tp = vertex.getTimepoint();
9487
panel.state().setCurrentTimepoint( tp );
@@ -97,20 +90,15 @@ public void navigateToVertex( final V vertex )
9790
final double[] target = navigationBehaviour.navigateToVertex( vertex, currentTransform );
9891
if ( target != null )
9992
{
100-
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, ANIMATION_DURATION );
101-
lastNavigationTime = System.currentTimeMillis();
102-
animator.setTime( lastNavigationTime );
103-
panel.setTransformAnimator( animator );
93+
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, 300 );
94+
animator.setTime( System.currentTimeMillis() );
10495
}
10596
panel.requestRepaint();
10697
}
10798

10899
@Override
109100
public void navigateToEdge( final E edge )
110101
{
111-
if ( shouldThrottle() )
112-
return; // Throttle navigation requests.
113-
114102
// Always move in T.
115103
final V ref = graph.vertexRef();
116104
final int tp = edge.getTarget( ref ).getTimepoint();
@@ -121,21 +109,14 @@ public void navigateToEdge( final E edge )
121109
final double[] target = navigationBehaviour.navigateToEdge( edge, currentTransform );
122110
if ( target != null )
123111
{
124-
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, ANIMATION_DURATION );
125-
lastNavigationTime = System.currentTimeMillis();
126-
animator.setTime( lastNavigationTime );
112+
final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, 300 );
113+
animator.setTime( System.currentTimeMillis() );
127114
panel.setTransformAnimator( animator );
128115
}
129116

130117
panel.requestRepaint();
131118
}
132119

133-
private boolean shouldThrottle()
134-
{
135-
final long now = System.currentTimeMillis();
136-
return ( now - lastNavigationTime < ANIMATION_DURATION );
137-
}
138-
139120
/*
140121
* Navigation behaviours
141122
*/

0 commit comments

Comments
 (0)