@ohif/app 3.12.0-beta.86 → 3.12.0-beta.87

package/dist/{3613.bundle.0231451edf6a513eb34a.js → 3613.bundle.6157004e0592003c0800.js}

@@ -34469,7 +34469,7 @@ function uuidv4() {
 
 "use strict";
 /* unused harmony export version */
-const version = '4.9.1';
+const version = '4.11.2';
 
 
 /***/ }),
@@ -35368,7 +35368,7 @@ function drawLine(svgDrawingHelper, annotationUID, lineUID, start, end, options
     if (isNaN(start[0]) || isNaN(start[1]) || isNaN(end[0]) || isNaN(end[1])) {
         return;
     }
-    const { color = 'rgb(0, 255, 0)', width = 10, lineWidth, lineDash, markerStartId = null, markerEndId = null, shadow = false, strokeOpacity = 1, } = options;
+    const { color = 'rgb(0, 255, 0)', width = 10, lineWidth, lineDash, markerStartId = null, markerEndId = null, shadow = false, strokeOpacity = 1, textBoxLinkLineColor, } = options;
     const strokeWidth = lineWidth || width;
     const svgns = 'http://www.w3.org/2000/svg';
     const svgNodeHash = (0,_getHash__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(annotationUID, 'line', lineUID);
@@ -35380,7 +35380,7 @@ function drawLine(svgDrawingHelper, annotationUID, lineUID, start, end, options
         y1: `${start[1]}`,
         x2: `${end[0]}`,
         y2: `${end[1]}`,
-        stroke: color,
+        stroke: textBoxLinkLineColor || color,
         style: dropShadowStyle,
         'stroke-width': strokeWidth,
         'stroke-dasharray': lineDash,
@@ -35612,9 +35612,14 @@ function drawTextBox(svgDrawingHelper, annotationUID, textUID, textLines, positi
     return textGroupBoundingBox;
 }
 function _drawTextGroup(svgDrawingHelper, annotationUID, textUID, textLines = [''], position, options) {
-    const { padding, color, fontFamily, fontSize, background } = options;
+    const { padding, color, fontFamily, fontSize, background, textBoxBorderRadius, textBoxMargin, } = options;
     let textGroupBoundingBox;
     const [x, y] = [position[0] + padding, position[1] + padding];
+    const backgroundStyles = {
+        color: background,
+        textBoxBorderRadius,
+        textBoxMargin,
+    };
     const svgns = 'http://www.w3.org/2000/svg';
     const svgNodeHash = (0,_getHash__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(annotationUID, 'text', textUID);
     const existingTextGroup = svgDrawingHelper.getSvgNode(svgNodeHash);
@@ -35646,7 +35651,7 @@ function _drawTextGroup(svgDrawingHelper, annotationUID, textUID, textLines = ['
         (0,_setAttributesIfNecessary__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(textAttributes, textElement);
         (0,_setAttributesIfNecessary__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(textGroupAttributes, existingTextGroup);
         existingTextGroup.setAttribute('data-annotation-uid', annotationUID);
-        textGroupBoundingBox = _drawTextBackground(existingTextGroup, background);
+        textGroupBoundingBox = _drawTextBackground(existingTextGroup, backgroundStyles);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
@@ -35694,8 +35699,10 @@ function _createTextSpan(text) {
     textSpanElement.textContent = text;
     return textSpanElement;
 }
-function _drawTextBackground(group, color) {
+function _drawTextBackground(group, backgroundStyles) {
+    const { color, textBoxBorderRadius = 0, textBoxMargin = 0, } = backgroundStyles;
     let element = group.querySelector('rect.background');
+    const textElement = group.querySelector('text').getBBox();
     if (!color) {
         if (element) {
             group.removeChild(element);
@@ -35711,10 +35718,19 @@ function _drawTextBackground(group, color) {
     const attributes = {
         x: `${bBox.x}`,
         y: `${bBox.y}`,
-        width: `${bBox.width}`,
-        height: `${bBox.height}`,
+        width: `${textElement.width + Number(textBoxMargin) * 2}`,
+        height: `${textElement.height + Number(textBoxMargin) * 2}`,
         fill: color,
+        rx: textBoxBorderRadius,
+        ry: textBoxBorderRadius,
     };
+    if (textBoxMargin) {
+        const tSpans = Array.from(group.querySelector('text').querySelectorAll('tspan'));
+        tSpans.forEach((tspan, i) => {
+            i === 0 && tspan.setAttribute('y', textBoxMargin);
+            tspan.setAttribute('x', textBoxMargin);
+        });
+    }
     (0,_setAttributesIfNecessary__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(attributes, element);
     return bBox;
 }
@@ -38936,7 +38952,7 @@ async function render(viewport, contourRepresentation) {
         (0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)()?.canComputeRequestedRepresentation(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour) &&
         !polySegConversionInProgressForViewportId.get(viewport.id)) {
         polySegConversionInProgressForViewportId.set(viewport.id, true);
-        contourData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_6__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour, () => polySeg.computeContourData(segmentationId, { viewport }), () => undefined);
+        contourData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_6__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour, () => polySeg.computeContourData(segmentationId, { viewport }));
         polySegConversionInProgressForViewportId.set(viewport.id, false);
     }
     else if (!contourData && !(0,_config__WEBPACK_IMPORTED_MODULE_5__/* .getPolySeg */ .Qy)()) {
@@ -39043,7 +39059,11 @@ function _checkContourNormalsMatchViewport(annotationUIDsMap, viewportNormal) {
     }
     return true;
 }
+function getUpdateFunction(viewport) {
+    return null;
+}
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
+    getUpdateFunction,
     render,
     removeRepresentation,
 });
@@ -39125,7 +39145,7 @@ async function render(viewport, representation) {
         !polySegConversionInProgress) {
         polySegConversionInProgress = true;
         const polySeg = (0,_config__WEBPACK_IMPORTED_MODULE_12__/* .getPolySeg */ .Qy)();
-        labelmapData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_13__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.Labelmap, () => polySeg.computeLabelmapData(segmentationId, { viewport }), () => null, () => {
+        labelmapData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_13__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.Labelmap, () => polySeg.computeLabelmapData(segmentationId, { viewport }), () => {
             _stateManagement_segmentation_SegmentationStateManager__WEBPACK_IMPORTED_MODULE_15__/* .defaultSegmentationStateManager */ ._6.processLabelmapRepresentationAddition(viewport.id, segmentationId);
             setTimeout(() => {
                 (0,_stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_14__.triggerSegmentationDataModified)(segmentationId);
@@ -39342,7 +39362,11 @@ async function _addLabelmapToViewport(viewport, labelmapData, segmentationId, co
     const result = await (0,_addLabelmapToElement__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(viewport.element, labelmapData, segmentationId, config);
     return result || undefined;
 }
+function getUpdateFunction(viewport) {
+    return;
+}
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
+    getUpdateFunction,
     render,
     removeRepresentation,
 });
@@ -39358,7 +39382,7 @@ async function _addLabelmapToViewport(viewport, labelmapData, segmentationId, co
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   Ay: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* unused harmony exports render, removeRepresentation */
+/* unused harmony exports getUpdateFunction, render, removeRepresentation */
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 /* harmony import */ var _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18682);
 /* harmony import */ var _removeSurfaceFromElement__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20552);
@@ -39399,7 +39423,7 @@ async function render(viewport, representation) {
     if (!SurfaceData &&
         (0,_config__WEBPACK_IMPORTED_MODULE_6__/* .getPolySeg */ .Qy)()?.canComputeRequestedRepresentation(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Surface)) {
         const polySeg = (0,_config__WEBPACK_IMPORTED_MODULE_6__/* .getPolySeg */ .Qy)();
-        SurfaceData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_7__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Surface, () => polySeg.computeSurfaceData(segmentationId, { viewport }), () => polySeg.updateSurfaceData(segmentationId, { viewport }));
+        SurfaceData = await (0,_utilities_segmentation_computeAndAddRepresentation__WEBPACK_IMPORTED_MODULE_7__/* .computeAndAddRepresentation */ .d)(segmentationId, _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Surface, () => polySeg.computeSurfaceData(segmentationId, { viewport }));
         if (!SurfaceData) {
             throw new Error(`No Surface data found for segmentationId ${segmentationId} even we tried to compute it`);
         }
@@ -39439,7 +39463,12 @@ async function render(viewport, representation) {
     });
     viewport.render();
 }
+function getUpdateFunction(viewport) {
+    const polySeg = (0,_config__WEBPACK_IMPORTED_MODULE_6__/* .getPolySeg */ .Qy)();
+    return (segmentationId) => polySeg.updateSurfaceData(segmentationId, { viewport });
+}
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
+    getUpdateFunction,
     render,
     removeRepresentation,
 });

package/dist/{4019.bundle.210bc6108a0656fc35ec.js → 4019.bundle.1be1cdd0805ad2c59d65.js}

@@ -1906,6 +1906,9 @@ class AnnotationTool extends _AnnotationDisplayTool__WEBPACK_IMPORTED_MODULE_2__
             background: this.getStyle('textBoxBackground', specifications, annotation),
             lineWidth: this.getStyle('textBoxLinkLineWidth', specifications, annotation),
             lineDash: this.getStyle('textBoxLinkLineDash', specifications, annotation),
+            textBoxBorderRadius: this.getStyle('textBoxBorderRadius', specifications, annotation),
+            textBoxMargin: this.getStyle('textBoxMargin', specifications, annotation),
+            textBoxLinkLineColor: this.getStyle('textBoxLinkLineColor', specifications, annotation),
         };
     }
     static isSuvScaled(viewport, targetId, imageId) {
@@ -5571,55 +5574,18 @@ function deleteRelatedAnnotations(viewportData) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   d: () => (/* binding */ computeAndAddRepresentation)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
-/* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99737);
-/* harmony import */ var _stateManagement_segmentation_internalAddRepresentationData__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44188);
-/* harmony import */ var _stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49906);
-/* harmony import */ var _debounce__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(52905);
-
-
-
-
+/* harmony import */ var _stateManagement_segmentation_internalAddRepresentationData__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44188);
 
-const computedRepresentations = new Map();
-async function computeAndAddRepresentation(segmentationId, type, computeFunction, updateFunction, onComputationComplete) {
+async function computeAndAddRepresentation(segmentationId, type, computeFunction, onComputationComplete) {
     const data = await computeFunction();
-    (0,_stateManagement_segmentation_internalAddRepresentationData__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)({
+    (0,_stateManagement_segmentation_internalAddRepresentationData__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)({
         segmentationId,
         type,
         data,
     });
     onComputationComplete?.();
-    if (!computedRepresentations.has(segmentationId)) {
-        computedRepresentations.set(segmentationId, []);
-    }
-    const representations = computedRepresentations.get(segmentationId);
-    if (!representations.includes(type)) {
-        representations.push(type);
-    }
-    subscribeToSegmentationChanges(updateFunction);
-    (0,_stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_3__.triggerSegmentationModified)(segmentationId);
     return data;
 }
-function subscribeToSegmentationChanges(updateFunction) {
-    const debouncedUpdateFunction = (event) => {
-        _debouncedSegmentationModified(event, updateFunction);
-    };
-    updateFunction._debouncedUpdateFunction = debouncedUpdateFunction;
-    _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.eventTarget.removeEventListener(_enums__WEBPACK_IMPORTED_MODULE_1__.Events.SEGMENTATION_DATA_MODIFIED, updateFunction._debouncedUpdateFunction);
-    _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.eventTarget.addEventListener(_enums__WEBPACK_IMPORTED_MODULE_1__.Events.SEGMENTATION_DATA_MODIFIED, updateFunction._debouncedUpdateFunction);
-}
-const _debouncedSegmentationModified = (0,_debounce__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)((event, updateFunction) => {
-    const segmentationId = event.detail.segmentationId;
-    const representations = computedRepresentations.get(segmentationId);
-    if (!representations || !representations.length) {
-        return;
-    }
-    updateFunction(segmentationId);
-    if (representations.length) {
-        (0,_stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_3__.triggerSegmentationModified)(segmentationId);
-    }
-}, 300);
 
 
 
@@ -5653,6 +5619,7 @@ function getSVGStyleForSegment({ segmentationId, segmentIndex, viewportId, autoG
     });
     const activeSegmentation = (0,_stateManagement_segmentation_getActiveSegmentation__WEBPACK_IMPORTED_MODULE_2__/* .getActiveSegmentation */ .T)(viewportId);
     const isActive = activeSegmentation?.segmentationId === segmentationId;
+    const inactiveSegmentationVisibility = _stateManagement_segmentation_SegmentationStyle__WEBPACK_IMPORTED_MODULE_6__/* .segmentationStyle */ .Y.getRenderInactiveSegmentations(viewportId);
     const style = _stateManagement_segmentation_SegmentationStyle__WEBPACK_IMPORTED_MODULE_6__/* .segmentationStyle */ .Y.getStyle({
         viewportId,
         segmentationId,
@@ -5664,6 +5631,8 @@ function getSVGStyleForSegment({ segmentationId, segmentIndex, viewportId, autoG
     let lineDash = undefined;
     let lineOpacity = 1;
     let fillOpacity = 0;
+    let renderFill = mergedConfig.renderFill ?? true;
+    let renderOutline = mergedConfig.renderOutline ?? true;
     if (autoGenerated) {
         lineWidth = mergedConfig.outlineWidthAutoGenerated ?? lineWidth;
         lineDash = mergedConfig.outlineDashAutoGenerated ?? lineDash;
@@ -5681,12 +5650,14 @@ function getSVGStyleForSegment({ segmentationId, segmentIndex, viewportId, autoG
         lineDash = mergedConfig.outlineDashInactive ?? lineDash;
         lineOpacity = mergedConfig.outlineOpacityInactive ?? lineOpacity;
         fillOpacity = mergedConfig.fillAlphaInactive ?? fillOpacity;
+        renderFill = mergedConfig.renderFillInactive ?? renderFill;
+        renderOutline = mergedConfig.renderOutlineInactive ?? renderOutline;
     }
     if ((0,_stateManagement_segmentation_getActiveSegmentIndex__WEBPACK_IMPORTED_MODULE_3__/* .getActiveSegmentIndex */ .Q)(segmentationId) === segmentIndex) {
         lineWidth += mergedConfig.activeSegmentOutlineWidthDelta;
     }
-    lineWidth = mergedConfig.renderOutline ? lineWidth : 0;
-    fillOpacity = mergedConfig.renderFill ? fillOpacity : 0;
+    lineWidth = renderOutline ? lineWidth : 0;
+    fillOpacity = renderFill ? fillOpacity : 0;
     const color = `rgba(${segmentColor[0]}, ${segmentColor[1]}, ${segmentColor[2]}, ${lineOpacity})`;
     const fillColor = `rgb(${segmentColor[0]}, ${segmentColor[1]}, ${segmentColor[2]})`;
     const hiddenSegments = (0,_stateManagement_segmentation_helpers_internalGetHiddenSegmentIndices__WEBPACK_IMPORTED_MODULE_5__/* .internalGetHiddenSegmentIndices */ .s)(viewportId, {
@@ -5703,7 +5674,9 @@ function getSVGStyleForSegment({ segmentationId, segmentIndex, viewportId, autoG
         textbox: {
             color,
         },
-        visibility: segmentationVisible && isVisible,
+        visibility: isActive
+            ? segmentationVisible && isVisible
+            : inactiveSegmentationVisibility,
     };
 }
 

package/dist/{5400.bundle.3ebba479fc068cd8c700.js → 5400.bundle.c3a3fe8867efa2edfa94.js}

@@ -272,21 +272,19 @@ class SegmentationStyle {
             viewportsStyle: {},
         };
     }
-    setStyle(specifier, styles) {
+    setStyle(specifier, styles, merge = true) {
         const { viewportId, segmentationId, type, segmentIndex } = specifier;
         const currentStyles = this.getStyle(specifier);
+        const mergedStyles = merge ? { ...currentStyles, ...styles } : styles;
         let updatedStyles;
         if (!viewportId && !segmentationId) {
-            updatedStyles = {
-                ...currentStyles,
-                ...styles,
-            };
+            updatedStyles = mergedStyles;
+        }
+        else if (merge) {
+            updatedStyles = this.copyActiveToInactiveIfNotProvided(mergedStyles, type);
         }
         else {
-            updatedStyles = this.copyActiveToInactiveIfNotProvided({
-                ...currentStyles,
-                ...styles,
-            }, type);
+            updatedStyles = mergedStyles;
         }
         if (!type) {
             throw new Error('Type is required to set a style');

package/dist/{5858.bundle.99a6b9de04c621694ffd.js → 5858.bundle.d5f4bf849aaeebf5025c.js}

@@ -3686,7 +3686,7 @@ else {}
 
 "use strict";
 
-// UNUSED EXPORTS: decodeImageFrame
+// UNUSED EXPORTS: decodeImageFrame, postProcessDecodedPixels
 
 ;// ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/shared/scaling/bilinear.js
 function bilinear(src, dest) {