From 9ac8921edfe10033ce9fe88d34864a6fa5f5b856 Mon Sep 17 00:00:00 2001
From: Alireza <ar.sedghi@gmail.com>
Date: Tue, 18 Apr 2023 22:53:59 -0400
Subject: [PATCH] feat(streaming-image-volume): add caching for image load
 object

This commit adds functionality to cache image load object when it
has not already been loaded into the cache. This optimizes the
process of loading images.

refactor(stackToVolumeWithAnnotations): reverse order of image stack

This commit reverses the order of images in the image stack to match
the order in which they were added to the stack.

refactor(stackToVolumeWithAnnotations): use sagittal as default axis

This commit changes the default axis for the stack viewport to sagittal.
---
 .../src/BaseStreamingImageVolume.ts                |  8 +++++---
 .../stackToVolumeWithAnnotations/_setViewports.ts  | 14 +++++---------
 .../examples/stackToVolumeWithAnnotations/index.ts |  3 +--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/packages/streaming-image-volume-loader/src/BaseStreamingImageVolume.ts b/packages/streaming-image-volume-loader/src/BaseStreamingImageVolume.ts
index 57018f936..20b41de3c 100644
--- a/packages/streaming-image-volume-loader/src/BaseStreamingImageVolume.ts
+++ b/packages/streaming-image-volume-loader/src/BaseStreamingImageVolume.ts
@@ -896,9 +896,11 @@ export default class BaseStreamingImageVolume extends ImageVolume {
       );
 
       // 3. Caching the image
-      cache.putImageLoadObject(imageId, imageLoadObject).catch((err) => {
-        console.error(err);
-      });
+      if (!cache.getImageLoadObject(imageId)) {
+        cache.putImageLoadObject(imageId, imageLoadObject).catch((err) => {
+          console.error(err);
+        });
+      }
 
       // 4. If we know we won't be able to add another Image to the cache
       //    without breaching the limit, stop here.
diff --git a/packages/tools/examples/stackToVolumeWithAnnotations/_setViewports.ts b/packages/tools/examples/stackToVolumeWithAnnotations/_setViewports.ts
index eb8016c61..edde48100 100644
--- a/packages/tools/examples/stackToVolumeWithAnnotations/_setViewports.ts
+++ b/packages/tools/examples/stackToVolumeWithAnnotations/_setViewports.ts
@@ -41,18 +41,14 @@ function _convertVolumeToStackViewport(
   const { uid: volumeId } = actorEntry;
   const volume = cache.getVolume(volumeId) as StreamingImageVolume;
 
-  const imageIds = volume.imageIds;
-
   // if this is the first time decaching do it
-  if (!cache.getImageLoadObject(imageIds[0])) {
-    volume.decache();
-  }
+  volume.decache();
 
-  const stack = volume.imageIds;
+  const stack = volume.imageIds.reverse();
 
   // Set the stack on the viewport
-  const currentIndex = Math.floor(stack.length / 2);
-  stackViewport.setStack(stack, currentIndex);
+  // const currentIndex = Math.floor(stack.length / 2);
+  stackViewport.setStack(stack, 0);
 
   // Render the image
   viewport.render();
@@ -82,7 +78,7 @@ async function _convertStackToVolumeViewport(
       type: ViewportType.ORTHOGRAPHIC,
       element,
       defaultOptions: {
-        orientation: Enums.OrientationAxis.AXIAL,
+        orientation: Enums.OrientationAxis.SAGITTAL,
         background: <Types.Point3>[0.2, 0.4, 0.2],
       },
     },
diff --git a/packages/tools/examples/stackToVolumeWithAnnotations/index.ts b/packages/tools/examples/stackToVolumeWithAnnotations/index.ts
index a9312fc1b..0555724af 100644
--- a/packages/tools/examples/stackToVolumeWithAnnotations/index.ts
+++ b/packages/tools/examples/stackToVolumeWithAnnotations/index.ts
@@ -221,8 +221,7 @@ async function run() {
   const stack = imageIds;
 
   // Set the stack on the viewport
-  const currentIndex = Math.floor(stack.length / 2);
-  viewport.setStack(stack, currentIndex);
+  viewport.setStack(stack, 0);
 
   // Render the image
   viewport.render();