@cornerstonejs/tools 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/esm/utilities/pointInShapeCallback.js

@@ -36,6 +36,7 @@ export default function pointInShapeCallback(imageData, pointInShapeFn, callback
     const scanAxisStep = vec3.fromValues(scanAxisNormal[0] * scanAxisSpacing, scanAxisNormal[1] * scanAxisSpacing, scanAxisNormal[2] * scanAxisSpacing);
     const yMultiple = dimensions[0];
     const zMultiple = dimensions[0] * dimensions[1];
+    const pointsInShape = [];
     for (let k = kMin; k <= kMax; k++) {
         for (let j = jMin; j <= jMax; j++) {
             for (let i = iMin; i <= iMax; i++) {
@@ -61,10 +62,14 @@ export default function pointInShapeCallback(imageData, pointInShapeFn, callback
                 if (pointInShapeFn(pointLPS, pointIJK)) {
                     const index = k * zMultiple + j * yMultiple + i;
                     const value = scalarData[index];
-                    callback({ value, index, pointIJK, pointLPS });
+                    pointsInShape.push({ value, index, pointIJK, pointLPS });
+                    if (callback !== null) {
+                        callback({ value, index, pointIJK, pointLPS });
+                    }
                 }
             }
         }
     }
+    return pointsInShape;
 }
 //# sourceMappingURL=pointInShapeCallback.js.map

package/dist/esm/utilities/pointInShapeCallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAoCjC,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAA4C,EAC5C,cAA+B,EAC/B,QAA8B,EAC9B,SAAqB;IAErB,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAEvC,IAAI,UAAU,CAAC;IAGf,IAAK,SAAgC,CAAC,aAAa,EAAE;QACnD,UAAU,GAAI,SAAgC,CAAC,aAAa,EAAE,CAAC;KAChE;SAAM;QACL,UAAU,GAAI,SAA0B;aACrC,YAAY,EAAE;aACd,UAAU,EAAE;aACZ,OAAO,EAAE,CAAC;KACd;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;IAE7C,IAAI,CAAC,SAAS,EAAE;QACd,IAAI,GAAG,CAAC,CAAC;QACT,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,GAAG,CAAC,CAAC;QACT,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,GAAG,CAAC,CAAC;QACT,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;KACtB;SAAM;QACL,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;KACxD;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;IACvC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,CAAC,GAAG,OAAO,CAAC;IAG7D,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAEpD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAC7B,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,EAC1B,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,EAC1B,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAC3B,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAChC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,EAChC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,EAChC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CACjC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAClC,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,EACnC,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,EACnC,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,CACpC,CAAC;IAEF,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAEhD,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE;QACjC,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE;YACjC,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE;gBACjC,MAAM,QAAQ,GAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;gBACpB,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;gBACpB,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;gBAEpB,MAAM,UAAU,GAAG,aAAa,CAAC;gBAEjC,MAAM,QAAQ,GAAiB;oBAC7B,UAAU,CAAC,CAAC,CAAC;wBACX,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;wBACf,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;wBAClB,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;oBACtB,UAAU,CAAC,CAAC,CAAC;wBACX,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;wBACf,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;wBAClB,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;oBACtB,UAAU,CAAC,CAAC,CAAC;wBACX,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;wBACf,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;wBAClB,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;iBACvB,CAAC;gBAEF,IAAI,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;oBACtC,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC;oBAChD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;oBAEhC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;iBAChD;aACF;SACF;KACF;AACH,CAAC"}
+{"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":"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"}

package/dist/esm/utilities/roundNumber.js

@@ -1,9 +1,11 @@
 function roundNumber(value, precision = 2) {
-    if (value === undefined || value === null || value === '')
+    if (value === undefined || value === null || value === '') {
         return 'NaN';
+    }
     value = Number(value);
-    if (value < 0.0001)
+    if (value < 0.0001) {
         return `${value}`;
+    }
     const fixedPrecision = value >= 100
         ? precision - 2
         : value >= 10

package/dist/esm/utilities/roundNumber.js.map

@@ -1 +1 @@
-{"version":3,"file":"roundNumber.js","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":"AAYA,SAAS,WAAW,CAAC,KAAsB,EAAE,SAAS,GAAG,CAAC;IACxD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,KAAK,CAAC;IACxE,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,MAAM;QAAE,OAAO,GAAG,KAAK,EAAE,CAAC;IACtC,MAAM,cAAc,GAClB,KAAK,IAAI,GAAG;QACV,CAAC,CAAC,SAAS,GAAG,CAAC;QACf,CAAC,CAAC,KAAK,IAAI,EAAE;YACb,CAAC,CAAC,SAAS,GAAG,CAAC;YACf,CAAC,CAAC,KAAK,IAAI,CAAC;gBACZ,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,GAAG;oBACd,CAAC,CAAC,SAAS,GAAG,CAAC;oBACf,CAAC,CAAC,KAAK,IAAI,IAAI;wBACf,CAAC,CAAC,SAAS,GAAG,CAAC;wBACf,CAAC,CAAC,KAAK,IAAI,KAAK;4BAChB,CAAC,CAAC,SAAS,GAAG,CAAC;4BACf,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACpB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"roundNumber.js","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":"AAYA,SAAS,WAAW,CAAC,KAAsB,EAAE,SAAS,GAAG,CAAC;IACxD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE;QACzD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,MAAM,EAAE;QAClB,OAAO,GAAG,KAAK,EAAE,CAAC;KACnB;IACD,MAAM,cAAc,GAClB,KAAK,IAAI,GAAG;QACV,CAAC,CAAC,SAAS,GAAG,CAAC;QACf,CAAC,CAAC,KAAK,IAAI,EAAE;YACb,CAAC,CAAC,SAAS,GAAG,CAAC;YACf,CAAC,CAAC,KAAK,IAAI,CAAC;gBACZ,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,GAAG;oBACd,CAAC,CAAC,SAAS,GAAG,CAAC;oBACf,CAAC,CAAC,KAAK,IAAI,IAAI;wBACf,CAAC,CAAC,SAAS,GAAG,CAAC;wBACf,CAAC,CAAC,KAAK,IAAI,KAAK;4BAChB,CAAC,CAAC,SAAS,GAAG,CAAC;4BACf,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACpB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,eAAe,WAAW,CAAC"}

package/dist/esm/utilities/segmentation/brushSizeForToolGroup.d.ts

@@ -1,2 +1,2 @@
-export declare function setBrushSizeForToolGroup(toolGroupId: string, brushSize: number): void;
-export declare function getBrushSizeForToolGroup(toolGroupId: string): void;
+export declare function setBrushSizeForToolGroup(toolGroupId: string, brushSize: number, toolName?: string): void;
+export declare function getBrushSizeForToolGroup(toolGroupId: string, toolName?: string): void;

package/dist/esm/utilities/segmentation/brushSizeForToolGroup.js

@@ -2,12 +2,12 @@ import { getToolGroup } from '../../store/ToolGroupManager';
 import triggerAnnotationRenderForViewportIds from '../triggerAnnotationRenderForViewportIds';
 import { getRenderingEngine } from '@cornerstonejs/core';
 import getBrushToolInstances from './utilities';
-export function setBrushSizeForToolGroup(toolGroupId, brushSize) {
+export function setBrushSizeForToolGroup(toolGroupId, brushSize, toolName) {
     const toolGroup = getToolGroup(toolGroupId);
     if (toolGroup === undefined) {
         return;
     }
-    const brushBasedToolInstances = getBrushToolInstances(toolGroupId);
+    const brushBasedToolInstances = getBrushToolInstances(toolGroupId, toolName);
     brushBasedToolInstances.forEach((tool) => {
         tool.configuration.brushSize = brushSize;
         tool.invalidateBrushCursor();
@@ -22,7 +22,7 @@ export function setBrushSizeForToolGroup(toolGroupId, brushSize) {
     const renderingEngine = getRenderingEngine(renderingEngineId);
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIds);
 }
-export function getBrushSizeForToolGroup(toolGroupId) {
+export function getBrushSizeForToolGroup(toolGroupId, toolName) {
     const toolGroup = getToolGroup(toolGroupId);
     if (toolGroup === undefined) {
         return;
@@ -31,7 +31,7 @@ export function getBrushSizeForToolGroup(toolGroupId) {
     if (!Object.keys(toolInstances).length) {
         return;
     }
-    const brushBasedToolInstances = getBrushToolInstances(toolGroupId);
+    const brushBasedToolInstances = getBrushToolInstances(toolGroupId, toolName);
     const brushToolInstance = brushBasedToolInstances[0];
     if (!brushToolInstance) {
         return;

package/dist/esm/utilities/segmentation/brushSizeForToolGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"brushSizeForToolGroup.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/brushSizeForToolGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,qCAAqC,MAAM,0CAA0C,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,qBAAqB,MAAM,aAAa,CAAC;AAEhD,MAAM,UAAU,wBAAwB,CACtC,WAAmB,EACnB,SAAiB;IAEjB,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAEnE,uBAAuB,CAAC,OAAO,CAAC,CAAC,IAAe,EAAE,EAAE;QAClD,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,SAAS,CAAC;QAGzC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAGH,MAAM,aAAa,GAAG,SAAS,CAAC,gBAAgB,EAAE,CAAC;IAEnD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CACvD,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAC5B,CAAC;IAEF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAC9B,OAAO;KACR;IAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAIpD,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;IAE/C,MAAM,eAAe,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAE9D,qCAAqC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,WAAmB;IAC1D,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC;IAE/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE;QACtC,OAAO;KACR;IAED,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAGnE,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAErD,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO;KACR;IAGD,OAAO,iBAAiB,CAAC,aAAa,CAAC,SAAS,CAAC;AACnD,CAAC"}
+{"version":3,"file":"brushSizeForToolGroup.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/brushSizeForToolGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,qCAAqC,MAAM,0CAA0C,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,qBAAqB,MAAM,aAAa,CAAC;AAShD,MAAM,UAAU,wBAAwB,CACtC,WAAmB,EACnB,SAAiB,EACjB,QAAiB;IAEjB,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE7E,uBAAuB,CAAC,OAAO,CAAC,CAAC,IAAe,EAAE,EAAE;QAClD,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,SAAS,CAAC;QAGzC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAGH,MAAM,aAAa,GAAG,SAAS,CAAC,gBAAgB,EAAE,CAAC;IAEnD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CACvD,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAC5B,CAAC;IAEF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAC9B,OAAO;KACR;IAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAIpD,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;IAE/C,MAAM,eAAe,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAE9D,qCAAqC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;AACtE,CAAC;AASD,MAAM,UAAU,wBAAwB,CACtC,WAAmB,EACnB,QAAiB;IAEjB,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC;IAE/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE;QACtC,OAAO;KACR;IAED,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAG7E,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAErD,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO;KACR;IAGD,OAAO,iBAAiB,CAAC,aAAa,CAAC,SAAS,CAAC;AACnD,CAAC"}

package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js

@@ -59,8 +59,9 @@ function thresholdVolumeByRange(segmentationVolume, thresholdVolumeInformation,
                 break;
             }
         }
-        if (insert)
+        if (insert) {
             scalarData[index] = 1;
+        }
     };
     pointInShapeCallback(segmentationImageData, () => true, callback, boundsIJK);
     triggerSegmentationDataModified(segmentationVolume.volumeId);

package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js.map

@@ -1 +1 @@
-{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"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"}

package/dist/esm/utilities/segmentation/utilities.d.ts

@@ -1,11 +1,10 @@
 import { Types } from '@cornerstonejs/core';
-import BrushTool from '../../tools/segmentation/BrushTool';
 export declare type ThresholdInformation = {
     volume: Types.IImageVolume;
     lower: number;
     upper: number;
 };
-export default function getBrushToolInstances(toolGroupId: any): BrushTool[];
+export default function getBrushToolInstances(toolGroupId: string, toolName?: string): any[];
 export declare function getVoxelOverlap(imageData: any, dimensions: any, voxelSpacing: any, voxelCenter: any): [Types.Point2, Types.Point2, Types.Point2];
 export declare function processVolumes(segmentationVolume: Types.IImageVolume, thresholdVolumeInformation: ThresholdInformation[]): {
     volumeInfoList: any[];

package/dist/esm/utilities/segmentation/utilities.js

@@ -2,7 +2,7 @@ import { utilities as csUtils } from '@cornerstonejs/core';
 import { getToolGroup } from '../../store/ToolGroupManager';
 import BrushTool from '../../tools/segmentation/BrushTool';
 import getBoundingBoxAroundShape from '../boundingBox/getBoundingBoxAroundShape';
-export default function getBrushToolInstances(toolGroupId) {
+export default function getBrushToolInstances(toolGroupId, toolName) {
     const toolGroup = getToolGroup(toolGroupId);
     if (toolGroup === undefined) {
         return;
@@ -11,6 +11,9 @@ export default function getBrushToolInstances(toolGroupId) {
     if (!Object.keys(toolInstances).length) {
         return;
     }
+    if (toolName && toolInstances[toolName]) {
+        return [toolInstances[toolName]];
+    }
     const brushBasedToolInstances = Object.values(toolInstances).filter((toolInstance) => toolInstance instanceof BrushTool);
     return brushBasedToolInstances;
 }

package/dist/esm/utilities/segmentation/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/utilities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/utilities.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,yBAAyB,MAAM,0CAA0C,CAAC;AAQjF,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,WAAmB,EACnB,QAAiB;IAEjB,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC;IAE/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE;QACtC,OAAO;KACR;IAED,IAAI,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE;QACvC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;KAClC;IAGD,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CACjE,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,YAAY,SAAS,CACrC,CAAC;IAEjB,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;IAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAMF,MAAM,UAAU,eAAe,CAC7B,SAAS,EACT,UAAU,EACV,YAAY,EACZ,WAAW;IAEX,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1B,MAAM,KAAK,GAAG,WAAW,CAAC;gBAC1B,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1D,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC/B;SACF;KACF;IACD,MAAM,eAAe,GAAG,iBAAiB,CAAC,GAAG,CAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,EAAE,KAAK,CAAiB,CAC3E,CAAC;IACF,MAAM,aAAa,GAAG,yBAAyB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAE7E,OAAO,aAAa,CAAC;AACvB,CAAC;AAKD,MAAM,UAAU,cAAc,CAC5B,kBAAsC,EACtC,0BAAkD;IAElD,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,qBAAqB,EAAE,GACtE,kBAAkB,CAAC;IACrB,MAAM,UAAU,GAAG,kBAAkB,CAAC,aAAa,EAAE,CAAC;IAGtD,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GACtC,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAEvC,MAAM,UAAU,GACd,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC;QAE9D,IACE,UAAU,KAAK,UAAU,CAAC,MAAM;YAChC,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACzC;YACA,aAAa,GAAG,CAAC,CAAC;SACnB;QAGD,MAAM,eAAe,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,CAAC;QACxE,MAAM,KAAK,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAClD,MAAM,KAAK,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAElD,cAAc,CAAC,IAAI,CAAC;YAClB,SAAS;YACT,eAAe;YACf,KAAK;YACL,KAAK;YACL,OAAO;YACP,UAAU;YACV,UAAU;SACX,CAAC,CAAC;KACJ;IAED,OAAO;QACL,cAAc;QACd,aAAa;KACd,CAAC;AACJ,CAAC"}

package/dist/esm/utilities/stackPrefetch/index.d.ts

@@ -1,2 +1,3 @@
-import { enable, disable, setConfiguration, getConfiguration } from './stackPrefetch';
-export { enable, disable, setConfiguration, getConfiguration };
+import stackPrefetch from './stackPrefetch';
+import stackContextPrefetch from './stackContextPrefetch';
+export { stackPrefetch, stackContextPrefetch };

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

@@ -1,3 +1,4 @@
-import { enable, disable, setConfiguration, getConfiguration, } from './stackPrefetch';
-export { enable, disable, setConfiguration, getConfiguration };
+import stackPrefetch from './stackPrefetch';
+import stackContextPrefetch from './stackContextPrefetch';
+export { stackPrefetch, stackContextPrefetch };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EACP,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/esm/utilities/stackPrefetch/stackContextPrefetch.d.ts

@@ -0,0 +1,16 @@
+declare function disable(element: any): void;
+declare function getConfiguration(): {
+    maxImagesToPrefetch: number;
+    minBefore: number;
+    maxAfter: number;
+    directionExtraImages: number;
+    preserveExistingPool: boolean;
+};
+declare function setConfiguration(config: any): void;
+declare const stackContextPrefetch: {
+    enable: (element: any) => void;
+    disable: typeof disable;
+    getConfiguration: typeof getConfiguration;
+    setConfiguration: typeof setConfiguration;
+};
+export default stackContextPrefetch;

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

@@ -0,0 +1,220 @@
+import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, getConfiguration as getCoreConfiguration, } from '@cornerstonejs/core';
+import { addToolState, getToolState } from './state';
+import { getStackData, requestType, priority, clearFromImageIds, getPromiseRemovedHandler, } from './stackPrefetchUtils';
+import roundNumber from '../roundNumber';
+let configuration = {
+    maxImagesToPrefetch: Infinity,
+    minBefore: 2,
+    maxAfter: 2,
+    directionExtraImages: 10,
+    preserveExistingPool: false,
+};
+let resetPrefetchTimeout;
+const resetPrefetchDelay = 5;
+const enable = (element) => {
+    const stack = getStackData(element);
+    if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
+        console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
+        return;
+    }
+    updateToolState(element);
+    prefetch(element);
+    element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
+    element.addEventListener(Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
+    const promiseRemovedHandler = getPromiseRemovedHandler(element);
+    eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
+    eventTarget.addEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
+};
+function prefetch(element) {
+    const stack = getStackData(element);
+    if (!stack?.imageIds?.length) {
+        console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
+        return;
+    }
+    const stackPrefetchData = getToolState(element);
+    if (!stackPrefetchData) {
+        return;
+    }
+    const stackPrefetch = stackPrefetchData || {};
+    stackPrefetch.enabled &&= stackPrefetch.indicesToRequest?.length;
+    if (stackPrefetch.enabled === false) {
+        return;
+    }
+    function removeFromList(imageIdIndex) {
+        const index = stackPrefetch.indicesToRequest.indexOf(imageIdIndex);
+        if (index > -1) {
+            stackPrefetch.indicesToRequest.splice(index, 1);
+        }
+    }
+    const indicesToRequestCopy = stackPrefetch.indicesToRequest.slice();
+    const { currentImageIdIndex } = stack;
+    indicesToRequestCopy.forEach((imageIdIndex) => {
+        const imageId = stack.imageIds[imageIdIndex];
+        if (!imageId) {
+            return;
+        }
+        const distance = Math.abs(currentImageIdIndex - imageIdIndex);
+        const imageCached = distance < 6
+            ? cache.getImageLoadObject(imageId)
+            : cache.isLoaded(imageId);
+        if (imageCached) {
+            removeFromList(imageIdIndex);
+        }
+    });
+    if (!stackPrefetch.indicesToRequest.length) {
+        return;
+    }
+    if (!configuration.preserveExistingPool) {
+        imageLoadPoolManager.filterRequests(clearFromImageIds(stack));
+    }
+    function doneCallback(imageId) {
+        const imageIdIndex = stack.imageIds.indexOf(imageId);
+        removeFromList(imageIdIndex);
+        const image = cache.getCachedImageBasedOnImageURI(imageId);
+        const { stats } = stackPrefetch;
+        const decodeTimeInMS = image?.image?.decodeTimeInMS || 0;
+        if (decodeTimeInMS) {
+            stats.imageIds.set(imageId, decodeTimeInMS);
+            stats.decodeTimeInMS += decodeTimeInMS;
+            const loadTimeInMS = image?.image?.loadTimeInMS || 0;
+            stats.loadTimeInMS += loadTimeInMS;
+        }
+        if (!stackPrefetch.indicesToRequest.length) {
+            if (image?.sizeInBytes) {
+                const { sizeInBytes } = image;
+                const usage = cache.getMaxCacheSize() / 4 / sizeInBytes;
+                if (!stackPrefetch.cacheFill) {
+                    stats.initialTime = Date.now() - stats.start;
+                    stats.initialSize = stats.imageIds.size;
+                    updateToolState(element, usage);
+                    prefetch(element);
+                }
+                else if (stats.imageIds.size) {
+                    stats.fillTime = Date.now() - stats.start;
+                    const { size } = stats.imageIds;
+                    stats.fillSize = size;
+                    console.log('Done cache fill', stats.fillTime, 'ms', size, 'items', 'average total time', roundNumber(stats.fillTime / size), 'ms', 'average load', roundNumber(stats.loadTimeInMS / size), 'ms', 'average decode', roundNumber(stats.decodeTimeInMS / size), 'ms');
+                }
+            }
+        }
+    }
+    const requestFn = (imageId, options) => imageLoader
+        .loadAndCacheImage(imageId, options)
+        .then(() => doneCallback(imageId));
+    const { useNorm16Texture } = getCoreConfiguration().rendering;
+    indicesToRequestCopy.forEach((imageIdIndex) => {
+        const imageId = stack.imageIds[imageIdIndex];
+        const options = {
+            targetBuffer: {
+                type: useNorm16Texture ? undefined : 'Float32Array',
+            },
+            preScale: {
+                enabled: true,
+            },
+            requestType,
+        };
+        imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), requestType, {
+            imageId,
+        }, priority);
+    });
+}
+function onImageUpdated(e) {
+    clearTimeout(resetPrefetchTimeout);
+    resetPrefetchTimeout = setTimeout(function () {
+        const element = e.target;
+        try {
+            updateToolState(element);
+            prefetch(element);
+        }
+        catch (error) {
+            return;
+        }
+    }, resetPrefetchDelay);
+}
+const signum = (x) => (x < 0 ? -1 : 1);
+const updateToolState = (element, usage) => {
+    const stack = getStackData(element);
+    if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
+        console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
+        return;
+    }
+    const { currentImageIdIndex } = stack;
+    let { maxAfter = 2, minBefore = 2 } = configuration;
+    const { directionExtraImages = 10 } = configuration;
+    const stackPrefetchData = getToolState(element) || {
+        indicesToRequest: [],
+        currentImageIdIndex,
+        stackCount: 0,
+        enabled: true,
+        direction: 1,
+        stats: {
+            start: Date.now(),
+            imageIds: new Map(),
+            decodeTimeInMS: 0,
+            loadTimeInMS: 0,
+            totalBytes: 0,
+        },
+    };
+    const delta = currentImageIdIndex - stackPrefetchData.currentImageIdIndex;
+    stackPrefetchData.direction = signum(delta);
+    stackPrefetchData.currentImageIdIndex = currentImageIdIndex;
+    stackPrefetchData.enabled = true;
+    if (stackPrefetchData.stackCount < 100) {
+        stackPrefetchData.stackCount += directionExtraImages;
+    }
+    if (Math.abs(delta) > maxAfter || !delta) {
+        stackPrefetchData.stackCount = 0;
+        if (usage) {
+            const positionFraction = currentImageIdIndex / stack.imageIds.length;
+            minBefore = Math.ceil(usage * positionFraction);
+            maxAfter = Math.ceil(usage * (1 - positionFraction));
+            stackPrefetchData.cacheFill = true;
+        }
+        else {
+            stackPrefetchData.cacheFill = false;
+        }
+    }
+    else if (delta < 0) {
+        minBefore += stackPrefetchData.stackCount;
+        maxAfter = 0;
+    }
+    else {
+        maxAfter += stackPrefetchData.stackCount;
+        minBefore = 0;
+    }
+    const minIndex = Math.max(0, currentImageIdIndex - minBefore);
+    const maxIndex = Math.min(stack.imageIds.length - 1, currentImageIdIndex + maxAfter);
+    const indicesToRequest = [];
+    for (let i = currentImageIdIndex + 1; i <= maxIndex; i++) {
+        indicesToRequest.push(i);
+    }
+    for (let i = currentImageIdIndex - 1; i >= minIndex; i--) {
+        indicesToRequest.push(i);
+    }
+    stackPrefetchData.indicesToRequest = indicesToRequest;
+    addToolState(element, stackPrefetchData);
+};
+function disable(element) {
+    clearTimeout(resetPrefetchTimeout);
+    element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
+    const promiseRemovedHandler = getPromiseRemovedHandler(element);
+    eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
+    const stackPrefetchData = getToolState(element);
+    if (stackPrefetchData && stackPrefetchData.data.length) {
+        stackPrefetchData.enabled = false;
+    }
+}
+function getConfiguration() {
+    return configuration;
+}
+function setConfiguration(config) {
+    configuration = config;
+}
+const stackContextPrefetch = {
+    enable,
+    disable,
+    getConfiguration,
+    setConfiguration,
+};
+export default stackContextPrefetch;
+//# sourceMappingURL=stackContextPrefetch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stackContextPrefetch.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/stackContextPrefetch.ts"],"names":[],"mappings":"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"}

package/dist/esm/utilities/stackPrefetch/stackPrefetch.d.ts

@@ -5,4 +5,10 @@ declare function getConfiguration(): {
     preserveExistingPool: boolean;
 };
 declare function setConfiguration(config: any): void;
-export { enable, disable, getConfiguration, setConfiguration };
+declare const stackPrefetch: {
+    enable: typeof enable;
+    disable: typeof disable;
+    getConfiguration: typeof getConfiguration;
+    setConfiguration: typeof setConfiguration;
+};
+export default stackPrefetch;

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

@@ -1,54 +1,12 @@
-import { getEnabledElement, StackViewport, imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, getConfiguration as getCoreConfiguration, } from '@cornerstonejs/core';
+import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, getConfiguration as getCoreConfiguration, } from '@cornerstonejs/core';
 import { addToolState, getToolState } from './state';
-const requestType = Enums.RequestType.Prefetch;
-const priority = 0;
-const addToBeginning = true;
+import { getStackData, requestType, priority, getPromiseRemovedHandler, nearestIndex, range, } from './stackPrefetchUtils';
 let configuration = {
     maxImagesToPrefetch: Infinity,
-    preserveExistingPool: false,
+    preserveExistingPool: true,
 };
 let resetPrefetchTimeout;
 const resetPrefetchDelay = 10;
-function range(lowEnd, highEnd) {
-    lowEnd = Math.round(lowEnd) || 0;
-    highEnd = Math.round(highEnd) || 0;
-    const arr = [];
-    let c = highEnd - lowEnd + 1;
-    if (c <= 0) {
-        return arr;
-    }
-    while (c--) {
-        arr[c] = highEnd--;
-    }
-    return arr;
-}
-function nearestIndex(arr, x) {
-    let low = 0;
-    let high = arr.length - 1;
-    arr.forEach((v, idx) => {
-        if (v < x) {
-            low = Math.max(idx, low);
-        }
-        else if (v > x) {
-            high = Math.min(idx, high);
-        }
-    });
-    return { low, high };
-}
-function getStackData(element) {
-    const enabledElement = getEnabledElement(element);
-    if (!enabledElement) {
-        throw new Error('stackPrefetch: element must be a valid Cornerstone enabled element');
-    }
-    const { viewport } = enabledElement;
-    if (!(viewport instanceof StackViewport)) {
-        throw new Error('stackPrefetch: element must be a StackViewport, VolumeViewport stackPrefetch not yet implemented');
-    }
-    return {
-        currentImageIdIndex: viewport.getCurrentImageIdIndex(),
-        imageIds: viewport.getImageIds(),
-    };
-}
 function prefetch(element) {
     const stackPrefetchData = getToolState(element);
     if (!stackPrefetchData) {
@@ -56,14 +14,12 @@ function prefetch(element) {
     }
     const stackPrefetch = stackPrefetchData || {};
     const stack = getStackData(element);
-    if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
+    if (!stack?.imageIds?.length) {
         console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
         return;
     }
-    if (!stackPrefetch.indicesToRequest ||
-        !stackPrefetch.indicesToRequest.length) {
-        stackPrefetch.enabled = false;
-    }
+    const { currentImageIdIndex } = stack;
+    stackPrefetch.enabled &&= stackPrefetch.indicesToRequest?.length;
     if (stackPrefetch.enabled === false) {
         return;
     }
@@ -80,8 +36,11 @@ function prefetch(element) {
         if (!imageId) {
             return;
         }
-        const imageLoadObject = cache.getImageLoadObject(imageId);
-        if (imageLoadObject) {
+        const distance = Math.abs(currentImageIdIndex - imageIdIndex);
+        const imageCached = distance < 6
+            ? cache.getImageLoadObject(imageId)
+            : cache.isLoaded(imageId);
+        if (imageCached) {
             removeFromList(imageIdIndex);
         }
     });
@@ -143,33 +102,6 @@ function prefetch(element) {
         }, priority);
     });
 }
-function getPromiseRemovedHandler(element) {
-    return function (e) {
-        const eventData = e.detail;
-        let stackData;
-        try {
-            stackData = getStackData(element);
-        }
-        catch (error) {
-            return;
-        }
-        if (!stackData || !stackData.imageIds || stackData.imageIds.length === 0) {
-            return;
-        }
-        const stack = stackData;
-        const imageIdIndex = stack.imageIds.indexOf(eventData.imageId);
-        if (imageIdIndex < 0) {
-            return;
-        }
-        const stackPrefetchData = getToolState(element);
-        if (!stackPrefetchData ||
-            !stackPrefetchData.data ||
-            !stackPrefetchData.data.length) {
-            return;
-        }
-        stackPrefetchData.indicesToRequest.push(imageIdIndex);
-    };
-}
 function onImageUpdated(e) {
     clearTimeout(resetPrefetchTimeout);
     resetPrefetchTimeout = setTimeout(function () {
@@ -209,7 +141,7 @@ function disable(element) {
     const promiseRemovedHandler = getPromiseRemovedHandler(element);
     eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
     const stackPrefetchData = getToolState(element);
-    if (stackPrefetchData && stackPrefetchData.data.length) {
+    if (stackPrefetchData && stackPrefetchData.indicesToRequest.length) {
         stackPrefetchData.enabled = false;
         imageLoadPoolManager.clearRequestStack(requestType);
     }
@@ -220,5 +152,6 @@ function getConfiguration() {
 function setConfiguration(config) {
     configuration = config;
 }
-export { enable, disable, getConfiguration, setConfiguration };
+const stackPrefetch = { enable, disable, getConfiguration, setConfiguration };
+export default stackPrefetch;
 //# sourceMappingURL=stackPrefetch.js.map