change order of fusion methods, change OMEZARR-loader back to Hypersl…

…icing so BigStitcher-Spark prefetch works
PreibischLab · Nov 8, 2024 · 5e75dd1 · 5e75dd1
1 parent 5b02d32
commit 5e75dd1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/net/preibisch/mvrecon/fiji/plugin/fusion/FusionGUI.java b/src/main/java/net/preibisch/mvrecon/fiji/plugin/fusion/FusionGUI.java
@@ -127,10 +127,9 @@ public enum FusionType { AVG, AVG_BLEND, AVG_CONTENT, AVG_BLEND_CONTENT, MAX, FI
 		IOFunctions.printIJLog = true;
 
 		staticImgExportAlgorithms.add( new DisplayImage() );
-		staticImgExportAlgorithms.add( new Save3dTIFF( null ) );
 		staticImgExportAlgorithms.add( new ExportN5Api() );
+		staticImgExportAlgorithms.add( new Save3dTIFF( null ) );
 		staticImgExportAlgorithms.add( new OpenSeaDragon() );
-
 		staticImgExportAlgorithms.add( new ExportLarge2DTIFF() );
 
 		//staticImgExportAlgorithms.add( new ExportSpimData2TIFF() );

diff --git a/src/main/java/net/preibisch/mvrecon/fiji/spimdata/imgloaders/AllenOMEZarrLoader.java b/src/main/java/net/preibisch/mvrecon/fiji/spimdata/imgloaders/AllenOMEZarrLoader.java
@@ -39,6 +39,7 @@
 import net.imglib2.cache.volatiles.CacheHints;
 import net.imglib2.img.display.imagej.ImageJFunctions;
 import net.imglib2.type.NativeType;
+import net.imglib2.view.Views;
 import net.preibisch.mvrecon.fiji.spimdata.SpimData2;
 import net.preibisch.mvrecon.fiji.spimdata.XmlIoSpimData2;
 import net.preibisch.mvrecon.fiji.spimdata.explorer.ViewSetupExplorer;
@@ -96,9 +97,11 @@ protected < T extends NativeType< T > > RandomAccessibleInterval< T > prepareCac
 			final CacheHints cacheHints,
 			final T type )
 	{
+		return Views.hyperSlice( Views.hyperSlice( super.prepareCachedImage( datasetPath, setupId, 0, level, cacheHints, type ), 4, 0 ), 3, 0);
+		/*
 		return super.prepareCachedImage( datasetPath, setupId, 0, level, cacheHints, type ).view()
 				.slice( 4, 0 )
-				.slice( 3, 0 );
+				.slice( 3, 0 );*/
 	}
 
 	public static void main( String[] args ) throws SpimDataException