Skip to content

Commit b64d414

Browse files
cgoinatpietzsch
authored andcommitted
changed the N5Properties api
1 parent cfab9e5 commit b64d414

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/main/java/bdv/img/n5/DefaultN5Properties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class DefaultN5Properties implements N5Properties
3535
{
3636
@Override
37-
public String getDatasetPath( final int setupId, final int timepointId, final int level )
37+
public String getDatasetPath( final N5Reader n5, final int setupId, final int timepointId, final int level )
3838
{
3939
return BdvN5Format.getPathName( setupId, timepointId, level );
4040
}
@@ -56,7 +56,7 @@ public double[][] getMipmapResolutions( final N5Reader n5, final int setupId )
5656
@Override
5757
public long[] getDimensions( final N5Reader n5, final int setupId, final int timepointId, final int level )
5858
{
59-
final String path = getDatasetPath( setupId, timepointId, level );
59+
final String path = getDatasetPath( n5, setupId, timepointId, level );
6060
return n5.getDatasetAttributes( path ).getDimensions();
6161
}
6262
}

src/main/java/bdv/img/n5/N5ImageLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public Future< Void > prefetch( final int parallelism )
210210
final int setup = viewId.getViewSetupId();
211211
final int tp = viewId.getTimePointId();
212212
final int numLevels = setupIdToNumLevels.get( setup );
213-
IntStream.range( 0, numLevels ).parallel().forEach( level -> n5.getDatasetAttributes( n5properties.getDatasetPath( setup, tp, level ) ) );
213+
IntStream.range( 0, numLevels ).parallel().forEach( level -> n5.getDatasetAttributes( n5properties.getDatasetPath( n5, setup, tp, level ) ) );
214214
} );
215215
} ).join();
216216
// System.out.println( "Pre-fetched dataset attributes." );
@@ -379,7 +379,7 @@ private < T extends NativeType< T > > RandomAccessibleInterval< T > prepareCache
379379
{
380380
final int priority = numMipmapLevels() - 1 - level;
381381
final CacheHints cacheHints = new CacheHints( loadingStrategy, priority, false );
382-
final String datasetPath = n5properties.getDatasetPath( setupId, timepointId, level );
382+
final String datasetPath = n5properties.getDatasetPath( n5, setupId, timepointId, level );
383383
return N5ImageLoader.this.prepareCachedImage( datasetPath, setupId, timepointId, level, cacheHints, type );
384384
}
385385

src/main/java/bdv/img/n5/N5Properties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ public interface N5Properties
4646

4747
long[] getDimensions( N5Reader n5, int setupId, int timepointId, int level );
4848

49-
String getDatasetPath( int setupId, int timepointId, int level );
49+
String getDatasetPath( N5Reader n5, int setupId, int timepointId, int level );
5050
}

0 commit comments

Comments
 (0)