From 7e921d9f86406ac83aa1b176c31a2c0fac9aa529 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 19 Aug 2024 10:22:47 +0200 Subject: [PATCH 1/3] POM: Bump parent to pom-scijava-38.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88364228..15f0e844 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 37.0.0 + 38.0.1 From 33a335dfefa35695a78fd62c313ca5f52d4dae09 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Fri, 5 Apr 2024 21:27:06 +0200 Subject: [PATCH 2/3] POM: Bump dependency versions imglib2 -> 7.1.0 imglib2-realtransform -> 4.0.3 imglib2-roi -> 0.15.0 imglib2-cache -> 1.0.0-beta-18 imglib2-algorithm -> 0.15.3 bigdataviewer-core -> 10.6.0 bigdataviewer-vistools -> 1.0.0-beta-36 n5 -> 3.3.0 n5-imglib2 -> 7.0.1-SNAPSHOT n5-google-cloud -> 4.1.1 n5-zarr -> 1.3.5 --- pom.xml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 15f0e844..4cb1f0ad 100644 --- a/pom.xml +++ b/pom.xml @@ -118,31 +118,38 @@ BigWarp plugin for Fiji. **/resources/*.xml - 6.3.0 - 4.0.1 + 7.1.0 + 4.0.3 + 0.15.0 + 1.0.0-beta-18 + 0.15.3 + 10.6.0 + 1.0.0-beta-36 + + 1.48 1.4.1 3.0.4 - - sign,deploy-to-scijava - - 3.2.0 - 4.1.1 + 3.3.0 + 7.0.1-SNAPSHOT + 4.2.1 1.1.1 2.2.0 - 4.1.0 - 1.3.4 + 4.1.1 + 1.3.5 1.6.0 4.2.1 6.1.1 - 10.4.14 - 1.0.0-beta-34 - 0.41 0.41 + + true + + + sign,deploy-to-scijava @@ -182,10 +189,6 @@ sc.fiji bigdataviewer-core - - sc.fiji - bigdataviewer-vistools - sc.fiji bigdataviewer_fiji From da48bce5eff3d677577820cd6444266bc3ce7fa2 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Fri, 5 Apr 2024 21:28:21 +0200 Subject: [PATCH 3/3] Add missing getType() implementations --- .../java/bigwarp/source/GridRandomAccessibleInterval.java | 6 ++++++ .../source/GridRealRandomAccessibleRealInterval.java | 8 +++++++- .../bigwarp/source/JacobianDeterminantRandomAccess.java | 8 +++++++- .../source/PlateauSphericalMaskRealRandomAccessible.java | 6 ++++++ .../source/WarpMagnitudeRandomAccessibleInterval.java | 6 ++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/main/java/bigwarp/source/GridRandomAccessibleInterval.java b/src/main/java/bigwarp/source/GridRandomAccessibleInterval.java index 42a79bb2..1d95c28d 100644 --- a/src/main/java/bigwarp/source/GridRandomAccessibleInterval.java +++ b/src/main/java/bigwarp/source/GridRandomAccessibleInterval.java @@ -50,6 +50,12 @@ public RandomAccess randomAccess( Interval interval) { return randomAccess(); } + @Override + public T getType() + { + return ra.getType(); + } + // public RandomAccessibleInterval copy() // { // return new GridRandomAccessibleInterval( diff --git a/src/main/java/bigwarp/source/GridRealRandomAccessibleRealInterval.java b/src/main/java/bigwarp/source/GridRealRandomAccessibleRealInterval.java index c5f95428..c953a7db 100644 --- a/src/main/java/bigwarp/source/GridRealRandomAccessibleRealInterval.java +++ b/src/main/java/bigwarp/source/GridRealRandomAccessibleRealInterval.java @@ -48,5 +48,11 @@ public RealRandomAccess realRandomAccess() { public RealRandomAccess realRandomAccess(RealInterval interval) { return realRandomAccess(); } - + + @Override + public T getType() + { + return ra.getType(); + } + } diff --git a/src/main/java/bigwarp/source/JacobianDeterminantRandomAccess.java b/src/main/java/bigwarp/source/JacobianDeterminantRandomAccess.java index 0377e98d..bd11f416 100644 --- a/src/main/java/bigwarp/source/JacobianDeterminantRandomAccess.java +++ b/src/main/java/bigwarp/source/JacobianDeterminantRandomAccess.java @@ -281,7 +281,13 @@ public RealRandomAccess realRandomAccess() { public RealRandomAccess realRandomAccess(RealInterval interval) { return realRandomAccess(); } - + + @Override + public T getType() + { + return ra.getType(); + } + public void setTransform( final DifferentiableRealTransform transform ) { ra.setTransform( transform ); diff --git a/src/main/java/bigwarp/source/PlateauSphericalMaskRealRandomAccessible.java b/src/main/java/bigwarp/source/PlateauSphericalMaskRealRandomAccessible.java index 348d1ca8..10514e0c 100644 --- a/src/main/java/bigwarp/source/PlateauSphericalMaskRealRandomAccessible.java +++ b/src/main/java/bigwarp/source/PlateauSphericalMaskRealRandomAccessible.java @@ -294,6 +294,12 @@ public RealRandomAccess< DoubleType > realRandomAccess( RealInterval interval ) return rra.realRandomAccess( interval ); } + @Override + public DoubleType getType() + { + return new DoubleType(); + } + public Element toXml() { final Element maskSettings = new Element( "transform-mask" ); diff --git a/src/main/java/bigwarp/source/WarpMagnitudeRandomAccessibleInterval.java b/src/main/java/bigwarp/source/WarpMagnitudeRandomAccessibleInterval.java index 7a81ced1..4ee6e46a 100644 --- a/src/main/java/bigwarp/source/WarpMagnitudeRandomAccessibleInterval.java +++ b/src/main/java/bigwarp/source/WarpMagnitudeRandomAccessibleInterval.java @@ -50,6 +50,12 @@ public RealRandomAccess realRandomAccess(RealInterval interval) { return realRandomAccess(); } + @Override + public T getType() + { + return ra.getType(); + } + // public RealRandomAccessibleRealInterval copy() // { // long[] min = new long[ this.numDimensions() ];