@cornerstonejs/tools 3.27.0 → 3.28.1

package/dist/esm/tools/WindowLevelTool.js

@@ -143,7 +143,7 @@ class WindowLevelTool extends BaseTool {
             }, [Infinity, -Infinity]);
             const BitsStored = imageVolume?.metadata?.BitsStored;
             const metadataDynamicRange = BitsStored ? 2 ** BitsStored : Infinity;
-            imageDynamicRange = Math.min(calculatedDynamicRange, metadataDynamicRange);
+            imageDynamicRange = Math.min(calculatedDynamicRange[1] - calculatedDynamicRange[0], metadataDynamicRange);
         }
         else {
             imageDynamicRange = this._getImageDynamicRangeFromViewport(viewport);

package/dist/esm/utilities/stackPrefetch/stackContextPrefetch.js

@@ -1,6 +1,7 @@
-import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, } from '@cornerstonejs/core';
+import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, } from '@cornerstonejs/core';
 import { addToolState, getToolState } from './state';
 import { getStackData, requestType, priority, clearFromImageIds, getPromiseRemovedHandler, } from './stackPrefetchUtils';
+const { imageRetrieveMetadataProvider } = utilities;
 let configuration = {
     maxImagesToPrefetch: Infinity,
     minBefore: 2,
@@ -103,9 +104,13 @@ function prefetch(element) {
             }
         }
     }
-    const requestFn = (imageId, options) => imageLoader
-        .loadAndCacheImage(imageId, options)
-        .then(() => doneCallback(imageId));
+    const requestFn = (imageId, options) => {
+        const { retrieveOptions = {} } = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, imageId, 'stack');
+        return imageLoader.loadAndCacheImage(imageId, {
+            ...options,
+            retrieveOptions: retrieveOptions?.default || Object.values(retrieveOptions)?.[0] || {},
+        });
+    };
     stackPrefetch.indicesToRequest.forEach((imageIdIndex) => {
         const imageId = stack.imageIds[imageIdIndex];
         const options = {

package/dist/esm/utilities/stackPrefetch/stackPrefetch.js

@@ -1,6 +1,7 @@
-import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, getConfiguration as getCoreConfiguration, } from '@cornerstonejs/core';
+import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, } from '@cornerstonejs/core';
 import { addToolState, getToolState } from './state';
 import { getStackData, requestType, priority, getPromiseRemovedHandler, nearestIndex, range, } from './stackPrefetchUtils';
+const { imageRetrieveMetadataProvider } = utilities;
 let configuration = {
     maxImagesToPrefetch: Infinity,
     preserveExistingPool: true,
@@ -86,7 +87,13 @@ function prefetch(element) {
             imageIdsToPrefetch.push(imageId);
         }
     }
-    const requestFn = (imageId, options) => imageLoader.loadAndCacheImage(imageId, options);
+    const requestFn = (imageId, options) => {
+        const { retrieveOptions = {} } = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, imageId, 'stack');
+        return imageLoader.loadAndCacheImage(imageId, {
+            ...options,
+            retrieveOptions: retrieveOptions?.default || Object.values(retrieveOptions)?.[0] || {},
+        });
+    };
     imageIdsToPrefetch.forEach((imageId) => {
         const options = {
             requestType,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.27.0";
+export declare const version = "3.28.1";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.27.0';
+export const version = '3.28.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.27.0",
+  "version": "3.28.1",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.27.0",
+    "@cornerstonejs/core": "^3.28.1",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "877bed9dc602f121a7ec1da9941994d7d49da9ea"
+  "gitHead": "b17eba02d079a31ed370cdf975a0fedcdf6b081d"
 }