From bb7c085a592bfb6dfb37fd719bb95806eed56a06 Mon Sep 17 00:00:00 2001
From: Tobias Pietzsch <tobias.pietzsch@gmail.com>
Date: Tue, 4 Mar 2014 15:00:42 -0500
Subject: [PATCH] add getCache() to ViewerImgLoader interface
---
src/main/java/bdv/BigDataViewer.java | 3 +--
src/main/java/bdv/ViewerImgLoader.java | 3 +++
src/main/java/bdv/img/catmaid/CatmaidImageLoader.java | 4 ++--
src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java | 1 +
src/main/java/bdv/img/remote/RemoteImageLoader.java | 1 +
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/bdv/BigDataViewer.java b/src/main/java/bdv/BigDataViewer.java
index c83bd20f..7c814d12 100644
--- a/src/main/java/bdv/BigDataViewer.java
+++ b/src/main/java/bdv/BigDataViewer.java
@@ -31,7 +31,6 @@ import org.jdom2.output.XMLOutputter;
import bdv.export.ProgressWriter;
import bdv.export.ProgressWriterConsole;
-import bdv.img.catmaid.CatmaidImageLoader;
import bdv.tools.HelpDialog;
import bdv.tools.InitializeViewerState;
import bdv.tools.RecordMovieDialog;
@@ -173,7 +172,7 @@ public class BigDataViewer
initSetups( loader, converterSetups, sources );
viewerFrame = new ViewerFrame( width, height, sources, seq.numTimepoints(),
- ( ( CatmaidImageLoader ) seq.imgLoader ).getCache() );
+ ( ( ViewerImgLoader< ?, ? > ) seq.imgLoader ).getCache() );
viewer = viewerFrame.getViewerPanel();
for ( final ConverterSetup cs : converterSetups )
diff --git a/src/main/java/bdv/ViewerImgLoader.java b/src/main/java/bdv/ViewerImgLoader.java
index 61634d08..5d509c63 100644
--- a/src/main/java/bdv/ViewerImgLoader.java
+++ b/src/main/java/bdv/ViewerImgLoader.java
@@ -4,6 +4,7 @@ import mpicbg.spim.data.ImgLoader;
import mpicbg.spim.data.View;
import net.imglib2.RandomAccessibleInterval;
import net.imglib2.Volatile;
+import bdv.img.cache.Cache;
public interface ViewerImgLoader< T, V extends Volatile< T > > extends ImgLoader< T >
{
@@ -18,4 +19,6 @@ public interface ViewerImgLoader< T, V extends Volatile< T > > extends ImgLoader
public double[][] getMipmapResolutions( final int setup );
public int numMipmapLevels( final int setup );
+
+ public Cache getCache();
}
diff --git a/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java b/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java
index 17cfa587..165c9fc2 100644
--- a/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java
+++ b/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java
@@ -15,7 +15,6 @@ import net.imglib2.type.volatiles.VolatileARGBType;
import org.jdom2.Element;
import bdv.ViewerImgLoader;
-import bdv.img.cache.Cache;
import bdv.img.cache.VolatileCell;
import bdv.img.cache.VolatileGlobalCellCache;
import bdv.img.cache.VolatileGlobalCellCache.LoadingStrategy;
@@ -160,7 +159,8 @@ public class CatmaidImageLoader implements ViewerImgLoader< ARGBType, VolatileAR
return img;
}
- public Cache getCache()
+ @Override
+ public VolatileGlobalCellCache< VolatileIntArray > getCache()
{
return cache;
}
diff --git a/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java b/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java
index 15baeea4..4191a14b 100644
--- a/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java
+++ b/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java
@@ -259,6 +259,7 @@ public class Hdf5ImageLoader implements ViewerImgLoader< UnsignedShortType, Vola
return img;
}
+ @Override
public VolatileGlobalCellCache< VolatileShortArray > getCache()
{
return cache;
diff --git a/src/main/java/bdv/img/remote/RemoteImageLoader.java b/src/main/java/bdv/img/remote/RemoteImageLoader.java
index a0a2965e..6ae2a0bb 100644
--- a/src/main/java/bdv/img/remote/RemoteImageLoader.java
+++ b/src/main/java/bdv/img/remote/RemoteImageLoader.java
@@ -116,6 +116,7 @@ public class RemoteImageLoader implements ViewerImgLoader< UnsignedShortType, Vo
return img;
}
+ @Override
public VolatileGlobalCellCache< VolatileShortArray > getCache()
{
return cache;
--
GitLab