reverting some changes that were made for single-level octtree stacks

JaneliaSciComp · Apr 23, 2021 · 5dd7105 · 5dd7105
1 parent 3ee396e
commit 5dd7105
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/modules/HortaTracer/src/main/java/org/janelia/horta/blocks/KtxOctreeBlockTileSource.java b/modules/HortaTracer/src/main/java/org/janelia/horta/blocks/KtxOctreeBlockTileSource.java
@@ -90,8 +90,6 @@ private KtxHeader loadKtxHeader(KtxOctreeBlockTileKey octreeRootKey) {
     private KtxOctreeResolution getKtxResolution(KtxHeader ktxHeader) {
         // Parse maximum resolution
         int maxRes = Integer.parseInt(ktxHeader.keyValueMetadata.get("multiscale_total_levels").trim()) - 1;
-        if (maxRes==0)
-            maxRes = 1;
         return new KtxOctreeResolution(maxRes);
     }
 

diff --git a/modules/HortaTracer/src/main/java/org/janelia/horta/blocks/OctreeDisplayBlockChooser.java b/modules/HortaTracer/src/main/java/org/janelia/horta/blocks/OctreeDisplayBlockChooser.java
@@ -22,7 +22,7 @@ public class OctreeDisplayBlockChooser implements BlockChooser<KtxOctreeBlockTil
 
     private void initBlockSizes(KtxOctreeBlockTileSource source, Vantage vantage) {
         int numLevels = (int)source.getZoomLevels();
-        for (int i=1; i<numLevels; i++) {
+        for (int i=2; i<numLevels; i++) {
             float blockHeight = source.getBlockSize(new KtxOctreeResolution(i)).getY();
             zoomLevels.add((float)(blockHeight * BLOCK_WIDTH_ACROSS_VIEWPORT));
             LOG.info("ZOOM LEVEL {} is {}",i,(float)(blockHeight * BLOCK_WIDTH_ACROSS_VIEWPORT));

diff --git a/...erController/src/main/java/org/janelia/workstation/controller/tileimagery/TileServer.java b/...erController/src/main/java/org/janelia/workstation/controller/tileimagery/TileServer.java
@@ -426,7 +426,7 @@ public void volumeLoaded(URL url) {
         // Initialize pre-fetchers
         minResPreFetcher.setLoadAdapter(sharedVolumeImage.getLoadAdapter());
         futurePreFetcher.setLoadAdapter(sharedVolumeImage.getLoadAdapter());
-        //clearCache();
+        clearCache();
         refreshCurrentTileSet();
     }