From ba1147d5ea04d354a54b46c70f51a6f97c9261a3 Mon Sep 17 00:00:00 2001
From: Tobias Pietzsch <tobias.pietzsch@gmail.com>
Date: Wed, 26 Oct 2016 17:07:07 +0200
Subject: [PATCH] bump pom parent pom-bigdataviewer => 4.0.1. fix wrt to API
changes
---
pom.xml | 9 ++-------
.../java/bdv/ij/export/SpimRegistrationSequence.java | 3 +--
.../java/bdv/ij/export/imgloader/ImagePlusImgLoader.java | 2 +-
.../bdv/img/virtualstack/VirtualStackImageLoader.java | 9 ++++-----
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35d8f43..ec9bc50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>sc.fiji</groupId>
<artifactId>pom-bigdataviewer</artifactId>
- <version>3.3.0</version>
+ <version>4.0.1</version>
</parent>
<artifactId>bigdataviewer_fiji</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>BigDataViewer Fiji</name>
<description>Fiji plugins for starting BigDataViewer and exporting data.</description>
@@ -66,11 +66,6 @@
<url>http://jenkins.imagej.net/job/bigdataviewer_fiji/</url>
</ciManagement>
- <properties>
- <scijava.jvm.version>1.8</scijava.jvm.version>
- <enforcer.skip>true</enforcer.skip>
- </properties>
-
<repositories>
<repository>
<id>imagej.public</id>
diff --git a/src/main/java/bdv/ij/export/SpimRegistrationSequence.java b/src/main/java/bdv/ij/export/SpimRegistrationSequence.java
index 2cd38a7..bb0cd22 100644
--- a/src/main/java/bdv/ij/export/SpimRegistrationSequence.java
+++ b/src/main/java/bdv/ij/export/SpimRegistrationSequence.java
@@ -5,8 +5,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.scijava.vecmath.Point3f;
-
import bdv.ij.export.imgloader.HuiskenImageLoader;
import bdv.ij.export.imgloader.StackImageLoader;
import bdv.spimdata.SequenceDescriptionMinimal;
@@ -34,6 +32,7 @@ import net.imglib2.FinalDimensions;
import net.imglib2.FinalRealInterval;
import net.imglib2.RealInterval;
import net.imglib2.realtransform.AffineTransform3D;
+import spim.vecmath.Point3f;
import spimopener.SPIMExperiment;
public class SpimRegistrationSequence
diff --git a/src/main/java/bdv/ij/export/imgloader/ImagePlusImgLoader.java b/src/main/java/bdv/ij/export/imgloader/ImagePlusImgLoader.java
index 8d5192c..8b728fb 100644
--- a/src/main/java/bdv/ij/export/imgloader/ImagePlusImgLoader.java
+++ b/src/main/java/bdv/ij/export/imgloader/ImagePlusImgLoader.java
@@ -143,7 +143,7 @@ public class ImagePlusImgLoader< T extends Type< T > > implements TypedBasicImgL
setupImgLoaders.add( new SetupImgLoader<>( loader.getSetupImgLoader( setupId ) ) );
if ( loader instanceof VirtualStackImageLoader )
- this.loadercache = ( ( VirtualStackImageLoader< ?, ?, ? > ) loader ).getCache();
+ this.loadercache = ( ( VirtualStackImageLoader< ?, ?, ? > ) loader ).getCacheControl();
else
this.loadercache = null;
diff --git a/src/main/java/bdv/img/virtualstack/VirtualStackImageLoader.java b/src/main/java/bdv/img/virtualstack/VirtualStackImageLoader.java
index 93618ec..c4cdfc1 100644
--- a/src/main/java/bdv/img/virtualstack/VirtualStackImageLoader.java
+++ b/src/main/java/bdv/img/virtualstack/VirtualStackImageLoader.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
import bdv.AbstractViewerSetupImgLoader;
import bdv.ViewerImgLoader;
+import bdv.cache.CacheHints;
+import bdv.cache.LoadingStrategy;
import bdv.img.cache.CacheArrayLoader;
-import bdv.img.cache.CacheHints;
import bdv.img.cache.CachedCellImg;
-import bdv.img.cache.LoadingStrategy;
import bdv.img.cache.VolatileGlobalCellCache;
import bdv.img.cache.VolatileImgCells;
import bdv.img.cache.VolatileImgCells.CellCache;
@@ -158,9 +158,8 @@ public abstract class VirtualStackImageLoader< T extends NativeType< T >, V exte
this.loader = loader;
dimensions = new long[] { imp.getWidth(), imp.getHeight(), imp.getNSlices() };
cellDimensions = new int[] { imp.getWidth(), imp.getHeight(), 1 };
- final int numTimepoints = imp.getNFrames();
final int numSetups = imp.getNChannels();
- cache = new VolatileGlobalCellCache( numTimepoints, numSetups, 1, 1 );
+ cache = new VolatileGlobalCellCache( 1, 1 );
setupImgLoaders = new ArrayList<>();
for ( int setupId = 0; setupId < numSetups; ++setupId )
setupImgLoaders.add( new SetupImgLoader( setupId, type, volatileType ) );
@@ -171,7 +170,7 @@ public abstract class VirtualStackImageLoader< T extends NativeType< T >, V exte
protected abstract void linkVolatileType( CachedCellImg< V, A > img );
@Override
- public VolatileGlobalCellCache getCache()
+ public VolatileGlobalCellCache getCacheControl()
{
return cache;
}
--
GitLab