@ohif/app 3.9.0-beta.4 → 3.9.0-beta.40

package/dist/{806.bundle.50e039eb624382ee1fce.js → 370.bundle.bd9884c274c26a54dfae.js}

@@ -1,4 +1,4 @@
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[806],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[370],{
 
 /***/ 93858:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -1840,6 +1840,40 @@ function wheelListener(evt) {
 /* harmony default export */ const wheel_wheelListener = (wheelListener);
 
 
+/***/ }),
+
+/***/ 99595:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Q: () => (/* binding */ checkAndDefineTextBoxProperty),
+/* harmony export */   d: () => (/* binding */ checkAndDefineCachedStatsProperty)
+/* harmony export */ });
+const checkAndDefineTextBoxProperty = (annotation) => {
+    if (!annotation.data) {
+        annotation.data = {};
+    }
+    if (!annotation.data.handles) {
+        annotation.data.handles = {};
+    }
+    if (!annotation.data.handles.textBox) {
+        annotation.data.handles.textBox = {};
+    }
+    return annotation;
+};
+const checkAndDefineCachedStatsProperty = (annotation) => {
+    if (!annotation.data) {
+        annotation.data = {};
+    }
+    if (!annotation.data.cachedStats) {
+        annotation.data.cachedStats = {};
+    }
+    return annotation;
+};
+
+
+
 /***/ }),
 
 /***/ 95778:
@@ -2522,7 +2556,7 @@ class AdvancedMagnifyViewportManager {
 /* harmony export */ });
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92136);
 /* harmony import */ var _distancePointToContour__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7783);
-/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2746);
+/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(49574);
 /* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(73047);
 
 
@@ -2865,11 +2899,17 @@ function completeClosedContourEdit(element) {
         const updatedPoints = (0,_utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_7__/* .shouldSmooth */ .Q)(this.configuration, annotation)
             ? (0,_utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_7__/* .getInterpolatedPoints */ .p)(this.configuration, fusedCanvasPoints, prevCanvasPoints)
             : fusedCanvasPoints;
+        const decimateConfig = this.configuration?.decimate || {};
         (0,_utilities_contours_updateContourPolyline__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(annotation, {
             points: updatedPoints,
             closed: true,
             targetWindingDirection: _types_ContourAnnotation__WEBPACK_IMPORTED_MODULE_6__/* .ContourWindingDirection */ .W.Clockwise,
-        }, viewport);
+        }, viewport, {
+            decimate: {
+                enabled: !!decimateConfig.enabled,
+                epsilon: decimateConfig.epsilon,
+            },
+        });
         if (annotation.autoGenerated) {
             annotation.autoGenerated = false;
         }
@@ -3439,7 +3479,7 @@ function findOpenUShapedContourVectorToPeakOnRender(enabledElement, annotation)
 /* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(73047);
 /* harmony import */ var _utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(36605);
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(23072);
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(75534);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(75908);
 /* harmony import */ var _findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(51051);
 /* harmony import */ var _stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54177);
 
@@ -3713,10 +3753,16 @@ function completeOpenContourEdit(element) {
         const updatedPoints = (0,_utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_6__/* .shouldSmooth */ .Q)(this.configuration)
             ? (0,_utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_6__/* .getInterpolatedPoints */ .p)(this.configuration, fusedCanvasPoints, prevCanvasPoints)
             : fusedCanvasPoints;
+        const decimateConfig = this.configuration?.decimate || {};
         (0,_utilities_contours__WEBPACK_IMPORTED_MODULE_8__.updateContourPolyline)(annotation, {
             points: updatedPoints,
             closed: false,
-        }, viewport);
+        }, viewport, {
+            decimate: {
+                enabled: !!decimateConfig.enabled,
+                epsilon: decimateConfig.epsilon,
+            },
+        });
         const worldPoints = annotation.data.contour.polyline;
         annotation.data.handles.points = [
             worldPoints[0],
@@ -3836,10 +3882,10 @@ function registerOpenContourEndEditLoop(toolInstance) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2746);
+/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(49574);
 /* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73047);
 /* harmony import */ var _findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51051);
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(75534);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(75908);
 
 
 
@@ -4009,10 +4055,42 @@ function renderOpenContourBeingEdited(enabledElement, svgDrawingHelper, annotati
     const polylineUIDToRender = 'preview-1';
     (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPolyline)(svgDrawingHelper, annotation.annotationUID, polylineUIDToRender, fusedCanvasPoints, options);
 }
+function renderPointContourWithMarker(enabledElement, svgDrawingHelper, annotation) {
+    if (annotation.parentAnnotationUID) {
+        return;
+    }
+    const { viewport } = enabledElement;
+    const options = this._getRenderingOptions(enabledElement, annotation);
+    const canvasPolyline = annotation.data.contour.polyline.map((worldPos) => viewport.worldToCanvas(worldPos));
+    const childContours = (0,_utilities_contours__WEBPACK_IMPORTED_MODULE_3__.getContourHolesDataCanvas)(annotation, viewport);
+    const polylineUID = '1';
+    const center = canvasPolyline[0];
+    const radius = 6;
+    const numberOfPoints = 100;
+    const circlePoints = [];
+    for (let i = 0; i < numberOfPoints; i++) {
+        const angle = (i / numberOfPoints) * 2 * Math.PI;
+        const x = center[0] + radius * Math.cos(angle);
+        const y = center[1] + radius * Math.sin(angle);
+        circlePoints.push([x, y]);
+    }
+    const crosshair = [
+        [center[0] - radius * 2, center[1]],
+        [center[0] + radius * 2, center[1]],
+        [center[0], center[1] - radius * 2],
+        [center[0], center[1] + radius * 2],
+    ];
+    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPath)(svgDrawingHelper, annotation.annotationUID, polylineUID + '-crosshair_v', [crosshair[0], crosshair[1]], options);
+    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPath)(svgDrawingHelper, annotation.annotationUID, polylineUID + '-crosshair_h', [crosshair[2], crosshair[3]], options);
+    const allContours = [circlePoints, ...childContours];
+    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_0__.drawPath)(svgDrawingHelper, annotation.annotationUID, polylineUID, allContours, options);
+}
 function registerRenderMethods(toolInstance) {
     toolInstance.renderContour = renderContour.bind(toolInstance);
     toolInstance.renderClosedContour = renderClosedContour.bind(toolInstance);
     toolInstance.renderOpenContour = renderOpenContour.bind(toolInstance);
+    toolInstance.renderPointContourWithMarker =
+        renderPointContourWithMarker.bind(toolInstance);
     toolInstance.renderOpenUShapedContour =
         renderOpenUShapedContour.bind(toolInstance);
     toolInstance.renderContourBeingDrawn =
@@ -4738,12 +4816,12 @@ var stateManagement_segmentation = __webpack_require__(63421);
 var enums = __webpack_require__(84901);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/annotation/annotationState.js
 var annotationState = __webpack_require__(38296);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/drawingSvg/index.js + 17 modules
-var drawingSvg = __webpack_require__(2746);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/drawingSvg/index.js + 18 modules
+var drawingSvg = __webpack_require__(49574);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/AnnotationTool.js
 var AnnotationTool = __webpack_require__(52454);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js
-var contours = __webpack_require__(75534);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js + 9 modules
+var contours = __webpack_require__(75908);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/ContourBaseTool.js
 
 
@@ -5086,7 +5164,7 @@ const defaultContourConfig = {
     outlineDashInactive: undefined,
     outlineDashAutoGenerated: '5,3',
     activeSegmentOutlineWidthDelta: 0,
-    renderFill: false,
+    renderFill: true,
     fillAlpha: 0.5,
     fillAlphaInactive: 0.3,
     fillAlphaAutoGenerated: 0.3,
@@ -5149,6 +5227,8 @@ function deleteConfigCache(segmentationRepresentationUID) {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/index.js + 31 modules
 var stateManagement_segmentation = __webpack_require__(63421);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/annotationHydration.js
+var annotationHydration = __webpack_require__(25781);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/CellArray.js
 var CellArray = __webpack_require__(24768);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/Points.js
@@ -5218,6 +5298,7 @@ var contourSegmentation = __webpack_require__(7259);
 
 
 
+
 function handleContourSegmentation(viewport, geometryIds, annotationUIDsMap, contourRepresentation, contourRepresentationConfig) {
     const addOrUpdateFn = annotationUIDsMap.size
         ? updateContourSets
@@ -5303,10 +5384,10 @@ function addContourSetsToElement(viewport, geometryIds, contourRepresentation, c
                 highlighted: false,
                 autoGenerated: false,
                 invalidated: false,
-                isLocked: false,
+                isLocked: true,
                 isVisible: true,
                 metadata: {
-                    referencedImageId: viewport.getCurrentImageId(),
+                    referencedImageId: (0,annotationHydration/* getClosestImageIdForStackViewport */.x)(viewport, points[0], viewport.getCamera().viewPlaneNormal),
                     toolName: 'PlanarFreehandContourSegmentationTool',
                     FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
                     viewPlaneNormal: viewport.getCamera().viewPlaneNormal,
@@ -5433,7 +5514,7 @@ async function addLabelmapToElement(element, labelMapData, segmentationRepresent
                 actorUID: segmentationRepresentationUID,
             },
         ];
-        await (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.addImageSlicesToViewports)(renderingEngine, stackInputs, [viewportId], immediateRender, suppressEvents);
+        await (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.addImageSlicesToViewports)(renderingEngine, stackInputs, [viewportId]);
     }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (addLabelmapToElement);
@@ -7331,9 +7412,11 @@ function _addInterpolatedContour(interpolated3DPoints, handlePoints, sliceIndex,
     const points = interpolated3DPoints.points;
     const { viewport } = eventData;
     const interpolatedAnnotation = createPolylineToolData(points, handlePoints, referencedToolData);
-    const targetId = viewport.getReferenceId({ sliceIndex });
-    interpolatedAnnotation.metadata.referencedImageId = targetId;
-    interpolatedAnnotation.metadata.sliceIndex = sliceIndex;
+    const viewRef = viewport.getViewReference({ sliceIndex });
+    if (!viewRef) {
+        throw new Error(`Can't find slice ${sliceIndex}`);
+    }
+    Object.assign(interpolatedAnnotation.metadata, viewRef);
     stateManagement_annotation.state.addAnnotation(interpolatedAnnotation, viewport.element);
     referencedToolData.onInterpolationComplete?.(interpolatedAnnotation, referencedToolData);
     const { parentAnnotationUID } = referencedToolData;

package/dist/{682.bundle.0909fbf9a76430e4bbc9.js → 382.bundle.df3ca2c99f3547b31d5b.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[682],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[382],{
 
-/***/ 82682:
+/***/ 72382:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -16,7 +16,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
-var src = __webpack_require__(8633);
+var src = __webpack_require__(75186);
 // EXTERNAL MODULE: ../../../node_modules/i18next/dist/esm/i18next.js
 var i18next = __webpack_require__(92344);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/package.json
@@ -111,6 +111,11 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.SegmentationDisplay
     }, {
       toolName: toolNames.CalibrationLine
+    }, {
+      toolName: toolNames.PlanarFreehandContourSegmentation,
+      configuration: {
+        displayOnePointAsCrosshairs: true
+      }
     }, {
       toolName: toolNames.UltrasoundDirectional
     }, {
@@ -119,6 +124,8 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.SplineROI
     }, {
       toolName: toolNames.LivewireContour
+    }, {
+      toolName: toolNames.WindowLevelRegion
     }],
     enabled: [{
       toolName: toolNames.ImageOverlayViewer
@@ -178,6 +185,13 @@ function initSRToolGroup(extensionManager, toolGroupService) {
       toolName: SRToolNames.SRPlanarFreehandROI
     }, {
       toolName: SRToolNames.SRRectangleROI
+    }, {
+      toolName: toolNames.WindowLevelRegion
+    }, {
+      toolName: SRToolNames.SRPlanarFreehandContourSegmentation,
+      configuration: {
+        displayOnePointAsCrosshairs: true
+      }
     }],
     enabled: [{
       toolName: SRToolNames.DICOMSRDisplay,
@@ -265,11 +279,23 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
       toolName: toolNames.PlanarFreehandROI
     }, {
       toolName: toolNames.SegmentationDisplay
+    }, {
+      toolName: toolNames.WindowLevelRegion
+    }, {
+      toolName: toolNames.PlanarFreehandContourSegmentation,
+      configuration: {
+        displayOnePointAsCrosshairs: true
+      }
     }],
     disabled: [{
       toolName: toolNames.Crosshairs,
       configuration: {
-        viewportIndicators: false,
+        viewportIndicators: true,
+        viewportIndicatorsConfig: {
+          circleRadius: 5,
+          xOffset: 0.95,
+          yOffset: 0.05
+        },
         disableOnPassive: true,
         autoPan: {
           enabled: false,
@@ -634,7 +660,7 @@ const moreTools = [{
       evaluate: 'evaluate.cornerstoneTool'
     }), moreTools_createButton({
       id: 'CobbAngle',
-      icon: 'tool-angle',
+      icon: 'icon-tool-cobb-angle',
       label: 'Cobb Angle',
       tooltip: 'Cobb Angle',
       commands: setToolActiveToolbar,
@@ -673,6 +699,13 @@ const moreTools = [{
       tooltip: 'Ultrasound Directional',
       commands: setToolActiveToolbar,
       evaluate: ['evaluate.cornerstoneTool', 'evaluate.isUS']
+    }), moreTools_createButton({
+      id: 'WindowLevelRegion',
+      icon: 'icon-tool-window-region',
+      label: 'Window Level Region',
+      tooltip: 'Window Level Region',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
     })]
   }
 }];

package/dist/{907.bundle.d2c612ec56380e73df89.js → 444.bundle.7d0ca442eef652e676fc.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[907],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[444],{
 
-/***/ 55907:
+/***/ 34444:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -22,7 +22,7 @@ const id = package_namespaceObject.UU;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-pdf`;
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
-var src = __webpack_require__(8633);
+var src = __webpack_require__(75186);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-pdf/src/getSopClassHandlerModule.js
 
 
@@ -109,7 +109,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 297).then(__webpack_require__.bind(__webpack_require__, 46297));
+  return __webpack_require__.e(/* import() */ 837).then(__webpack_require__.bind(__webpack_require__, 70218));
 });
 const OHIFCornerstonePdfViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{483.bundle.a353efc5a5dd563c903c.js → 483.bundle.0f1848f6a2cf34829fef.js}

@@ -731,7 +731,7 @@ function getToolGroupsWithToolName(toolName) {
 /* harmony import */ var _planarFreehandROITool_openContourEndEditLoop__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(72702);
 /* harmony import */ var _planarFreehandROITool_renderMethods__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(11585);
 /* harmony import */ var _stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(54177);
-/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(2746);
+/* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(49574);
 /* harmony import */ var _utilities_drawing__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(10910);
 /* harmony import */ var _utilities_math_polyline__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(56634);
 /* harmony import */ var _utilities_pointInShapeCallback__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(75403);
@@ -800,6 +800,7 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
                 enabled: false,
                 epsilon: 0.1,
             },
+            displayOnePointAsCrosshairs: false,
             calculateStats: true,
             getTextLines: defaultGetTextLines,
             statsCalculator: _utilities_math_basic__WEBPACK_IMPORTED_MODULE_22__.BasicStatsCalculator,
@@ -1136,7 +1137,13 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
         const isEditingOpen = this.isEditingOpen;
         const isEditingClosed = this.isEditingClosed;
         if (!(isDrawing || isEditingOpen || isEditingClosed)) {
-            this.renderContour(enabledElement, svgDrawingHelper, annotation);
+            if (this.configuration.displayOnePointAsCrosshairs &&
+                annotation.data.contour.polyline.length === 1) {
+                this.renderPointContourWithMarker(enabledElement, svgDrawingHelper, annotation);
+            }
+            else {
+                this.renderContour(enabledElement, svgDrawingHelper, annotation);
+            }
         }
         else {
             const activeAnnotationUID = this.commonData.annotation.annotationUID;
@@ -1155,7 +1162,13 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
                 }
             }
             else {
-                this.renderContour(enabledElement, svgDrawingHelper, annotation);
+                if (this.configuration.displayOnePointAsCrosshairs &&
+                    annotation.data.contour.polyline.length === 1) {
+                    this.renderPointContourWithMarker(enabledElement, svgDrawingHelper, annotation);
+                }
+                else {
+                    this.renderContour(enabledElement, svgDrawingHelper, annotation);
+                }
             }
             renderStatus = true;
         }