@ohif/app 3.12.0-beta.18 → 3.12.0-beta.19

package/dist/{810.bundle.a20ab9b4ac8bbf3d8ff3.js → 810.bundle.14f52ec5b884fba76c5a.js}

@@ -1474,8 +1474,8 @@ function createAndDownloadTMTVReport(segReport, additionalReportRows, options =
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(5842);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 70 modules
-var adapters_dist_esm = __webpack_require__(92740);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 69 modules
+var adapters_dist_esm = __webpack_require__(53434);
 ;// ../../../extensions/tmtv/src/utils/dicomRTAnnotationExport/RTStructureSet/dicomRTAnnotationExport.js
 
 

package/dist/{9819.bundle.3bd258ca087c76f6a5f8.js → 9819.bundle.44afc84f644470568735.js}

@@ -14869,7 +14869,6 @@ class StreamingDynamicImageVolume extends _BaseStreamingImageVolume__WEBPACK_IMP
         this._splittingTag = splittingTag;
         this._imageIdGroups = imageIdGroups;
         this.numDimensionGroups = this._imageIdGroups.length;
-        this.numTimePoints = this.numDimensionGroups;
     }
     _getImageIdsToLoad() {
         const imageIdGroups = this._imageIdGroups;
@@ -14893,10 +14892,6 @@ class StreamingDynamicImageVolume extends _BaseStreamingImageVolume__WEBPACK_IMP
     get dimensionGroupNumber() {
         return this._dimensionGroupNumber;
     }
-    set timePointIndex(index) {
-        console.warn('Warning: timePointIndex is deprecated. Please use dimensionGroupNumber instead. Note that timePointIndex is zero-based while dimensionGroupNumber starts at 1.');
-        this.dimensionGroupNumber = index + 1;
-    }
     set dimensionGroupNumber(dimensionGroupNumber) {
         if (this._dimensionGroupNumber === dimensionGroupNumber) {
             return;
@@ -14912,18 +14907,6 @@ class StreamingDynamicImageVolume extends _BaseStreamingImageVolume__WEBPACK_IMP
             numImageIdGroups: this.numDimensionGroups,
             splittingTag: this.splittingTag,
         });
-        (0,_utilities__WEBPACK_IMPORTED_MODULE_2__.triggerEvent)(_eventTarget__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A, _enums__WEBPACK_IMPORTED_MODULE_0__.Events.DYNAMIC_VOLUME_TIME_POINT_INDEX_CHANGED, {
-            volumeId: this.volumeId,
-            timePointIndex: dimensionGroupNumber - 1,
-            numTimePoints: this.numDimensionGroups,
-            imageIdGroupIndex: dimensionGroupNumber - 1,
-            numImageIdGroups: this.numDimensionGroups,
-            splittingTag: this.splittingTag,
-        });
-    }
-    get timePointIndex() {
-        console.warn('Warning: timePointIndex is deprecated. Please use dimensionGroupNumber instead. Note that timePointIndex is zero-based while dimensionGroupNumber starts at 1.');
-        return this._dimensionGroupNumber - 1;
     }
     scroll(delta) {
         const newDimensionGroupNumber = this._dimensionGroupNumber + delta;
@@ -14940,14 +14923,6 @@ class StreamingDynamicImageVolume extends _BaseStreamingImageVolume__WEBPACK_IMP
     getCurrentDimensionGroupImageIds() {
         return this._imageIdGroups[this._dimensionGroupNumber - 1];
     }
-    getCurrentTimePointImageIds() {
-        console.warn('Warning: getCurrentTimePointImageIds is deprecated. Please use getCurrentDimensionGroupImageIds instead.');
-        return this.getCurrentDimensionGroupImageIds();
-    }
-    flatImageIdIndexToTimePointIndex(flatImageIdIndex) {
-        console.warn('Warning: flatImageIdIndexToTimePointIndex is deprecated. Please use flatImageIdIndexToDimensionGroupNumber instead.');
-        return this.flatImageIdIndexToDimensionGroupNumber(flatImageIdIndex) - 1;
-    }
     flatImageIdIndexToDimensionGroupNumber(flatImageIdIndex) {
         return Math.floor(flatImageIdIndex / this._imageIdGroups[0].length) + 1;
     }
@@ -14957,10 +14932,6 @@ class StreamingDynamicImageVolume extends _BaseStreamingImageVolume__WEBPACK_IMP
     get splittingTag() {
         return this._splittingTag;
     }
-    isTimePointLoaded(timePointIndex) {
-        console.warn('Warning: isTimePointLoaded is deprecated. Please use isDimensionGroupLoaded instead. Note that timePointIndex is zero-based while dimensionGroupNumber starts at 1.');
-        return this.isDimensionGroupLoaded(timePointIndex + 1);
-    }
     isDimensionGroupLoaded(dimensionGroupNumber) {
         return this._loadedDimensionGroups.has(dimensionGroupNumber);
     }
@@ -14970,14 +14941,6 @@ class StreamingDynamicImageVolume extends _BaseStreamingImageVolume__WEBPACK_IMP
             volumeId: this.volumeId,
             dimensionGroupNumber: dimensionGroupNumber,
         });
-        (0,_utilities__WEBPACK_IMPORTED_MODULE_2__.triggerEvent)(_eventTarget__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A, _enums__WEBPACK_IMPORTED_MODULE_0__.Events.DYNAMIC_VOLUME_TIME_POINT_LOADED, {
-            volumeId: this.volumeId,
-            timePointIndex: dimensionGroupNumber - 1,
-        });
-    }
-    checkTimePointCompletion(imageIdIndex) {
-        console.warn('Warning: checkTimePointCompletion is deprecated. Please use checkDimensionGroupCompletion instead.');
-        this.checkDimensionGroupCompletion(imageIdIndex);
     }
     checkDimensionGroupCompletion(imageIdIndex) {
         const dimensionGroupNumber = this.flatImageIdIndexToDimensionGroupNumber(imageIdIndex);
@@ -16535,30 +16498,19 @@ class AnnotationDisplayTool extends _BaseTool__WEBPACK_IMPORTED_MODULE_1__/* ["d
         const { viewport } = enabledElement;
         return (0,_utilities_planar_filterAnnotationsForDisplay__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(viewport, annotations);
     }
-    createAnnotation(evt) {
-        const eventDetail = evt.detail;
-        const { currentPoints, element } = eventDetail;
-        const { world: worldPos } = currentPoints;
-        const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
-        const { viewport } = enabledElement;
-        const camera = viewport.getCamera();
-        const { viewPlaneNormal, viewUp, position: cameraPosition } = camera;
-        const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
-        const viewReference = viewport.getViewReference({ points: [worldPos] });
-        return {
+    static createAnnotation(...annotationBaseData) {
+        let annotation = {
+            annotationUID: null,
             highlighted: true,
             invalidated: true,
+            isLocked: false,
+            isVisible: true,
             metadata: {
-                toolName: this.getToolName(),
-                ...viewReference,
-                referencedImageId,
-                viewUp,
-                cameraPosition,
+                toolName: this.toolName,
             },
             data: {
-                cachedStats: {},
                 handles: {
-                    points: [],
+                    points: new Array(),
                     activeHandleIndex: null,
                     textBox: {
                         hasMoved: false,
@@ -16571,8 +16523,40 @@ class AnnotationDisplayTool extends _BaseTool__WEBPACK_IMPORTED_MODULE_1__/* ["d
                         },
                     },
                 },
+                cachedStats: {},
+                label: '',
             },
         };
+        for (const baseData of annotationBaseData) {
+            annotation = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.deepMerge(annotation, baseData);
+        }
+        return annotation;
+    }
+    createAnnotation(evt, points, ...annotationBaseData) {
+        const eventDetail = evt.detail;
+        const { currentPoints, element } = eventDetail;
+        const { world: worldPos } = currentPoints;
+        const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
+        const { viewport } = enabledElement;
+        const camera = viewport.getCamera();
+        const { viewPlaneNormal, viewUp, position: cameraPosition } = camera;
+        const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
+        const viewReference = viewport.getViewReference({ points: [worldPos] });
+        const annotation = AnnotationDisplayTool.createAnnotation({
+            metadata: {
+                toolName: this.getToolName(),
+                ...viewReference,
+                referencedImageId,
+                viewUp,
+                cameraPosition,
+            },
+            data: {
+                handles: {
+                    points: points || [],
+                },
+            },
+        }, ...annotationBaseData);
+        return annotation;
     }
     getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp) {
         const targetId = this.getTargetId(viewport);
@@ -18991,6 +18975,8 @@ var vtkWebGPUShaderCache$1 = {
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(71851);
 /* harmony import */ var _utilities_deepClone__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(99949);
 /* harmony import */ var _utilities_updatePlaneRestriction__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(41365);
+/* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(26896);
+
 
 
 
@@ -19020,7 +19006,10 @@ class Viewport {
         paletteLut: true,
     }; }
     constructor(props) {
-        this.insetImageMultiplier = 1.1;
+        this.insetImageMultiplier = (0,_init__WEBPACK_IMPORTED_MODULE_17__/* .getConfiguration */ .D0)().rendering
+            ?.useLegacyCameraFOV
+            ? 1.1
+            : 1;
         this.flipHorizontal = false;
         this.flipVertical = false;
         this.viewportStatus = _enums_ViewportStatus__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A.NO_DATA;
@@ -19518,7 +19507,19 @@ class Viewport {
             const idx = [middleIJK[0], middleIJK[1], middleIJK[2]];
             imageData.indexToWorld(idx, focalPoint);
         }
-        const { widthWorld, heightWorld } = this._getWorldDistanceViewUpAndViewRight(bounds, viewUp, viewPlaneNormal);
+        let widthWorld;
+        let heightWorld;
+        const config = (0,_init__WEBPACK_IMPORTED_MODULE_17__/* .getConfiguration */ .D0)();
+        const useLegacyMethod = config.rendering?.useLegacyCameraFOV ?? false;
+        if (imageData && !useLegacyMethod) {
+            const extent = imageData.getExtent();
+            const spacing = imageData.getSpacing();
+            widthWorld = (extent[1] - extent[0]) * spacing[0];
+            heightWorld = (extent[3] - extent[2]) * spacing[1];
+        }
+        else {
+            ({ widthWorld, heightWorld } = this._getWorldDistanceViewUpAndViewRight(bounds, viewUp, viewPlaneNormal));
+        }
         const canvasSize = [this.sWidth, this.sHeight];
         const boundsAspectRatio = widthWorld / heightWorld;
         const canvasAspectRatio = canvasSize[0] / canvasSize[1];
@@ -33814,9 +33815,13 @@ const defaultConfig = {
     rendering: {
         useCPURendering: false,
         preferSizeOverAccuracy: false,
+        useLegacyCameraFOV: false,
         strictZSpacingForVolumeViewport: true,
         renderingEngineMode: enums.RenderingEngineModeEnum.ContextPool,
         webGlContextCount: 7,
+        volumeRendering: {
+            sampleDistanceMultiplier: 1,
+        },
     },
     debug: {
         statsOverlay: false,
@@ -43299,6 +43304,29 @@ function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
 class VolumeViewport3D extends _BaseVolumeViewport__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A {
     constructor(props) {
         super(props);
+        this.setSampleDistanceMultiplier = (multiplier) => {
+            const actors = this.getActors();
+            actors.forEach((actorEntry) => {
+                if ((0,_utilities_actorCheck__WEBPACK_IMPORTED_MODULE_5__/* .actorIsA */ .N)(actorEntry, 'vtkVolume')) {
+                    const actor = actorEntry.actor;
+                    const mapper = actor.getMapper();
+                    if (mapper && mapper.getInputData) {
+                        const imageData = mapper.getInputData();
+                        if (imageData) {
+                            const spacing = imageData.getSpacing();
+                            const defaultSampleDistance = (spacing[0] + spacing[1] + spacing[2]) / 6;
+                            const sampleDistanceMultiplier = multiplier || 1;
+                            let sampleDistance = defaultSampleDistance * sampleDistanceMultiplier;
+                            if (sampleDistance !== undefined && mapper.setSampleDistance) {
+                                const currentSampleDistance = mapper.getSampleDistance();
+                                mapper.setSampleDistance(sampleDistance);
+                            }
+                        }
+                    }
+                }
+            });
+            this.render();
+        };
         this.getNumberOfSlices = () => {
             return 1;
         };
@@ -50556,6 +50584,8 @@ class Transform {
 /* harmony import */ var _helpers_getCameraVectors__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(23465);
 /* harmony import */ var _helpers_isContextPoolRenderingEngine__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(27685);
 /* harmony import */ var _constants_mprCameraValues__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(91004);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(15327);
+
 
 
 
@@ -51279,7 +51309,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_18__/* ["def
         };
         (0,_utilities_triggerEvent__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .A)(this.element, _enums__WEBPACK_IMPORTED_MODULE_6__.Events.COLORMAP_MODIFIED, eventDetail);
     }
-    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, } = {}, volumeId, suppressEvents = false) {
+    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, sampleDistanceMultiplier, } = {}, volumeId, suppressEvents = false) {
         if (this.globalDefaultProperties == null) {
             this.setDefaultProperties({
                 voiRange,
@@ -51317,6 +51347,9 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_18__/* ["def
         if (slabThickness !== undefined) {
             this.setSlabThickness(slabThickness);
         }
+        if (sampleDistanceMultiplier !== undefined) {
+            this.setSampleDistanceMultiplier(sampleDistanceMultiplier);
+        }
     }
     resetToDefaultProperties(volumeId) {
         const properties = this.globalDefaultProperties;
@@ -51339,8 +51372,8 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_18__/* ["def
             this.setSlabThickness(properties.slabThickness);
             this.viewportProperties.slabThickness = properties.slabThickness;
         }
-        if (properties.preset !== undefined) {
-            this.setPreset(properties.preset, volumeId, false);
+        if (properties.sampleDistanceMultiplier !== undefined) {
+            this.setSampleDistanceMultiplier(properties.sampleDistanceMultiplier);
         }
         if (properties.preset !== undefined) {
             this.setPreset(properties.preset, volumeId, false);
@@ -51374,6 +51407,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_18__/* ["def
             });
         }
     }
+    setSampleDistanceMultiplier(multiplier) { }
     async setVolumes(volumeInputArray, immediate = false, suppressEvents = false) {
         const volumeId = volumeInputArray[0].volumeId;
         const firstImageVolume = _cache_cache__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Ay.getVolume(volumeId);
@@ -57605,11 +57639,11 @@ function triggerAnnotationRender(element) {
 
 
 function fetchArrayBuffer({ url, signal, onload, loaderOptions, }) {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
         const xhr = new XMLHttpRequest();
         xhr.open('GET', url, true);
         const defaultHeaders = {};
-        const beforeSendHeaders = loaderOptions.beforeSend(xhr, defaultHeaders);
+        const beforeSendHeaders = await loaderOptions.beforeSend(xhr, defaultHeaders);
         const headers = Object.assign({}, defaultHeaders, beforeSendHeaders);
         xhr.responseType = 'arraybuffer';
         Object.keys(headers).forEach(function (key) {
@@ -64012,7 +64046,8 @@ class RectangleROIStartEndThresholdTool extends _annotation_RectangleROITool__WE
             this._deactivateModify(element);
             this._deactivateDraw(element);
             (0,_cursors_elementCursor__WEBPACK_IMPORTED_MODULE_12__.resetElementCursor)(element);
-            const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
+            const { metadata } = annotation;
+            const { enabledElement } = metadata;
             this.editData = null;
             this.isDrawing = false;
             if (this.isHandleOutsideImage &&
@@ -64048,6 +64083,7 @@ class RectangleROIStartEndThresholdTool extends _annotation_RectangleROITool__WE
                 const { annotationUID, data, metadata } = annotation;
                 const { startCoordinate, endCoordinate } = data;
                 const { points, activeHandleIndex } = data.handles;
+                const { enabledElement: annotationEnabledElement } = metadata;
                 const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
                 styleSpecifier.annotationUID = annotationUID;
                 const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
@@ -64078,8 +64114,12 @@ class RectangleROIStartEndThresholdTool extends _annotation_RectangleROITool__WE
                     roundedCoord > Math.max(roundedStartCoord, roundedEndCoord)) {
                     continue;
                 }
-                if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, enabledElement);
+                const iteratorVolumeIDs = annotationEnabledElement.viewport?.volumeIds.values();
+                for (const volumeId of iteratorVolumeIDs) {
+                    if (annotation.invalidated &&
+                        annotation.metadata.volumeId === volumeId) {
+                        this._throttledCalculateCachedStats(annotation, annotationEnabledElement);
+                    }
                 }
                 let firstOrLastSlice = false;
                 if (roundedCoord === roundedStartCoord ||
@@ -68239,7 +68279,7 @@ function isContourSegmentationAnnotation(annotation) {
 
 "use strict";
 /* unused harmony export version */
-const version = '3.32.12';
+const version = '4.0.0';
 
 
 /***/ }),
@@ -89562,7 +89602,9 @@ function createVolumeMapper(imageData, vtkOpenGLTexture) {
     }
     volumeMapper.setInputData(imageData);
     const spacing = imageData.getSpacing();
-    const sampleDistance = (spacing[0] + spacing[1] + spacing[2]) / 6;
+    const sampleDistanceMultiplier = (0,_init__WEBPACK_IMPORTED_MODULE_1__/* .getConfiguration */ .D0)().rendering?.volumeRendering?.sampleDistanceMultiplier ||
+        1;
+    const sampleDistance = (sampleDistanceMultiplier * (spacing[0] + spacing[1] + spacing[2])) / 6;
     volumeMapper.setMaximumSamplesPerRay(4000);
     volumeMapper.setSampleDistance(sampleDistance);
     volumeMapper.setScalarTexture(vtkOpenGLTexture);

package/dist/{9856.bundle.346af50f988d7bd3dd50.js → 9856.bundle.4a338f5f69c7082091e0.js}

@@ -7628,48 +7628,13 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .Annotation
         const eventDetail = evt.detail;
         const { currentPoints, element } = eventDetail;
         const worldPos = currentPoints.world;
-        const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
-        const { viewport, renderingEngine } = enabledElement;
         this.isDrawing = true;
-        const camera = viewport.getCamera();
-        const { viewPlaneNormal, viewUp } = camera;
-        const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
-        const FrameOfReferenceUID = viewport.getFrameOfReferenceUID();
-        const annotation = {
-            highlighted: true,
-            invalidated: true,
-            metadata: {
-                toolName: this.getToolName(),
-                viewPlaneNormal: [...viewPlaneNormal],
-                viewUp: [...viewUp],
-                FrameOfReferenceUID,
-                referencedImageId,
-                ...viewport.getViewReference({ points: [worldPos] }),
-            },
-            data: {
-                handles: {
-                    points: [
-                        [...worldPos],
-                        [...worldPos],
-                        [...worldPos],
-                        [...worldPos],
-                    ],
-                    textBox: {
-                        hasMoved: false,
-                        worldPosition: [0, 0, 0],
-                        worldBoundingBox: {
-                            topLeft: [0, 0, 0],
-                            topRight: [0, 0, 0],
-                            bottomLeft: [0, 0, 0],
-                            bottomRight: [0, 0, 0],
-                        },
-                    },
-                    activeHandleIndex: null,
-                },
-                label: '',
-                cachedStats: {},
-            },
-        };
+        const annotation = this.createAnnotation(evt, [
+            [...worldPos],
+            [...worldPos],
+            [...worldPos],
+            [...worldPos],
+        ]);
         (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_5__.addAnnotation)(annotation, element);
         const viewportIdsToRender = (0,_utilities_viewportFilters__WEBPACK_IMPORTED_MODULE_12__.getViewportIdsWithToolToRender)(element, this.getToolName());
         this.editData = {