@ohif/app 3.12.0-beta.80 → 3.12.0-beta.82

package/dist/{3613.bundle.f5fceb4697407a89921b.js → 3613.bundle.3542f5bb1f69651bc239.js}

@@ -767,8 +767,8 @@ const isInvalidNumber = (value) => {
     return !(typeof value === 'number' && Number.isFinite(value));
 };
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/renderPasses/index.js + 2 modules
-var renderPasses = __webpack_require__(50951);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/renderPasses/index.js + 3 modules
+var RenderingEngine_renderPasses = __webpack_require__(88540);
 ;// ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/BaseVolumeViewport.js
 
 
@@ -809,6 +809,7 @@ class BaseVolumeViewport extends Viewport/* default */.A {
         super(props);
         this.useCPURendering = false;
         this.sharpening = 0;
+        this.smoothing = 0;
         this.perVolumeIdDefaultProperties = new Map();
         this.viewportProperties = {};
         this.volumeIds = new Set();
@@ -848,15 +849,26 @@ class BaseVolumeViewport extends Viewport/* default */.A {
             this.sharpening = sharpening;
             this.render();
         };
+        this.setSmoothing = (smoothing) => {
+            this.smoothing = smoothing;
+            this.render();
+        };
         this.getRenderPasses = () => {
             if (!this.shouldUseCustomRenderPass()) {
                 return null;
             }
+            const renderPasses = [];
             try {
-                return [(0,renderPasses/* createSharpeningRenderPass */.b)(this.sharpening)];
+                if (this.smoothing > 0) {
+                    renderPasses.push((0,RenderingEngine_renderPasses/* createSmoothingRenderPass */.y)(this.smoothing));
+                }
+                if (this.sharpening > 0) {
+                    renderPasses.push((0,RenderingEngine_renderPasses/* createSharpeningRenderPass */.b)(this.sharpening));
+                }
+                return renderPasses.length ? renderPasses : null;
             }
             catch (e) {
-                console.warn('Failed to create sharpening render passes:', e);
+                console.warn('Failed to create custom render passes:', e);
                 return null;
             }
         };
@@ -906,6 +918,7 @@ class BaseVolumeViewport extends Viewport/* default */.A {
                 slabThickness: slabThickness,
                 preset,
                 sharpening: this.sharpening,
+                smoothing: this.smoothing,
             };
         };
         this.getColormap = (volumeId) => {
@@ -1493,7 +1506,7 @@ class BaseVolumeViewport extends Viewport/* default */.A {
                 const newPosition = esm/* vec3.add */.eR.add(esm/* vec3.create */.eR.create(), position, focalShift);
                 this.setCamera({
                     focalPoint: newImagePositionPatient,
-                    position: newPosition
+                    position: newPosition,
                 });
                 this.render();
                 return;
@@ -1533,7 +1546,7 @@ class BaseVolumeViewport extends Viewport/* default */.A {
         };
         (0,triggerEvent/* default */.A)(this.element, enums.Events.COLORMAP_MODIFIED, eventDetail);
     }
-    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, sharpening, } = {}, volumeId, suppressEvents = false) {
+    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, sharpening, smoothing, } = {}, volumeId, suppressEvents = false) {
         if (this.globalDefaultProperties == null) {
             this.setDefaultProperties({
                 voiRange,
@@ -1577,9 +1590,12 @@ class BaseVolumeViewport extends Viewport/* default */.A {
         if (typeof sharpening !== 'undefined') {
             this.setSharpening(sharpening);
         }
+        if (typeof smoothing !== 'undefined') {
+            this.setSmoothing(smoothing);
+        }
     }
     shouldUseCustomRenderPass() {
-        return this.sharpening > 0 && !this.useCPURendering;
+        return !this.useCPURendering;
     }
     resetToDefaultProperties(volumeId) {
         const properties = this.globalDefaultProperties;
@@ -3091,8 +3107,8 @@ function adjustInitialViewUp(initialViewUp, flipHorizontal, flipVertical, viewPl
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/isContextPoolRenderingEngine.js
 var isContextPoolRenderingEngine = __webpack_require__(27685);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/renderPasses/index.js + 2 modules
-var renderPasses = __webpack_require__(50951);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/renderPasses/index.js + 3 modules
+var RenderingEngine_renderPasses = __webpack_require__(88540);
 ;// ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/StackViewport.js
 
 
@@ -3154,6 +3170,7 @@ class StackViewport extends Viewport/* default */.A {
         this.perImageIdDefaultProperties = new Map();
         this.voiUpdatedWithSetProperties = false;
         this.sharpening = 0;
+        this.smoothing = 0;
         this.invert = false;
         this.initialInvert = false;
         this.initialTransferFunctionNodes = null;
@@ -3166,15 +3183,26 @@ class StackViewport extends Viewport/* default */.A {
             this.sharpening = sharpening;
             this.render();
         };
+        this.setSmoothing = (smoothing) => {
+            this.smoothing = smoothing;
+            this.render();
+        };
         this.getRenderPasses = () => {
             if (!this.shouldUseCustomRenderPass()) {
                 return null;
             }
+            const renderPasses = [];
             try {
-                return [(0,renderPasses/* createSharpeningRenderPass */.b)(this.sharpening)];
+                if (this.smoothing > 0) {
+                    renderPasses.push((0,RenderingEngine_renderPasses/* createSmoothingRenderPass */.y)(this.smoothing));
+                }
+                if (this.sharpening > 0) {
+                    renderPasses.push((0,RenderingEngine_renderPasses/* createSharpeningRenderPass */.b)(this.sharpening));
+                }
+                return renderPasses.length ? renderPasses : null;
             }
             catch (e) {
-                console.warn('Failed to create sharpening render passes:', e);
+                console.warn('Failed to create custom render passes:', e);
                 return null;
             }
         };
@@ -3229,6 +3257,7 @@ class StackViewport extends Viewport/* default */.A {
                 invert,
                 isComputedVOI: !voiUpdatedWithSetProperties,
                 sharpening: this.sharpening,
+                smoothing: this.smoothing,
             };
         };
         this.resetCameraForResize = () => {
@@ -3631,7 +3660,7 @@ class StackViewport extends Viewport/* default */.A {
         camera.setFreezeFocalPoint(true);
     }
     shouldUseCustomRenderPass() {
-        return this.sharpening > 0 && !this.useCPURendering;
+        return !this.useCPURendering;
     }
     initializeElementDisabledHandler() {
         eventTarget/* default */.A.addEventListener(enums.Events.ELEMENT_DISABLED, function elementDisabledHandler() {
@@ -3754,7 +3783,7 @@ class StackViewport extends Viewport/* default */.A {
             this.resetToDefaultProperties();
         }
     }
-    setProperties({ colormap, voiRange, VOILUTFunction, invert, interpolationType, sharpening, } = {}, suppressEvents = false) {
+    setProperties({ colormap, voiRange, VOILUTFunction, invert, interpolationType, sharpening, smoothing, } = {}, suppressEvents = false) {
         this.viewportStatus = this.csImage
             ? enums.ViewportStatus.PRE_RENDER
             : enums.ViewportStatus.LOADING;
@@ -3765,6 +3794,7 @@ class StackViewport extends Viewport/* default */.A {
             invert: this.globalDefaultProperties.invert ?? invert,
             interpolationType: this.globalDefaultProperties.interpolationType ?? interpolationType,
             sharpening: this.globalDefaultProperties.sharpening ?? sharpening,
+            smoothing: this.globalDefaultProperties.smoothing ?? smoothing,
         };
         if (typeof colormap !== 'undefined') {
             this.setColormap(colormap);
@@ -3785,6 +3815,9 @@ class StackViewport extends Viewport/* default */.A {
         if (typeof sharpening !== 'undefined') {
             this.setSharpening(sharpening);
         }
+        if (typeof smoothing !== 'undefined') {
+            this.setSmoothing(smoothing);
+        }
     }
     resetProperties() {
         this.cpuRenderingInvalidated = true;
@@ -12557,14 +12590,15 @@ var helpers = __webpack_require__(40661);
 
 /***/ }),
 
-/***/ 50951:
+/***/ 88540:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  b: () => (/* reexport */ createSharpeningRenderPass)
+  b: () => (/* reexport */ createSharpeningRenderPass),
+  y: () => (/* reexport */ createSmoothingRenderPass)
 });
 
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/macros2.js
@@ -12829,11 +12863,53 @@ function createSharpeningRenderPass(intensity) {
 }
 
 
+;// ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/renderPasses/smoothingRenderPass.js
+
+
+function createSmoothingRenderPass(intensity) {
+    let renderPass = ForwardPass/* default.newInstance */.Ay.newInstance();
+    if (intensity > 0) {
+        const convolutionPass = vtkConvolution2DPass$1.newInstance();
+        convolutionPass.setDelegates([renderPass]);
+        const smoothStrength = Math.min(intensity, 1000);
+        const kernelSize = 15;
+        const sigma = 5.0;
+        const gaussianKernel = createGaussianKernel(kernelSize, sigma);
+        const totalElements = kernelSize * kernelSize;
+        const centerIndex = Math.floor(totalElements / 2);
+        const identityKernel = Array(totalElements).fill(0);
+        identityKernel[centerIndex] = 1;
+        const alpha = Math.min(smoothStrength / 10, 1.0);
+        const kernel = gaussianKernel.map((g, i) => (1 - alpha) * identityKernel[i] + alpha * g);
+        convolutionPass.setKernelDimension(15);
+        convolutionPass.setKernel(kernel);
+        renderPass = convolutionPass;
+    }
+    return renderPass;
+}
+function createGaussianKernel(size, sigma) {
+    const kernel = [];
+    const mean = (size - 1) / 2;
+    let sum = 0;
+    for (let y = 0; y < size; y++) {
+        for (let x = 0; x < size; x++) {
+            const dx = x - mean;
+            const dy = y - mean;
+            const value = Math.exp(-(dx * dx + dy * dy) / (2 * Math.pow(sigma, 2)));
+            kernel.push(value);
+            sum += value;
+        }
+    }
+    return kernel.map((v) => v / sum);
+}
+
+
 ;// ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/renderPasses/index.js
 
 
 
 
+
 /***/ }),
 
 /***/ 5862:
@@ -34393,7 +34469,7 @@ function uuidv4() {
 
 "use strict";
 /* unused harmony export version */
-const version = '4.5.20';
+const version = '4.9.0';
 
 
 /***/ }),
@@ -37235,23 +37311,6 @@ function getLabelmapImageIdsForImageId(imageId, segmentationId) {
 }
 
 
-/***/ }),
-
-/***/ 33283:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   T: () => (/* binding */ getSegmentation)
-/* harmony export */ });
-/* harmony import */ var _SegmentationStateManager__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59475);
-
-function getSegmentation(segmentationId) {
-    const segmentationStateManager = _SegmentationStateManager__WEBPACK_IMPORTED_MODULE_0__/* .defaultSegmentationStateManager */ ._6;
-    return segmentationStateManager.getSegmentation(segmentationId);
-}
-
-
 /***/ }),
 
 /***/ 58859:
@@ -38860,7 +38919,6 @@ function removeRepresentation(viewportId, segmentationId, renderImmediate = fals
         return;
     }
     const { viewport } = enabledElement;
-    (0,_removeContourFromElement__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(viewportId, segmentationId);
     if (!renderImmediate) {
         return;
     }
@@ -43021,9 +43079,7 @@ class InstanceVolumetricCalculator extends _math_basic_BasicStatsCalculator__WEB
 /* unused harmony exports setBrushSizeForToolGroup, getBrushSizeForToolGroup */
 /* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(77609);
 /* harmony import */ var _triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(58640);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15327);
-/* harmony import */ var _getBrushToolInstances__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(14957);
-
+/* harmony import */ var _getBrushToolInstances__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14957);
 
 
 
@@ -43034,17 +43090,14 @@ function setBrushSizeForToolGroup(toolGroupId, brushSize, toolName) {
     }
     const brushBasedToolInstances = getBrushToolInstances(toolGroupId, toolName);
     brushBasedToolInstances.forEach((tool) => {
-        tool.configuration.brushSize = brushSize;
+        const minRadius = tool.configuration.minRadius;
+        const maxRadius = tool.configuration.maxRadius;
+        let newBrushSize = minRadius ? Math.max(brushSize, minRadius) : brushSize;
+        newBrushSize = maxRadius ? Math.min(newBrushSize, maxRadius) : newBrushSize;
+        tool.configuration.brushSize = newBrushSize;
         tool.invalidateBrushCursor();
     });
-    const viewportsInfo = toolGroup.getViewportsInfo();
-    const viewportsInfoArray = Object.keys(viewportsInfo).map((key) => viewportsInfo[key]);
-    if (!viewportsInfoArray.length) {
-        return;
-    }
-    const { renderingEngineId } = viewportsInfoArray[0];
     const viewportIds = toolGroup.getViewportIds();
-    const renderingEngine = getRenderingEngine(renderingEngineId);
     triggerAnnotationRenderForViewportIds(viewportIds);
 }
 function getBrushSizeForToolGroup(toolGroupId, toolName) {

package/dist/{4019.bundle.6505ff57ca48af03da8a.js → 4019.bundle.8172183f816ea5500dd5.js}

@@ -227,6 +227,22 @@ function triggerSegmentationRepresentationRemoved(viewportId, segmentationId, ty
 }
 
 
+/***/ }),
+
+/***/ 33283:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   T: () => (/* binding */ getSegmentation)
+/* harmony export */ });
+/* harmony import */ var _SegmentationStateManager__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59475);
+
+function getSegmentation(segmentationId) {
+    const segmentationStateManager = _SegmentationStateManager__WEBPACK_IMPORTED_MODULE_0__/* .defaultSegmentationStateManager */ ._6;
+    return segmentationStateManager.getSegmentation(segmentationId);
+}
+
+
 /***/ }),
 
 /***/ 47098:
@@ -2246,6 +2262,8 @@ var getActiveSegmentIndex = __webpack_require__(60740);
 var segmentLocking = __webpack_require__(26795);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/segmentation/getSVGStyleForSegment.js
 var getSVGStyleForSegment = __webpack_require__(86644);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/SegmentationStateManager.js
+var SegmentationStateManager = __webpack_require__(59475);
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/ContourSegmentationBaseTool.js
 
 
@@ -2261,6 +2279,7 @@ var getSVGStyleForSegment = __webpack_require__(86644);
 
 
 
+
 class ContourSegmentationBaseTool extends ContourBaseTool {
     static { this.PreviewSegmentIndex = 255; }
     constructor(toolProps, defaultToolProps) {
@@ -2348,6 +2367,28 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
         }
         return renderResult;
     }
+    filterInteractableAnnotationsForElement(element, annotations) {
+        if (!annotations || !annotations.length) {
+            return;
+        }
+        const baseFilteredAnnotations = super.filterInteractableAnnotationsForElement(element, annotations);
+        if (!baseFilteredAnnotations || !baseFilteredAnnotations.length) {
+            return;
+        }
+        const enabledElement = (0,esm.getEnabledElement)(element);
+        const { viewport } = enabledElement;
+        return baseFilteredAnnotations.filter((annotation) => {
+            const segmentationId = annotation?.data
+                ?.segmentation?.segmentationId;
+            if (!segmentationId) {
+                return true;
+            }
+            return !!SegmentationStateManager/* defaultSegmentationStateManager */._6.getSegmentationRepresentation(viewport.id, {
+                segmentationId,
+                type: enums.SegmentationRepresentations.Contour,
+            });
+        });
+    }
     _getContourSegmentationStyle(context) {
         const annotation = context.annotation;
         const { segmentationId, segmentIndex } = annotation.data.segmentation;
@@ -2576,25 +2617,22 @@ function addContourSetsToElement(viewport, geometryIds, contourRepresentation) {
 /***/ }),
 
 /***/ 87420:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ ((__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) => {
 
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
-/* harmony export */ });
 /* harmony import */ var _stateManagement_segmentation_getSegmentation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(33283);
 /* harmony import */ var _stateManagement__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6802);
 
 
 function removeContourFromElement(viewportId, segmentationId, removeFromCache = false) {
-    const segmentation = (0,_stateManagement_segmentation_getSegmentation__WEBPACK_IMPORTED_MODULE_0__/* .getSegmentation */ .T)(segmentationId);
+    const segmentation = getSegmentation(segmentationId);
     const { annotationUIDsMap } = segmentation.representationData.Contour;
     annotationUIDsMap.forEach((annotationSet) => {
         annotationSet.forEach((annotationUID) => {
-            (0,_stateManagement__WEBPACK_IMPORTED_MODULE_1__/* .removeAnnotation */ .O8)(annotationUID);
+            removeAnnotation(annotationUID);
         });
     });
 }
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (removeContourFromElement);
+/* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (removeContourFromElement)));
 
 
 /***/ }),
@@ -5132,7 +5170,7 @@ function filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirect
             continue;
         }
         const point = metadata.planeRestriction?.point ||
-            data.handles.points[0] ||
+            data.handles?.points?.[0] ||
             data.contour?.polyline[0];
         if (!point) {
             annotationsWithinSlice.push(annotation);

package/dist/{4092.bundle.00d575990d745230c1b2.js → 4092.bundle.8094d2feb687b9046b15.js}

@@ -953,6 +953,7 @@ function SmoothContoursOptions() {
 
 
 
+
 function getToolbarModule({
   servicesManager
 }) {
@@ -1064,6 +1065,24 @@ function getToolbarModule({
         isActive: isPrimaryActive
       };
     }
+  }, {
+    name: 'evaluate.cornerstone.segmentation.synchronizeDrawingRadius',
+    evaluate: ({
+      button,
+      radiusOptionId
+    }) => {
+      const toolGroupIds = toolGroupService.getToolGroupIds();
+      if (!toolGroupIds?.length) {
+        return;
+      }
+      for (const toolGroupId of toolGroupIds) {
+        const brushSize = dist_esm.utilities.segmentation.getBrushSizeForToolGroup(toolGroupId);
+        if (brushSize) {
+          const option = toolbarService.getOptionById(button, radiusOptionId);
+          option.value = brushSize;
+        }
+      }
+    }
   }];
 }
 ;// ../../../extensions/cornerstone-dicom-seg/src/index.tsx

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

@@ -952,13 +952,17 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
         if (!annotations || !annotations.length) {
             return;
         }
+        const baseFilteredAnnotations = super.filterInteractableAnnotationsForElement(element, annotations);
+        if (!baseFilteredAnnotations || !baseFilteredAnnotations.length) {
+            return;
+        }
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
         const { viewport } = enabledElement;
         let annotationsToDisplay;
         if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.VolumeViewport) {
             const camera = viewport.getCamera();
             const { spacingInNormalDirection } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities.getTargetVolumeAndSpacingInNormalDir(viewport, camera);
-            annotationsToDisplay = this.filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirection);
+            annotationsToDisplay = this.filterAnnotationsWithinSlice(baseFilteredAnnotations, camera, spacingInNormalDirection);
         }
         else {
             annotationsToDisplay = (0,_utilities_planar__WEBPACK_IMPORTED_MODULE_5__.filterAnnotationsForDisplay)(viewport, annotations);
@@ -1088,7 +1092,9 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
         if (!this.configuration.calculateStats) {
             return;
         }
-        this._calculateStatsIfActive(annotation, targetId, viewport, renderingEngine, enabledElement);
+        if (annotation.invalidated) {
+            this._calculateStatsIfActive(annotation, targetId, viewport, renderingEngine, enabledElement);
+        }
         this._renderStats(annotation, viewport, enabledElement, svgDrawingHelper);
         return renderStatus;
     }