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

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: 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 = (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.data ||
-            !stackPrefetchData.data.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.data.length) {
+    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/drawCircle.js

@@ -1,13 +1,15 @@
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 function drawCircle(svgDrawingHelper, annotationUID, circleUID, center, radius, options = {}, dataId = '') {
-    const { color, fill, width, lineWidth, lineDash } = Object.assign({
+    const { color, fill, width, lineWidth, lineDash, fillOpacity, strokeOpacity, } = Object.assign({
         color: 'dodgerblue',
         fill: 'transparent',
         width: '2',
         lineDash: undefined,
         lineWidth: undefined,
+        strokeOpacity: 1,
+        fillOpacity: 1,
     }, options);
     const strokeWidth = lineWidth || width;
     const svgns = 'http://www.w3.org/2000/svg';
@@ -21,9 +23,11 @@ function drawCircle(svgDrawingHelper, annotationUID, circleUID, center, radius,
         fill,
         'stroke-width': strokeWidth,
         'stroke-dasharray': lineDash,
+        'fill-opacity': fillOpacity,
+        'stroke-opacity': strokeOpacity,
     };
     if (existingCircleElement) {
-        _setAttributesIfNecessary(attributes, existingCircleElement);
+        setAttributesIfNecessary(attributes, existingCircleElement);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
@@ -31,7 +35,7 @@ function drawCircle(svgDrawingHelper, annotationUID, circleUID, center, radius,
         if (dataId !== '') {
             newCircleElement.setAttribute('data-id', dataId);
         }
-        _setNewAttributesIfValid(attributes, newCircleElement);
+        setNewAttributesIfValid(attributes, newCircleElement);
         svgDrawingHelper.appendNode(newCircleElement, svgNodeHash);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"drawCircle.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawCircle.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,SAAS,UAAU,CACjB,gBAAkC,EAClC,aAAqB,EACrB,SAAiB,EACjB,MAAoB,EACpB,MAAc,EACd,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CAC/D;QACE,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;KACrB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAGvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjE,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,CAAC,EAAE,GAAG,MAAM,EAAE;QACd,MAAM,EAAE,KAAK;QACb,IAAI;QACJ,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,qBAAqB,EAAE;QACzB,yBAAyB,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAE7D,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEnE,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAClD;QAED,wBAAwB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEvD,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;KAC5D;AACH,CAAC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"drawCircle.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawCircle.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE,SAAS,UAAU,CACjB,gBAAkC,EAClC,aAAqB,EACrB,SAAiB,EACjB,MAAoB,EACpB,MAAc,EACd,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,aAAa,GACd,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;KACf,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAGvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjE,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,CAAC,EAAE,GAAG,MAAM,EAAE;QACd,MAAM,EAAE,KAAK;QACb,IAAI;QACJ,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;QAC5B,cAAc,EAAE,WAAW;QAC3B,gBAAgB,EAAE,aAAa;KAChC,CAAC;IAEF,IAAI,qBAAqB,EAAE;QACzB,wBAAwB,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAE5D,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEnE,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAClD;QAED,uBAAuB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEtD,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;KAC5D;AACH,CAAC;AAED,eAAe,UAAU,CAAC"}

package/dist/esm/drawingSvg/drawEllipse.js

@@ -1,6 +1,6 @@
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 function drawEllipse(svgDrawingHelper, annotationUID, ellipseUID, corner1, corner2, options = {}, dataId = '') {
     const { color, width, lineWidth, lineDash } = Object.assign({
         color: 'dodgerblue',
@@ -30,7 +30,7 @@ function drawEllipse(svgDrawingHelper, annotationUID, ellipseUID, corner1, corne
         'stroke-dasharray': lineDash,
     };
     if (existingEllipse) {
-        _setAttributesIfNecessary(attributes, existingEllipse);
+        setAttributesIfNecessary(attributes, existingEllipse);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
@@ -38,7 +38,7 @@ function drawEllipse(svgDrawingHelper, annotationUID, ellipseUID, corner1, corne
         if (dataId !== '') {
             svgEllipseElement.setAttribute('data-id', dataId);
         }
-        _setNewAttributesIfValid(attributes, svgEllipseElement);
+        setNewAttributesIfValid(attributes, svgEllipseElement);
         svgDrawingHelper.appendNode(svgEllipseElement, svgNodeHash);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"drawEllipse.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawEllipse.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,SAAS,WAAW,CAClB,gBAAkC,EAClC,aAAqB,EACrB,UAAkB,EAClB,OAAqB,EACrB,OAAqB,EACrB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEjE,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACtB,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtB,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,OAAO,EAAE;QAChB,EAAE,EAAE,GAAG,OAAO,EAAE;QAChB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,aAAa;QACnB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,eAAe,EAAE;QACnB,yBAAyB,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAEvD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,iBAAiB,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACnD;QAED,wBAAwB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAExD,gBAAgB,CAAC,UAAU,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;KAC7D;AACH,CAAC;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"drawEllipse.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawEllipse.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE,SAAS,WAAW,CAClB,gBAAkC,EAClC,aAAqB,EACrB,UAAkB,EAClB,OAAqB,EACrB,OAAqB,EACrB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEjE,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACtB,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtB,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,OAAO,EAAE;QAChB,EAAE,EAAE,GAAG,OAAO,EAAE;QAChB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,aAAa;QACnB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,eAAe,EAAE;QACnB,wBAAwB,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAEtD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,iBAAiB,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACnD;QAED,uBAAuB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAEvD,gBAAgB,CAAC,UAAU,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;KAC7D;AACH,CAAC;AAED,eAAe,WAAW,CAAC"}

package/dist/esm/drawingSvg/drawHandles.js

@@ -1,6 +1,6 @@
 import _getHash from './_getHash';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 function drawHandles(svgDrawingHelper, annotationUID, handleGroupUID, handlePoints, options = {}) {
     const { color, handleRadius, width, lineWidth, fill, type, opacity } = Object.assign({
         color: 'dodgerblue',
@@ -50,12 +50,12 @@ function drawHandles(svgDrawingHelper, annotationUID, handleGroupUID, handlePoin
         }
         const existingHandleElement = svgDrawingHelper.getSvgNode(svgNodeHash);
         if (existingHandleElement) {
-            _setAttributesIfNecessary(attributes, existingHandleElement);
+            setAttributesIfNecessary(attributes, existingHandleElement);
             svgDrawingHelper.setNodeTouched(svgNodeHash);
         }
         else {
             const newHandleElement = document.createElementNS(svgns, type);
-            _setNewAttributesIfValid(attributes, newHandleElement);
+            setNewAttributesIfValid(attributes, newHandleElement);
             svgDrawingHelper.appendNode(newHandleElement, svgNodeHash);
         }
     }

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

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

package/dist/esm/drawingSvg/drawLine.js

@@ -1,6 +1,6 @@
 import _getHash from './_getHash';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 export default function drawLine(svgDrawingHelper, annotationUID, lineUID, start, end, options = {}, dataId = '') {
     if (isNaN(start[0]) || isNaN(start[1]) || isNaN(end[0]) || isNaN(end[1])) {
         return;
@@ -30,7 +30,7 @@ export default function drawLine(svgDrawingHelper, annotationUID, lineUID, start
         'stroke-dasharray': lineDash,
     };
     if (existingLine) {
-        _setAttributesIfNecessary(attributes, existingLine);
+        setAttributesIfNecessary(attributes, existingLine);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
@@ -38,7 +38,7 @@ export default function drawLine(svgDrawingHelper, annotationUID, lineUID, start
         if (dataId !== '') {
             newLine.setAttribute('data-id', dataId);
         }
-        _setNewAttributesIfValid(attributes, newLine);
+        setNewAttributesIfValid(attributes, newLine);
         svgDrawingHelper.appendNode(newLine, svgNodeHash);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"drawLine.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawLine.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAGpE,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAGX,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CACjE;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,SAAS;KAClB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,MAAM;QAC5B,CAAC,CAAC,sBAAsB,gBAAgB,CAAC,eAAe,CAAC,EAAE,IAAI;QAC/D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QACjB,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QACjB,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACf,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACf,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,eAAe;QACtB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAEhB,yBAAyB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEpD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAExD,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACzC;QAED,wBAAwB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE9C,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KACnD;AACH,CAAC"}
+{"version":3,"file":"drawLine.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawLine.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAGlE,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAGX,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CACjE;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,SAAS;KAClB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,MAAM;QAC5B,CAAC,CAAC,sBAAsB,gBAAgB,CAAC,eAAe,CAAC,EAAE,IAAI;QAC/D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QACjB,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QACjB,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACf,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACf,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,eAAe;QACtB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAEhB,wBAAwB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAExD,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACzC;QAED,uBAAuB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE7C,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KACnD;AACH,CAAC"}

package/dist/esm/drawingSvg/drawPolyline.js

@@ -1,6 +1,6 @@
 import _getHash from './_getHash';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 export default function drawPolyline(svgDrawingHelper, annotationUID, polylineUID, points, options) {
     if (points.length < 2) {
         return;
@@ -32,12 +32,12 @@ export default function drawPolyline(svgDrawingHelper, annotationUID, polylineUI
         'stroke-dasharray': lineDash,
     };
     if (existingPolyLine) {
-        _setAttributesIfNecessary(attributes, existingPolyLine);
+        setAttributesIfNecessary(attributes, existingPolyLine);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
         const newPolyLine = document.createElementNS(svgns, 'polyline');
-        _setNewAttributesIfValid(attributes, newPolyLine);
+        setNewAttributesIfValid(attributes, newPolyLine);
         svgDrawingHelper.appendNode(newPolyLine, svgNodeHash);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AASpE,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,gBAAkC,EAClC,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAMC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,KAAK;KAC1B,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,eAAe,GAAG,EAAE,CAAC;IAEzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,eAAe,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;KAChD;IAED,IAAI,OAAO,CAAC,kBAAkB,EAAE;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAE7B,eAAe,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD;IAED,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,MAAM;QACZ,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,gBAAgB,EAAE;QAEpB,yBAAyB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAExD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAEhE,wBAAwB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAElD,gBAAgB,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KACvD;AACH,CAAC"}
+{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AASlE,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,gBAAkC,EAClC,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAMC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,KAAK;KAC1B,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,eAAe,GAAG,EAAE,CAAC;IAEzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,eAAe,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;KAChD;IAED,IAAI,OAAO,CAAC,kBAAkB,EAAE;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAE7B,eAAe,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD;IAED,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,MAAM;QACZ,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,gBAAgB,EAAE;QAEpB,wBAAwB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEvD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAEhE,uBAAuB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAEjD,gBAAgB,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KACvD;AACH,CAAC"}

package/dist/esm/drawingSvg/drawRect.js

@@ -1,6 +1,6 @@
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 export default function drawRect(svgDrawingHelper, annotationUID, rectangleUID, start, end, options = {}, dataId = '') {
     const { color, width: _width, lineWidth, lineDash, } = Object.assign({
         color: 'dodgerblue',
@@ -26,7 +26,7 @@ export default function drawRect(svgDrawingHelper, annotationUID, rectangleUID,
         'stroke-dasharray': lineDash,
     };
     if (existingRect) {
-        _setAttributesIfNecessary(attributes, existingRect);
+        setAttributesIfNecessary(attributes, existingRect);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
@@ -34,7 +34,7 @@ export default function drawRect(svgDrawingHelper, annotationUID, rectangleUID,
         if (dataId !== '') {
             svgRectElement.setAttribute('data-id', dataId);
         }
-        _setNewAttributesIfValid(attributes, svgRectElement);
+        setNewAttributesIfValid(attributes, svgRectElement);
         svgDrawingHelper.appendNode(svgRectElement, svgNodeHash);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"drawRect.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawRect.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAIlE,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,YAAoB,EACpB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,KAAK,EAAE,MAAM,EACb,SAAS,EACT,QAAQ,GACT,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,MAAM,CAAC;IAExC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,KAAK,EAAE,GAAG,KAAK,EAAE;QACjB,MAAM,EAAE,GAAG,MAAM,EAAE;QACnB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,aAAa;QACnB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAChB,yBAAyB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEpD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE/D,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAChD;QAED,wBAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAErD,gBAAgB,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KAC1D;AACH,CAAC"}
+{"version":3,"file":"drawRect.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawRect.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAIhE,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,YAAoB,EACpB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,KAAK,EAAE,MAAM,EACb,SAAS,EACT,QAAQ,GACT,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,MAAM,CAAC;IAExC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,KAAK,EAAE,GAAG,KAAK,EAAE;QACjB,MAAM,EAAE,GAAG,MAAM,EAAE;QACnB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,aAAa;QACnB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAChB,wBAAwB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE/D,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAChD;QAED,uBAAuB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAEpD,gBAAgB,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KAC1D;AACH,CAAC"}

package/dist/esm/drawingSvg/drawTextBox.js

@@ -1,5 +1,5 @@
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 function drawTextBox(svgDrawingHelper, annotationUID, textUID, textLines, position, options = {}) {
     const mergedOptions = Object.assign({
         fontFamily: 'Helvetica, Arial, sans-serif',
@@ -45,8 +45,8 @@ function _drawTextGroup(svgDrawingHelper, annotationUID, textUID, textLines = ['
         const textGroupAttributes = {
             transform: `translate(${x} ${y})`,
         };
-        _setAttributesIfNecessary(textAttributes, textElement);
-        _setAttributesIfNecessary(textGroupAttributes, existingTextGroup);
+        setAttributesIfNecessary(textAttributes, textElement);
+        setAttributesIfNecessary(textGroupAttributes, existingTextGroup);
         textGroupBoundingBox = _drawTextBackground(existingTextGroup, background);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
@@ -114,7 +114,7 @@ function _drawTextBackground(group, color) {
         height: `${bBox.height}`,
         fill: color,
     };
-    _setAttributesIfNecessary(attributes, element);
+    setAttributesIfNecessary(attributes, element);
     return bBox;
 }
 export default drawTextBox;