From e507016e75305010d86d5b5fd4170f417ec0d0d0 Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Fri, 19 Sep 2025 10:25:39 +0200
Subject: [PATCH 1/2] Update to bigdataviewr-core-10.6.6

---
 pom.xml                                              | 12 ++++++++----
 .../views/bdv/export/AbstractBDVRecorder.java        |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 12f04e6bc..b90b9de81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +42,6 @@
 			<groupId>sc.fiji</groupId>
 			<artifactId>bigdataviewer-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>sc.fiji</groupId>
-			<artifactId>bigdataviewer-vistools</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>sc.fiji</groupId>
 			<artifactId>bigdataviewer_fiji</artifactId>
@@ -68,6 +64,10 @@
 			<groupId>net.imglib2</groupId>
 			<artifactId>imglib2</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>net.imglib2</groupId>
+			<artifactId>imglib2-cache</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>net.imglib2</groupId>
 			<artifactId>imglib2-roi</artifactId>
@@ -186,6 +186,10 @@
 
 		<mastodon-graph.version>1.0.0-beta-30</mastodon-graph.version>
 
+		<bigdataviewer-core.version>10.6.6</bigdataviewer-core.version>
+		<imglib2.version>8.0.0</imglib2.version>
+		<imglib2-cache.version>1.0.0-beta-20</imglib2-cache.version>
+
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 	</properties>
diff --git a/src/main/java/org/mastodon/views/bdv/export/AbstractBDVRecorder.java b/src/main/java/org/mastodon/views/bdv/export/AbstractBDVRecorder.java
index d9b978dd7..f24d67d42 100644
--- a/src/main/java/org/mastodon/views/bdv/export/AbstractBDVRecorder.java
+++ b/src/main/java/org/mastodon/views/bdv/export/AbstractBDVRecorder.java
@@ -171,7 +171,7 @@ public int getHeight()
 		final MyTarget target = new MyTarget();
 		final MultiResolutionRenderer renderer = new MultiResolutionRenderer(
 				target, () -> {}, new double[] { 1 }, 0, 1, null, false,
-				viewer.getOptionValues().getAccumulateProjectorFactory(), new CacheControl.Dummy() );
+				new CacheControl.Dummy() );
 
 		// Mastodon overlays.
 		if ( tracksOverlay != null )
@@ -314,7 +314,7 @@ public int getHeight()
 		final MyTarget target = new MyTarget();
 		final MultiResolutionRenderer renderer = new MultiResolutionRenderer(
 				target, () -> {}, new double[] { 1 }, 0, 1, null, false,
-				viewer.getOptionValues().getAccumulateProjectorFactory(), new CacheControl.Dummy() );
+				new CacheControl.Dummy() );
 
 		// Mastodon overlays.
 		if ( tracksOverlay != null )

From 4dc176b08b15d251c4aed1fd6f7297f65054f1ad Mon Sep 17 00:00:00 2001
From: Stefan Hahmann <stefan.hahmann@tu-dresden.de>
Date: Fri, 19 Sep 2025 13:49:55 +0200
Subject: [PATCH 2/2] Revert workaround for BDV bug

---
 .../views/bdv/overlay/OverlayNavigation.java  | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/mastodon/views/bdv/overlay/OverlayNavigation.java b/src/main/java/org/mastodon/views/bdv/overlay/OverlayNavigation.java
index ae4864614..6541d4d8e 100644
--- a/src/main/java/org/mastodon/views/bdv/overlay/OverlayNavigation.java
+++ b/src/main/java/org/mastodon/views/bdv/overlay/OverlayNavigation.java
@@ -46,10 +46,6 @@ 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 )
@@ -86,9 +82,6 @@ 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 );
@@ -97,10 +90,8 @@ public void navigateToVertex( final V vertex )
 		final double[] target = navigationBehaviour.navigateToVertex( vertex, currentTransform );
 		if ( target != null )
 		{
-			final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, ANIMATION_DURATION );
-			lastNavigationTime = System.currentTimeMillis();
-			animator.setTime( lastNavigationTime );
-			panel.setTransformAnimator( animator );
+			final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, 300 );
+			animator.setTime( System.currentTimeMillis() );
 		}
 		panel.requestRepaint();
 	}
@@ -108,9 +99,6 @@ public void navigateToVertex( final V vertex )
 	@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();
@@ -121,21 +109,14 @@ public void navigateToEdge( final E edge )
 		final double[] target = navigationBehaviour.navigateToEdge( edge, currentTransform );
 		if ( target != null )
 		{
-			final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, ANIMATION_DURATION );
-			lastNavigationTime = System.currentTimeMillis();
-			animator.setTime( lastNavigationTime );
+			final TranslationAnimator animator = new TranslationAnimator( currentTransform, target, 300 );
+			animator.setTime( System.currentTimeMillis() );
 			panel.setTransformAnimator( animator );
 		}
 
 		panel.requestRepaint();
 	}
 
-	private boolean shouldThrottle()
-	{
-		final long now = System.currentTimeMillis();
-		return ( now - lastNavigationTime < ANIMATION_DURATION );
-	}
-
 	/*
 	 * Navigation behaviours
 	 */