@cornerstonejs/tools 2.0.0-beta.2 → 2.0.0-beta.4

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

@@ -0,0 +1,227 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@cornerstonejs/core");
+const state_1 = require("./state");
+const stackPrefetchUtils_1 = require("./stackPrefetchUtils");
+const roundNumber_1 = __importDefault(require("../roundNumber"));
+let configuration = {
+    maxImagesToPrefetch: Infinity,
+    minBefore: 2,
+    maxAfter: 2,
+    directionExtraImages: 10,
+    preserveExistingPool: false,
+};
+let resetPrefetchTimeout;
+const resetPrefetchDelay = 5;
+const enable = (element) => {
+    const stack = (0, stackPrefetchUtils_1.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(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
+    element.addEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
+    const promiseRemovedHandler = (0, stackPrefetchUtils_1.getPromiseRemovedHandler)(element);
+    core_1.eventTarget.removeEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
+    core_1.eventTarget.addEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
+};
+function prefetch(element) {
+    var _a, _b;
+    const stack = (0, stackPrefetchUtils_1.getStackData)(element);
+    if (!((_a = stack === null || stack === void 0 ? void 0 : stack.imageIds) === null || _a === void 0 ? void 0 : _a.length)) {
+        console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
+        return;
+    }
+    const stackPrefetchData = (0, state_1.getToolState)(element);
+    if (!stackPrefetchData) {
+        return;
+    }
+    const stackPrefetch = stackPrefetchData || {};
+    stackPrefetch.enabled && (stackPrefetch.enabled = (_b = stackPrefetch.indicesToRequest) === null || _b === void 0 ? void 0 : _b.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
+            ? core_1.cache.getImageLoadObject(imageId)
+            : core_1.cache.isLoaded(imageId);
+        if (imageCached) {
+            removeFromList(imageIdIndex);
+        }
+    });
+    if (!stackPrefetch.indicesToRequest.length) {
+        return;
+    }
+    if (!configuration.preserveExistingPool) {
+        core_1.imageLoadPoolManager.filterRequests((0, stackPrefetchUtils_1.clearFromImageIds)(stack));
+    }
+    function doneCallback(imageId) {
+        var _a, _b;
+        const imageIdIndex = stack.imageIds.indexOf(imageId);
+        removeFromList(imageIdIndex);
+        const image = core_1.cache.getCachedImageBasedOnImageURI(imageId);
+        const { stats } = stackPrefetch;
+        const decodeTimeInMS = ((_a = image === null || image === void 0 ? void 0 : image.image) === null || _a === void 0 ? void 0 : _a.decodeTimeInMS) || 0;
+        if (decodeTimeInMS) {
+            stats.imageIds.set(imageId, decodeTimeInMS);
+            stats.decodeTimeInMS += decodeTimeInMS;
+            const loadTimeInMS = ((_b = image === null || image === void 0 ? void 0 : image.image) === null || _b === void 0 ? void 0 : _b.loadTimeInMS) || 0;
+            stats.loadTimeInMS += loadTimeInMS;
+        }
+        if (!stackPrefetch.indicesToRequest.length) {
+            if (image === null || image === void 0 ? void 0 : image.sizeInBytes) {
+                const { sizeInBytes } = image;
+                const usage = core_1.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', (0, roundNumber_1.default)(stats.fillTime / size), 'ms', 'average load', (0, roundNumber_1.default)(stats.loadTimeInMS / size), 'ms', 'average decode', (0, roundNumber_1.default)(stats.decodeTimeInMS / size), 'ms');
+                }
+            }
+        }
+    }
+    const requestFn = (imageId, options) => core_1.imageLoader
+        .loadAndCacheImage(imageId, options)
+        .then(() => doneCallback(imageId));
+    const { useNorm16Texture } = (0, core_1.getConfiguration)().rendering;
+    indicesToRequestCopy.forEach((imageIdIndex) => {
+        const imageId = stack.imageIds[imageIdIndex];
+        const options = {
+            targetBuffer: {
+                type: useNorm16Texture ? undefined : 'Float32Array',
+            },
+            preScale: {
+                enabled: true,
+            },
+            requestType: stackPrefetchUtils_1.requestType,
+        };
+        core_1.imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), stackPrefetchUtils_1.requestType, {
+            imageId,
+        }, stackPrefetchUtils_1.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 = (0, stackPrefetchUtils_1.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 = (0, state_1.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;
+    (0, state_1.addToolState)(element, stackPrefetchData);
+};
+function disable(element) {
+    clearTimeout(resetPrefetchTimeout);
+    element.removeEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
+    const promiseRemovedHandler = (0, stackPrefetchUtils_1.getPromiseRemovedHandler)(element);
+    core_1.eventTarget.removeEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
+    const stackPrefetchData = (0, state_1.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,
+};
+exports.default = stackContextPrefetch;
+//# sourceMappingURL=stackContextPrefetch.js.map

package/dist/cjs/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/cjs/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/cjs/utilities/stackPrefetch/stackPrefetch.js

@@ -1,72 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConfiguration = exports.getConfiguration = exports.disable = exports.enable = void 0;
 const core_1 = require("@cornerstonejs/core");
 const state_1 = require("./state");
-const requestType = core_1.Enums.RequestType.Prefetch;
-const priority = 0;
-const addToBeginning = true;
+const stackPrefetchUtils_1 = require("./stackPrefetchUtils");
 let configuration = {
     maxImagesToPrefetch: Infinity,
     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 = (0, core_1.getEnabledElement)(element);
-    if (!enabledElement) {
-        throw new Error('stackPrefetch: element must be a valid Cornerstone enabled element');
-    }
-    const { viewport } = enabledElement;
-    if (!(viewport instanceof core_1.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) {
+    var _a, _b;
     const stackPrefetchData = (0, state_1.getToolState)(element);
     if (!stackPrefetchData) {
         return;
     }
     const stackPrefetch = stackPrefetchData || {};
-    const stack = getStackData(element);
-    if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
+    const stack = (0, stackPrefetchUtils_1.getStackData)(element);
+    if (!((_a = stack === null || stack === void 0 ? void 0 : stack.imageIds) === null || _a === void 0 ? void 0 : _a.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.enabled = (_b = stackPrefetch.indicesToRequest) === null || _b === void 0 ? void 0 : _b.length);
     if (stackPrefetch.enabled === false) {
         return;
     }
@@ -83,8 +39,11 @@ function prefetch(element) {
         if (!imageId) {
             return;
         }
-        const imageLoadObject = core_1.cache.getImageLoadObject(imageId);
-        if (imageLoadObject) {
+        const distance = Math.abs(currentImageIdIndex - imageIdIndex);
+        const imageCached = distance < 6
+            ? core_1.cache.getImageLoadObject(imageId)
+            : core_1.cache.isLoaded(imageId);
+        if (imageCached) {
             removeFromList(imageIdIndex);
         }
     });
@@ -92,9 +51,9 @@ function prefetch(element) {
         return;
     }
     if (!configuration.preserveExistingPool) {
-        core_1.imageLoadPoolManager.clearRequestStack(requestType);
+        core_1.imageLoadPoolManager.clearRequestStack(stackPrefetchUtils_1.requestType);
     }
-    const nearest = nearestIndex(stackPrefetch.indicesToRequest, stack.currentImageIdIndex);
+    const nearest = (0, stackPrefetchUtils_1.nearestIndex)(stackPrefetch.indicesToRequest, stack.currentImageIdIndex);
     let imageId;
     let nextImageIdIndex;
     const preventCache = false;
@@ -139,40 +98,13 @@ function prefetch(element) {
             preScale: {
                 enabled: true,
             },
-            requestType,
+            requestType: stackPrefetchUtils_1.requestType,
         };
-        core_1.imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), requestType, {
+        core_1.imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), stackPrefetchUtils_1.requestType, {
             imageId,
-        }, priority);
+        }, stackPrefetchUtils_1.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 = (0, state_1.getToolState)(element);
-        if (!stackPrefetchData ||
-            !stackPrefetchData.indicesToRequest ||
-            !stackPrefetchData.indicesToRequest.length) {
-            return;
-        }
-        stackPrefetchData.indicesToRequest.push(imageIdIndex);
-    };
-}
 function onImageUpdated(e) {
     clearTimeout(resetPrefetchTimeout);
     resetPrefetchTimeout = setTimeout(function () {
@@ -186,13 +118,13 @@ function onImageUpdated(e) {
     }, resetPrefetchDelay);
 }
 function enable(element) {
-    const stack = getStackData(element);
+    const stack = (0, stackPrefetchUtils_1.getStackData)(element);
     if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
         console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
         return;
     }
     const stackPrefetchData = {
-        indicesToRequest: range(0, stack.imageIds.length - 1),
+        indicesToRequest: (0, stackPrefetchUtils_1.range)(0, stack.imageIds.length - 1),
         enabled: true,
         direction: 1,
     };
@@ -202,29 +134,27 @@ function enable(element) {
     prefetch(element);
     element.removeEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
     element.addEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
-    const promiseRemovedHandler = getPromiseRemovedHandler(element);
+    const promiseRemovedHandler = (0, stackPrefetchUtils_1.getPromiseRemovedHandler)(element);
     core_1.eventTarget.removeEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
     core_1.eventTarget.addEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
 }
-exports.enable = enable;
 function disable(element) {
     clearTimeout(resetPrefetchTimeout);
     element.removeEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
-    const promiseRemovedHandler = getPromiseRemovedHandler(element);
+    const promiseRemovedHandler = (0, stackPrefetchUtils_1.getPromiseRemovedHandler)(element);
     core_1.eventTarget.removeEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
     const stackPrefetchData = (0, state_1.getToolState)(element);
     if (stackPrefetchData && stackPrefetchData.indicesToRequest.length) {
         stackPrefetchData.enabled = false;
-        core_1.imageLoadPoolManager.clearRequestStack(requestType);
+        core_1.imageLoadPoolManager.clearRequestStack(stackPrefetchUtils_1.requestType);
     }
 }
-exports.disable = disable;
 function getConfiguration() {
     return configuration;
 }
-exports.getConfiguration = getConfiguration;
 function setConfiguration(config) {
     configuration = config;
 }
-exports.setConfiguration = setConfiguration;
+const stackPrefetch = { enable, disable, getConfiguration, setConfiguration };
+exports.default = stackPrefetch;
 //# sourceMappingURL=stackPrefetch.js.map

package/dist/cjs/utilities/stackPrefetch/stackPrefetch.js.map

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

package/dist/cjs/utilities/stackPrefetch/stackPrefetchUtils.d.ts

@@ -0,0 +1,14 @@
+import { Enums } from '@cornerstonejs/core';
+export declare const requestType = Enums.RequestType.Prefetch;
+export declare const priority = 0;
+export declare function range(lowEnd: any, highEnd: any): any[];
+export declare function nearestIndex(arr: any, x: any): {
+    low: number;
+    high: number;
+};
+export declare function getStackData(element: any): {
+    currentImageIdIndex: number;
+    imageIds: string[];
+};
+export declare function getPromiseRemovedHandler(element: any): (e: any) => void;
+export declare const clearFromImageIds: (stack: any) => (requestDetails: any) => boolean;

package/dist/cjs/utilities/stackPrefetch/stackPrefetchUtils.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearFromImageIds = exports.getPromiseRemovedHandler = exports.getStackData = exports.nearestIndex = exports.range = exports.priority = exports.requestType = void 0;
+const core_1 = require("@cornerstonejs/core");
+const state_1 = require("./state");
+exports.requestType = core_1.Enums.RequestType.Prefetch;
+exports.priority = 0;
+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;
+}
+exports.range = range;
+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 };
+}
+exports.nearestIndex = nearestIndex;
+function getStackData(element) {
+    const enabledElement = (0, core_1.getEnabledElement)(element);
+    if (!enabledElement) {
+        return null;
+    }
+    const { viewport } = enabledElement;
+    if (!(viewport instanceof core_1.StackViewport)) {
+        throw new Error('stackPrefetch: element must be a StackViewport, VolumeViewport stackPrefetch not yet implemented');
+    }
+    return {
+        currentImageIdIndex: viewport.getCurrentImageIdIndex(),
+        imageIds: viewport.getImageIds(),
+    };
+}
+exports.getStackData = getStackData;
+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 = (0, state_1.getToolState)(element);
+        if (!stackPrefetchData ||
+            !stackPrefetchData.data ||
+            !stackPrefetchData.data.length) {
+            return;
+        }
+        stackPrefetchData.indicesToRequest.push(imageIdIndex);
+    };
+}
+exports.getPromiseRemovedHandler = getPromiseRemovedHandler;
+const clearFromImageIds = (stack) => {
+    const imageIdSet = new Set(stack.imageIds);
+    return (requestDetails) => requestDetails.type !== exports.requestType ||
+        !imageIdSet.has(requestDetails.additionalDetails.imageId);
+};
+exports.clearFromImageIds = clearFromImageIds;
+//# sourceMappingURL=stackPrefetchUtils.js.map

package/dist/cjs/utilities/stackPrefetch/stackPrefetchUtils.js.map

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

package/dist/esm/drawingSvg/getSvgDrawingHelper.js

@@ -21,7 +21,7 @@ function getSvgDrawingHelper(element) {
 function _getSvgLayer(element) {
     const viewportElement = `.${VIEWPORT_ELEMENT}`;
     const internalDivElement = element.querySelector(viewportElement);
-    const svgLayer = internalDivElement.querySelector('.svg-layer');
+    const svgLayer = internalDivElement.querySelector(':scope > .svg-layer');
     return svgLayer;
 }
 function getSvgNode(canvasHash, cacheKey) {

package/dist/esm/drawingSvg/getSvgDrawingHelper.js.map

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

package/dist/esm/enums/Events.d.ts

@@ -1,5 +1,6 @@
 declare enum Events {
     TOOL_ACTIVATED = "CORNERSTONE_TOOLS_TOOL_ACTIVATED",
+    TOOL_MODE_CHANGED = "CORNERSTONE_TOOLS_TOOL_MODE_CHANGED",
     ANNOTATION_ADDED = "CORNERSTONE_TOOLS_ANNOTATION_ADDED",
     ANNOTATION_COMPLETED = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED",
     ANNOTATION_MODIFIED = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED",

package/dist/esm/enums/Events.js

@@ -1,6 +1,7 @@
 var Events;
 (function (Events) {
     Events["TOOL_ACTIVATED"] = "CORNERSTONE_TOOLS_TOOL_ACTIVATED";
+    Events["TOOL_MODE_CHANGED"] = "CORNERSTONE_TOOLS_TOOL_MODE_CHANGED";
     Events["ANNOTATION_ADDED"] = "CORNERSTONE_TOOLS_ANNOTATION_ADDED";
     Events["ANNOTATION_COMPLETED"] = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED";
     Events["ANNOTATION_MODIFIED"] = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED";

package/dist/esm/enums/Events.js.map

@@ -1 +1 @@
-{"version":3,"file":"Events.js","sourceRoot":"","sources":["../../../src/enums/Events.ts"],"names":[],"mappings":"AAMA,IAAK,MAsPJ;AAtPD,WAAK,MAAM;IAYT,6DAAmD,CAAA;IAanD,iEAAuD,CAAA;IAQvD,yEAA+D,CAAA;IAQ/D,uEAA6D,CAAA;IAQ7D,qEAA2D,CAAA;IAQ3D,uFAA6E,CAAA;IAQ7E,6EAAmE,CAAA;IAQnE,yFAA+E,CAAA;IAQ/E,uEAA6D,CAAA;IAY7D,2EAAiE,CAAA;IAQjE,2EAAiE,CAAA;IAQjE,yGAA+F,CAAA;IAQ/F,yEAA+D,CAAA;IAQ/D,uGAA6F,CAAA;IAQ7F,qFAA2E,CAAA;IAY3E,iDAAuC,CAAA;IAQvC,6CAAmC,CAAA;IAYnC,qDAA2C,CAAA;IAQ3C,iDAAuC,CAAA;IASvC,uEAA6D,CAAA;IAQ7D,qDAA2C,CAAA;IAU3C,qDAA2C,CAAA;IAQ3C,uDAA6C,CAAA;IAQ7C,qEAA2D,CAAA;IAQ3D,uDAA6C,CAAA;IAe7C,uDAA6C,CAAA;IAC7C,yEAA+D,CAAA;IAC/D,uDAA6C,CAAA;IAC7C,qDAA2C,CAAA;IAC3C,mDAAyC,CAAA;IACzC,6CAAmC,CAAA;IACnC,iDAAuC,CAAA;AACzC,CAAC,EAtPI,MAAM,KAAN,MAAM,QAsPV;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Events.js","sourceRoot":"","sources":["../../../src/enums/Events.ts"],"names":[],"mappings":"AAMA,IAAK,MA+PJ;AA/PD,WAAK,MAAM;IAYT,6DAAmD,CAAA;IASnD,mEAAyD,CAAA;IAazD,iEAAuD,CAAA;IAQvD,yEAA+D,CAAA;IAQ/D,uEAA6D,CAAA;IAQ7D,qEAA2D,CAAA;IAQ3D,uFAA6E,CAAA;IAQ7E,6EAAmE,CAAA;IAQnE,yFAA+E,CAAA;IAQ/E,uEAA6D,CAAA;IAY7D,2EAAiE,CAAA;IAQjE,2EAAiE,CAAA;IAQjE,yGAA+F,CAAA;IAQ/F,yEAA+D,CAAA;IAQ/D,uGAA6F,CAAA;IAQ7F,qFAA2E,CAAA;IAY3E,iDAAuC,CAAA;IAQvC,6CAAmC,CAAA;IAYnC,qDAA2C,CAAA;IAQ3C,iDAAuC,CAAA;IASvC,uEAA6D,CAAA;IAQ7D,qDAA2C,CAAA;IAU3C,qDAA2C,CAAA;IAQ3C,uDAA6C,CAAA;IAQ7C,qEAA2D,CAAA;IAQ3D,uDAA6C,CAAA;IAe7C,uDAA6C,CAAA;IAC7C,yEAA+D,CAAA;IAC/D,uDAA6C,CAAA;IAC7C,qDAA2C,CAAA;IAC3C,mDAAyC,CAAA;IACzC,6CAAmC,CAAA;IACnC,iDAAuC,CAAA;AACzC,CAAC,EA/PI,MAAM,KAAN,MAAM,QA+PV;AAED,eAAe,MAAM,CAAC"}