diff --git a/pom.xml b/pom.xml index b282df815..a9a31241f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 37.0.0 + 38.0.1 @@ -147,7 +147,14 @@ 2.5.2 0.11.1 - 6.1.0 + + 7.1.0 + 4.0.3 + 0.15.0 + 1.0.0-beta-18 + 0.15.3 + 2.0.2 + 10.6.0 diff --git a/src/main/java/fiji/plugin/trackmate/detection/MaskUtils.java b/src/main/java/fiji/plugin/trackmate/detection/MaskUtils.java index 53cf70fd8..2786afec3 100644 --- a/src/main/java/fiji/plugin/trackmate/detection/MaskUtils.java +++ b/src/main/java/fiji/plugin/trackmate/detection/MaskUtils.java @@ -33,6 +33,7 @@ import ij.gui.PolygonRoi; import ij.measure.Measurements; import ij.process.FloatPolygon; +import net.imglib2.Cursor; import net.imglib2.Interval; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; @@ -280,7 +281,7 @@ public static < R extends IntegerType< R > > List< Spot > fromLabeling( while ( iterator.hasNext() ) { final LabelRegion< Integer > region = iterator.next(); - final LabelRegionCursor cursor = region.localizingCursor(); + final Cursor< Void > cursor = region.inside().localizingCursor(); final int[] cursorPos = new int[ labeling.numDimensions() ]; final long[] sum = new long[ 3 ]; while ( cursor.hasNext() ) @@ -358,7 +359,7 @@ public static < T extends RealType< T >, R extends RealType< R > > List< Spot > while ( iterator.hasNext() ) { final LabelRegion< Integer > region = iterator.next(); - final LabelRegionCursor cursor = region.localizingCursor(); + final Cursor< Void > cursor = region.inside().localizingCursor(); final int[] cursorPos = new int[ labeling.numDimensions() ]; final long[] sum = new long[ 3 ]; double quality = Double.NEGATIVE_INFINITY; diff --git a/src/main/java/fiji/plugin/trackmate/tracking/kdtree/NearestNeighborFlagSearchOnKDTree.java b/src/main/java/fiji/plugin/trackmate/tracking/kdtree/NearestNeighborFlagSearchOnKDTree.java index b5e639341..98a5e00dd 100644 --- a/src/main/java/fiji/plugin/trackmate/tracking/kdtree/NearestNeighborFlagSearchOnKDTree.java +++ b/src/main/java/fiji/plugin/trackmate/tracking/kdtree/NearestNeighborFlagSearchOnKDTree.java @@ -28,6 +28,8 @@ import net.imglib2.Sampler; import net.imglib2.neighborsearch.NearestNeighborSearch; + +// TODO: revise for new KDTree implementation, where KDTreeNode are reusable proxies. public class NearestNeighborFlagSearchOnKDTree< T > implements NearestNeighborSearch< FlagNode< T > > { @@ -78,8 +80,8 @@ protected void searchNode( final KDTreeNode< FlagNode< T > > current ) final boolean leftIsNearBranch = axisDiff < 0; // search the near branch - final KDTreeNode< FlagNode< T > > nearChild = leftIsNearBranch ? current.left : current.right; - final KDTreeNode< FlagNode< T > > awayChild = leftIsNearBranch ? current.right : current.left; + final KDTreeNode< FlagNode< T > > nearChild = leftIsNearBranch ? current.left() : current.right(); + final KDTreeNode< FlagNode< T > > awayChild = leftIsNearBranch ? current.right() : current.left(); if ( nearChild != null ) searchNode( nearChild );