Skip to content
Snippets Groups Projects
Commit bb7c085a authored by Tobias Pietzsch's avatar Tobias Pietzsch
Browse files

add getCache() to ViewerImgLoader interface

parent 8c60330d
Branches
Tags
No related merge requests found
...@@ -31,7 +31,6 @@ import org.jdom2.output.XMLOutputter; ...@@ -31,7 +31,6 @@ import org.jdom2.output.XMLOutputter;
import bdv.export.ProgressWriter; import bdv.export.ProgressWriter;
import bdv.export.ProgressWriterConsole; import bdv.export.ProgressWriterConsole;
import bdv.img.catmaid.CatmaidImageLoader;
import bdv.tools.HelpDialog; import bdv.tools.HelpDialog;
import bdv.tools.InitializeViewerState; import bdv.tools.InitializeViewerState;
import bdv.tools.RecordMovieDialog; import bdv.tools.RecordMovieDialog;
...@@ -173,7 +172,7 @@ public class BigDataViewer ...@@ -173,7 +172,7 @@ public class BigDataViewer
initSetups( loader, converterSetups, sources ); initSetups( loader, converterSetups, sources );
viewerFrame = new ViewerFrame( width, height, sources, seq.numTimepoints(), viewerFrame = new ViewerFrame( width, height, sources, seq.numTimepoints(),
( ( CatmaidImageLoader ) seq.imgLoader ).getCache() ); ( ( ViewerImgLoader< ?, ? > ) seq.imgLoader ).getCache() );
viewer = viewerFrame.getViewerPanel(); viewer = viewerFrame.getViewerPanel();
for ( final ConverterSetup cs : converterSetups ) for ( final ConverterSetup cs : converterSetups )
......
...@@ -4,6 +4,7 @@ import mpicbg.spim.data.ImgLoader; ...@@ -4,6 +4,7 @@ import mpicbg.spim.data.ImgLoader;
import mpicbg.spim.data.View; import mpicbg.spim.data.View;
import net.imglib2.RandomAccessibleInterval; import net.imglib2.RandomAccessibleInterval;
import net.imglib2.Volatile; import net.imglib2.Volatile;
import bdv.img.cache.Cache;
public interface ViewerImgLoader< T, V extends Volatile< T > > extends ImgLoader< T > 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 ...@@ -18,4 +19,6 @@ public interface ViewerImgLoader< T, V extends Volatile< T > > extends ImgLoader
public double[][] getMipmapResolutions( final int setup ); public double[][] getMipmapResolutions( final int setup );
public int numMipmapLevels( final int setup ); public int numMipmapLevels( final int setup );
public Cache getCache();
} }
...@@ -15,7 +15,6 @@ import net.imglib2.type.volatiles.VolatileARGBType; ...@@ -15,7 +15,6 @@ import net.imglib2.type.volatiles.VolatileARGBType;
import org.jdom2.Element; import org.jdom2.Element;
import bdv.ViewerImgLoader; import bdv.ViewerImgLoader;
import bdv.img.cache.Cache;
import bdv.img.cache.VolatileCell; import bdv.img.cache.VolatileCell;
import bdv.img.cache.VolatileGlobalCellCache; import bdv.img.cache.VolatileGlobalCellCache;
import bdv.img.cache.VolatileGlobalCellCache.LoadingStrategy; import bdv.img.cache.VolatileGlobalCellCache.LoadingStrategy;
...@@ -160,7 +159,8 @@ public class CatmaidImageLoader implements ViewerImgLoader< ARGBType, VolatileAR ...@@ -160,7 +159,8 @@ public class CatmaidImageLoader implements ViewerImgLoader< ARGBType, VolatileAR
return img; return img;
} }
public Cache getCache() @Override
public VolatileGlobalCellCache< VolatileIntArray > getCache()
{ {
return cache; return cache;
} }
......
...@@ -259,6 +259,7 @@ public class Hdf5ImageLoader implements ViewerImgLoader< UnsignedShortType, Vola ...@@ -259,6 +259,7 @@ public class Hdf5ImageLoader implements ViewerImgLoader< UnsignedShortType, Vola
return img; return img;
} }
@Override
public VolatileGlobalCellCache< VolatileShortArray > getCache() public VolatileGlobalCellCache< VolatileShortArray > getCache()
{ {
return cache; return cache;
......
...@@ -116,6 +116,7 @@ public class RemoteImageLoader implements ViewerImgLoader< UnsignedShortType, Vo ...@@ -116,6 +116,7 @@ public class RemoteImageLoader implements ViewerImgLoader< UnsignedShortType, Vo
return img; return img;
} }
@Override
public VolatileGlobalCellCache< VolatileShortArray > getCache() public VolatileGlobalCellCache< VolatileShortArray > getCache()
{ {
return cache; return cache;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment