diff --git a/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java b/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java index d8c12d39f6068135bbc0f652f856a181a0a2dd60..4467b86d63c564e701bee3bceace96ec6a54a0b8 100644 --- a/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java +++ b/src/main/java/bdv/img/catmaid/CatmaidImageLoader.java @@ -34,7 +34,7 @@ public class CatmaidImageLoader implements ViewerImgLoader< ARGBType, VolatileAR private double resZ; - private String baseUrl; + private String urlFormat; private int tileWidth; @@ -60,8 +60,8 @@ public class CatmaidImageLoader implements ViewerImgLoader< ARGBType, VolatileAR resXY = Double.parseDouble( elem.getChildText( "resXY" ) ); resZ = Double.parseDouble( elem.getChildText( "resZ" ) ); - baseUrl = elem.getChildText( "baseUrl" ); - + urlFormat = elem.getChildText( "urlFormat" ); + tileWidth = Integer.parseInt( elem.getChildText( "tileWidth" ) ); tileHeight = Integer.parseInt( elem.getChildText( "tileHeight" ) ); @@ -84,7 +84,7 @@ public class CatmaidImageLoader implements ViewerImgLoader< ARGBType, VolatileAR final int[] maxLevels = new int[] { numScales - 1 }; cache = new VolatileGlobalCellCache< VolatileIntArray >( - new CatmaidVolatileIntArrayLoader( baseUrl + "%5$d/%8$d_%9$d_%1$d.jpg", tileWidth, tileHeight ), 1, 1, numScales, maxLevels, 10 ); + new CatmaidVolatileIntArrayLoader( urlFormat, tileWidth, tileHeight ), 1, 1, numScales, maxLevels, 10 ); } final static public int getNumScales( long width, long height, final long tileWidth, final long tileHeight )