@ohif/app 3.13.0-beta.21 → 3.13.0-beta.23

package/dist/{3081.bundle.69c2ed88c1fc66671e82.js → 3081.bundle.4344a3bedb7e70eb5d78.js}

@@ -1716,8 +1716,8 @@ var src = __webpack_require__(42356);
 var loaders = __webpack_require__(19742);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/RequestType.js
 var RequestType = __webpack_require__(43213);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/index.js + 77 modules
-var dicom_image_loader_dist_esm = __webpack_require__(75524);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/index.js + 79 modules
+var dicom_image_loader_dist_esm = __webpack_require__(68750);
 ;// ../../../extensions/cornerstone/src/initWADOImageLoader.js
 
 

package/dist/{3461.bundle.b1c56af281517014477c.js → 3461.bundle.7127d96c33ad3cd68c11.js}

@@ -10,7 +10,7 @@
 /* harmony export */   sh: () => (/* binding */ SCOORDTypes)
 /* harmony export */ });
 /* unused harmony export RelationshipType */
-/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22031);
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80581);
 
 const {
   CodeScheme: Cornerstone3DCodeScheme
@@ -74,8 +74,8 @@ var src = __webpack_require__(42356);
 var i18n_src = __webpack_require__(89010);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 193 modules
 var cornerstone_src = __webpack_require__(63081);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 71 modules
-var esm = __webpack_require__(22031);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 75 modules
+var esm = __webpack_require__(80581);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
 var dist_esm = __webpack_require__(4667);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules

package/dist/{4287.bundle.571587a1d29d54203175.js → 4287.bundle.c6bd6cf991e2dae32044.js}

@@ -372,7 +372,7 @@ function validateSegmentationInput(segmentationInputArray) {
 /* harmony import */ var _store_state__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85204);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29857);
 /* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7001);
-/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(85895);
+/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(18153);
 /* harmony import */ var _types_ContourAnnotation__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(93126);
 /* harmony import */ var _utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(42797);
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(58640);
@@ -658,7 +658,7 @@ function registerClosedContourEditLoop(toolInstance) {
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(58640);
 /* harmony import */ var _stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(44049);
 /* harmony import */ var _findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(5403);
-/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(85895);
+/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(18153);
 /* harmony import */ var _stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(82056);
 /* harmony import */ var _types_ContourAnnotation__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(93126);
 
@@ -856,10 +856,12 @@ function completeDrawOpenContour(element, options) {
         worldPoints[0],
         worldPoints[worldPoints.length - 1],
     ];
-    if (annotation.data.isOpenUShapeContour === true ||
-        annotation.data.isOpenUShapeContour === 'farthestT') {
-        annotation.data.openUShapeContourVectorToPeak =
-            (0,_findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(canvasPoints, viewport);
+    if (!annotation.data.isOpenUShapeContour &&
+        this.configuration?.openUShapeContour) {
+        annotation.data.isOpenUShapeContour = this.configuration.openUShapeContour;
+    }
+    if (annotation.data.isOpenUShapeContour) {
+        annotation.data.openUShapeContourVectorToPeak = (0,_findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__/* .resolveVectorToPeak */ .aV)(canvasPoints, viewport, annotation.data.isOpenUShapeContour);
     }
     if (!textBox.hasMoved) {
         (0,_stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_8__.triggerContourAnnotationCompleted)(annotation, contourHoleProcessingEnabled);
@@ -964,7 +966,7 @@ function registerDrawLoop(toolInstance) {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3823);
-/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(85895);
+/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18153);
 
 
 const { addCanvasPointsToArray, getFirstLineSegmentIntersectionIndexes } = _utilities_math__WEBPACK_IMPORTED_MODULE_1__.polyline;
@@ -1119,9 +1121,10 @@ function registerEditLoopCommon(toolInstance) {
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (/* binding */ findOpenUShapedContourVectorToPeak),
-/* harmony export */   h: () => (/* binding */ findOpenUShapedContourVectorToPeakOnRender)
+/* harmony export */   J1: () => (/* binding */ resolveVectorToPeakOnRender),
+/* harmony export */   aV: () => (/* binding */ resolveVectorToPeak)
 /* harmony export */ });
+/* unused harmony export default */
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3823);
 
 function findOpenUShapedContourVectorToPeak(canvasPoints, viewport) {
@@ -1157,10 +1160,68 @@ function findOpenUShapedContourVectorToPeak(canvasPoints, viewport) {
     const toFurthestWorld = toFurthest.map(viewport.canvasToWorld);
     return toFurthestWorld;
 }
-function findOpenUShapedContourVectorToPeakOnRender(enabledElement, annotation) {
+function resolveVectorToPeak(canvasPoints, viewport, variant) {
+    if (variant === 'orthogonalT') {
+        return findOpenUShapedContourVectorToPeakOrthogonal(canvasPoints, viewport);
+    }
+    if (variant === 'lineSegment') {
+        return null;
+    }
+    if (variant) {
+        return findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
+    }
+    return null;
+}
+function resolveVectorToPeakOnRender(enabledElement, annotation) {
     const { viewport } = enabledElement;
     const canvasPoints = annotation.data.contour.polyline.map(viewport.worldToCanvas);
-    return findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
+    return resolveVectorToPeak(canvasPoints, viewport, annotation.data.isOpenUShapeContour);
+}
+function findOpenUShapedContourVectorToPeakOrthogonal(canvasPoints, viewport) {
+    const first = canvasPoints[0];
+    const last = canvasPoints[canvasPoints.length - 1];
+    const firstToLastUnitVector = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec2.sub */ .Zc.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec2.create */ .Zc.create(), last, first);
+    gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec2.normalize */ .Zc.normalize(firstToLastUnitVector, firstToLastUnitVector);
+    const chordDir = [
+        firstToLastUnitVector[0],
+        firstToLastUnitVector[1],
+    ];
+    const centerOfFirstToLast = [
+        (first[0] + last[0]) / 2,
+        (first[1] + last[1]) / 2,
+    ];
+    const delta = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec2.create */ .Zc.create();
+    let prevDp = null;
+    let prevPoint = null;
+    let orthogonalPoint = null;
+    for (const p of canvasPoints) {
+        gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec2.sub */ .Zc.sub(delta, p, centerOfFirstToLast);
+        const dp = gl_matrix__WEBPACK_IMPORTED_MODULE_0__/* .vec2.dot */ .Zc.dot(chordDir, delta);
+        if (prevDp !== null && prevDp * dp < 0) {
+            const t = Math.abs(prevDp) / (Math.abs(prevDp) + Math.abs(dp));
+            orthogonalPoint = [
+                prevPoint[0] + t * (p[0] - prevPoint[0]),
+                prevPoint[1] + t * (p[1] - prevPoint[1]),
+            ];
+            break;
+        }
+        if (Math.abs(dp) < 1e-10) {
+            orthogonalPoint = p;
+            break;
+        }
+        prevDp = dp;
+        prevPoint = p;
+    }
+    if (!orthogonalPoint) {
+        console.warn('No orthogonal intersection found for open U-shaped contour');
+        return null;
+    }
+    const toOrthogonal = [
+        orthogonalPoint,
+        centerOfFirstToLast,
+    ];
+    const toOrthogonalWorld = toOrthogonal.map(viewport.canvasToWorld);
+    return toOrthogonalWorld;
 }
 
 
@@ -1177,7 +1238,7 @@ function findOpenUShapedContourVectorToPeakOnRender(enabledElement, annotation)
 /* harmony import */ var _store_state__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85204);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29857);
 /* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7001);
-/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(85895);
+/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(18153);
 /* harmony import */ var _utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(42797);
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(58640);
 /* harmony import */ var _utilities_contours_updateContourPolyline__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(72967);
@@ -1474,8 +1535,7 @@ function completeOpenContourEdit(element) {
             worldPoints[worldPoints.length - 1],
         ];
         if (annotation.data.isOpenUShapeContour) {
-            annotation.data.openUShapeContourVectorToPeak =
-                (0,_findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(fusedCanvasPoints, viewport);
+            annotation.data.openUShapeContourVectorToPeak = (0,_findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__/* .resolveVectorToPeak */ .aV)(fusedCanvasPoints, viewport, annotation.data.isOpenUShapeContour);
         }
         (0,_stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_10__.triggerAnnotationModified)(annotation, element);
     }
@@ -1526,7 +1586,7 @@ function registerOpenContourEditLoop(toolInstance) {
 /* harmony import */ var _store_state__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(85204);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29857);
 /* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7001);
-/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(85895);
+/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(18153);
 
 
 
@@ -1586,7 +1646,7 @@ function registerOpenContourEndEditLoop(toolInstance) {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(74347);
-/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(85895);
+/* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18153);
 /* harmony import */ var _findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5403);
 /* harmony import */ var _utilities_contours_getContourHolesDataCanvas__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15451);
 
@@ -1611,7 +1671,9 @@ function _getRenderingOptions(enabledElement, annotation) {
         width: lineWidth,
         lineDash,
         fillColor,
-        fillOpacity,
+        fillOpacity: this.configuration?.fillOpacity !== undefined
+            ? this.configuration.fillOpacity
+            : fillOpacity,
         closePath: isClosedContour,
     };
     return options;
@@ -1625,7 +1687,9 @@ function renderContour(enabledElement, svgDrawingHelper, annotation) {
     }
     else {
         if (annotation.data.isOpenUShapeContour) {
-            calculateUShapeContourVectorToPeakIfNotPresent(enabledElement, annotation);
+            if (annotation.data.isOpenUShapeContour !== 'lineSegment') {
+                calculateUShapeContourVectorToPeakIfNotPresent(enabledElement, annotation);
+            }
             this.renderOpenUShapedContour(enabledElement, svgDrawingHelper, annotation);
         }
         else {
@@ -1635,8 +1699,7 @@ function renderContour(enabledElement, svgDrawingHelper, annotation) {
 }
 function calculateUShapeContourVectorToPeakIfNotPresent(enabledElement, annotation) {
     if (!annotation.data.openUShapeContourVectorToPeak) {
-        annotation.data.openUShapeContourVectorToPeak =
-            (0,_findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_2__/* .findOpenUShapedContourVectorToPeakOnRender */ .h)(enabledElement, annotation);
+        annotation.data.openUShapeContourVectorToPeak = (0,_findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_2__/* .resolveVectorToPeakOnRender */ .J1)(enabledElement, annotation);
     }
 }
 function renderClosedContour(enabledElement, svgDrawingHelper, annotation) {
@@ -1688,15 +1751,12 @@ function renderOpenUShapedContour(enabledElement, svgDrawingHelper, annotation)
     const { openUShapeContourVectorToPeak } = annotation.data;
     const { polyline } = annotation.data.contour;
     this.renderOpenContour(enabledElement, svgDrawingHelper, annotation);
-    if (!openUShapeContourVectorToPeak) {
+    const isLineSegmentOnly = annotation.data.isOpenUShapeContour === 'lineSegment';
+    if (!isLineSegmentOnly && !openUShapeContourVectorToPeak) {
         return;
     }
     const firstCanvasPoint = viewport.worldToCanvas(polyline[0]);
     const lastCanvasPoint = viewport.worldToCanvas(polyline[polyline.length - 1]);
-    const openUShapeContourVectorToPeakCanvas = [
-        viewport.worldToCanvas(openUShapeContourVectorToPeak[0]),
-        viewport.worldToCanvas(openUShapeContourVectorToPeak[1]),
-    ];
     const options = this._getRenderingOptions(enabledElement, annotation);
     (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPolyline)(svgDrawingHelper, annotation.annotationUID, 'first-to-last', [firstCanvasPoint, lastCanvasPoint], {
         color: options.color,
@@ -1704,15 +1764,31 @@ function renderOpenUShapedContour(enabledElement, svgDrawingHelper, annotation)
         closePath: false,
         lineDash: '2,2',
     });
-    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPolyline)(svgDrawingHelper, annotation.annotationUID, 'midpoint-to-open-contour', [
-        openUShapeContourVectorToPeakCanvas[0],
-        openUShapeContourVectorToPeakCanvas[1],
-    ], {
-        color: options.color,
-        width: options.width,
-        closePath: false,
-        lineDash: '2,2',
-    });
+    if (!isLineSegmentOnly) {
+        const openUShapeContourVectorToPeakCanvas = [
+            viewport.worldToCanvas(openUShapeContourVectorToPeak[0]),
+            viewport.worldToCanvas(openUShapeContourVectorToPeak[1]),
+        ];
+        (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPolyline)(svgDrawingHelper, annotation.annotationUID, 'midpoint-to-open-contour', [
+            openUShapeContourVectorToPeakCanvas[0],
+            openUShapeContourVectorToPeakCanvas[1],
+        ], {
+            color: options.color,
+            width: options.width,
+            closePath: false,
+            lineDash: '2,2',
+        });
+    }
+    if (options.fillOpacity > 0) {
+        const canvasPolyline = polyline.map((worldPos) => viewport.worldToCanvas(worldPos));
+        (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPath)(svgDrawingHelper, annotation.annotationUID, 'u-shape-fill', [[...canvasPolyline, firstCanvasPoint]], {
+            color: options.fillColor || options.color,
+            fillColor: options.fillColor || options.color,
+            fillOpacity: options.fillOpacity,
+            closePath: true,
+            width: 0,
+        });
+    }
 }
 function renderContourBeingDrawn(enabledElement, svgDrawingHelper, annotation) {
     const options = this._getRenderingOptions(enabledElement, annotation);
@@ -5271,7 +5347,7 @@ function interpolatePoints(originalPoints, knotsIndexes) {
 /* harmony export */   Q: () => (/* binding */ shouldSmooth),
 /* harmony export */   p: () => (/* binding */ getInterpolatedPoints)
 /* harmony export */ });
-/* harmony import */ var _math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(85895);
+/* harmony import */ var _math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18153);
 /* harmony import */ var _interpolation_interpolateSegmentPoints__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61768);
 
 

package/dist/{5028.bundle.b75c0bb0fa9a490055bd.js → 5028.bundle.5833a530fe9ade4dc787.js}

@@ -26,8 +26,8 @@ var src = __webpack_require__(42356);
 var i18n_src = __webpack_require__(89010);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
 var esm = __webpack_require__(15327);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 71 modules
-var dist_esm = __webpack_require__(22031);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 75 modules
+var dist_esm = __webpack_require__(80581);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 193 modules
 var cornerstone_src = __webpack_require__(63081);
 ;// ../../../extensions/cornerstone-dicom-pmap/src/getSopClassHandlerModule.ts