@ohif/app 3.8.0-beta.82 → 3.8.0-beta.83

package/dist/{217.bundle.d44bbaa50b6fa563fe15.js → 217.bundle.c8c6e6cc3a615ceb5db3.js}

@@ -1,6 +1,6 @@
 (globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[217,183,141],{
 
-/***/ 44656:
+/***/ 73868:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -37,7 +37,7 @@ __webpack_require__.d(__webpack_exports__, {
   volumeLoader: () => (/* reexport */ volumeLoader_namespaceObject)
 });
 
-// UNUSED EXPORTS: ImageVolume, ProgressiveRetrieveImages, RenderingEngine, Surface, Viewport, createVolumeActor, createVolumeMapper, getOrCreateCanvas, getShouldUseCPURendering, getShouldUseSharedArrayBuffer, imageRetrievalPoolManager, init, isCornerstoneInitialized, registerImageLoader, requestPoolManager, resetUseCPURendering, resetUseSharedArrayBuffer, setConfiguration, setPreferSizeOverAccuracy, setUseCPURendering, setUseSharedArrayBuffer, setVolumesForViewports
+// UNUSED EXPORTS: ImageVolume, ProgressiveRetrieveImages, RenderingEngine, Surface, Viewport, canRenderFloatTextures, createVolumeActor, createVolumeMapper, getOrCreateCanvas, getShouldUseCPURendering, getShouldUseSharedArrayBuffer, imageRetrievalPoolManager, init, isCornerstoneInitialized, registerImageLoader, requestPoolManager, resetUseCPURendering, resetUseSharedArrayBuffer, setConfiguration, setPreferSizeOverAccuracy, setUseCPURendering, setUseSharedArrayBuffer, setVolumesForViewports
 
 // NAMESPACE OBJECT: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/VideoEnums.js
 var VideoEnums_namespaceObject = {};
@@ -237,6 +237,7 @@ __webpack_require__.d(utilities_namespaceObject, {
   getVolumeSliceRangeInfo: () => (utilities_getVolumeSliceRangeInfo),
   getVolumeViewportScrollInfo: () => (utilities_getVolumeViewportScrollInfo),
   getVolumeViewportsContainingSameVolumes: () => (utilities_getVolumeViewportsContainingSameVolumes),
+  hasFloatScalingParameters: () => (hasFloatScalingParameters),
   hasNaNValues: () => (hasNaNValues),
   imageIdToURI: () => (imageIdToURI),
   imageRetrieveMetadataProvider: () => (utilities_imageRetrieveMetadataProvider),
@@ -3250,6 +3251,7 @@ let sharedArrayBufferMode = enums_SharedArrayBufferModes.TRUE;
 const defaultConfig = {
     gpuTier: undefined,
     detectGPUConfig: {},
+    isMobile: false,
     rendering: {
         useCPURendering: false,
         preferSizeOverAccuracy: false,
@@ -3261,6 +3263,7 @@ const defaultConfig = {
 let config = {
     gpuTier: undefined,
     detectGPUConfig: {},
+    isMobile: false,
     rendering: {
         useCPURendering: false,
         preferSizeOverAccuracy: false,
@@ -3294,11 +3297,42 @@ function hasSharedArrayBuffer() {
         return false;
     }
 }
+function _hasNorm16TextureSupport() {
+    const gl = _getGLContext();
+    if (gl) {
+        const ext = gl.getExtension('EXT_texture_norm16');
+        if (ext) {
+            return true;
+        }
+    }
+    return false;
+}
+function isMobile() {
+    const ua = navigator.userAgent;
+    return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
+}
+function isMobileIOS() {
+    return /iPhone|iPod/.test(navigator.platform);
+}
 async function init(configuration = config) {
     if (csRenderInitialized) {
         return csRenderInitialized;
     }
     config = deepMerge(defaultConfig, configuration);
+    config.isMobile = isMobile();
+    if (config.isMobile) {
+        if (isMobileIOS()) {
+            config.rendering.useNorm16Texture = _hasNorm16TextureSupport();
+            if (!config.rendering.useNorm16Texture) {
+                if (configuration.rendering?.preferSizeOverAccuracy) {
+                    config.rendering.preferSizeOverAccuracy = true;
+                }
+                else {
+                    console.log('norm16 texture not supported, you can turn on the preferSizeOverAccuracy flag to use native data type, but be aware of the inaccuracy of the rendering in high bits');
+                }
+            }
+        }
+    }
     const hasWebGLContext = _hasActiveWebGLContext();
     if (!hasWebGLContext) {
         console.log('CornerstoneRender: GPU not detected, using CPU rendering');
@@ -3333,6 +3367,16 @@ function setPreferSizeOverAccuracy(status) {
     csRenderInitialized = true;
     _updateRenderingPipelinesForAllViewports();
 }
+function canRenderFloatTextures() {
+    const isMobile = config.isMobile;
+    if (!isMobile) {
+        return true;
+    }
+    if (isMobileIOS()) {
+        return false;
+    }
+    return true;
+}
 function resetUseCPURendering() {
     config.rendering.useCPURendering = !_hasActiveWebGLContext();
     _updateRenderingPipelinesForAllViewports();
@@ -28650,14 +28694,16 @@ function loadImageToCanvas(options) {
                 errorCallback.call(this, error, imageId);
             });
         }
-        const { useNorm16Texture } = getConfiguration().rendering;
+        const { useNorm16Texture, preferSizeOverAccuracy } = getConfiguration().rendering;
+        const useNativeDataType = useNorm16Texture || preferSizeOverAccuracy;
         const options = {
             targetBuffer: {
-                type: useNorm16Texture ? undefined : 'Float32Array',
+                type: useNativeDataType ? undefined : 'Float32Array',
             },
             preScale: {
                 enabled: true,
             },
+            useNativeDataType,
             useRGBA: !!useCPURendering,
             requestType,
         };
@@ -30090,6 +30136,12 @@ function getBufferConfiguration(targetBufferType, length, options = {}) {
 }
 
 
+;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/hasFloatScalingParameters.js
+const hasFloatScalingParameters = (scalingParameters) => {
+    const hasFloatRescale = Object.values(scalingParameters).some((value) => typeof value === 'number' && !Number.isInteger(value));
+    return hasFloatRescale;
+};
+
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/generateVolumePropsFromImageIds.js
 
 
@@ -30102,6 +30154,7 @@ function getBufferConfiguration(targetBufferType, length, options = {}) {
 
 
 
+
 function generateVolumePropsFromImageIds(imageIds, volumeId) {
     const { useNorm16Texture, preferSizeOverAccuracy } = getConfiguration().rendering;
     const use16BitDataType = useNorm16Texture || preferSizeOverAccuracy;
@@ -30111,8 +30164,8 @@ function generateVolumePropsFromImageIds(imageIds, volumeId) {
     const scalingParameters = getScalingParameters(imageId);
     const hasNegativeRescale = scalingParameters.rescaleIntercept < 0 ||
         scalingParameters.rescaleSlope < 0;
-    const hasFloatRescale = scalingParameters.rescaleIntercept % 1 !== 0 ||
-        scalingParameters.rescaleSlope % 1 !== 0;
+    const floatAfterScale = hasFloatScalingParameters(scalingParameters);
+    const canRenderFloat = canRenderFloatTextures();
     const { BitsAllocated, PixelRepresentation, PhotometricInterpretation, ImageOrientationPatient, PixelSpacing, Columns, Rows, } = volumeMetadata;
     const rowCosineVec = esm/* vec3.fromValues */.eR.fromValues(ImageOrientationPatient[0], ImageOrientationPatient[1], ImageOrientationPatient[2]);
     const colCosineVec = esm/* vec3.fromValues */.eR.fromValues(ImageOrientationPatient[3], ImageOrientationPatient[4], ImageOrientationPatient[5]);
@@ -30150,7 +30203,7 @@ function generateVolumePropsFromImageIds(imageIds, volumeId) {
                 : new Uint8Array(length * numComponents);
             break;
         case 16:
-            if (!use16BitDataType || hasFloatRescale) {
+            if (!use16BitDataType || (canRenderFloat && floatAfterScale)) {
                 sizeInBytes = length * 4;
                 scalarData = useSharedArrayBuffer
                     ? utilities_createFloat32SharedArray(length)
@@ -30731,6 +30784,7 @@ async function getVOIFromMinMax(imageVolume, useNativeDataType) {
         },
         priority: PRIORITY,
         requestType: REQUEST_TYPE,
+        useNativeDataType,
         preScale: {
             enabled: true,
             scalingParameters: scalingParametersToUse,
@@ -30738,7 +30792,7 @@ async function getVOIFromMinMax(imageVolume, useNativeDataType) {
     };
     let image = esm_cache.getImage(imageId);
     if (!imageVolume.referencedImageIds?.length) {
-        image = await loadAndCacheImage(imageId, options);
+        image = await loadAndCacheImage(imageId, { ...options, ignoreCache: true });
     }
     const imageScalarData = image
         ? image.getPixelData()
@@ -33480,6 +33534,7 @@ function hexToRgb(hex) {
 
 
 
+
 
 
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/VolumeViewport.js
@@ -36433,6 +36488,7 @@ class StackViewport extends RenderingEngine_Viewport {
             },
             useRGBA: false,
             transferSyntaxUID,
+            useNativeDataType: this.useNativeDataType,
             priority: 5,
             requestType: enums_RequestType.Interaction,
             additionalDetails,
@@ -44092,8 +44148,8 @@ function getDefinedCursors(context, symbol) {
 const standardCursorNames = STANDARD_CURSORS.values();
 
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/cursors/ImageMouseCursor.js
 
 
@@ -45342,6 +45398,8 @@ var ChangeTypes;
 var Events;
 (function (Events) {
     Events["TOOL_ACTIVATED"] = "CORNERSTONE_TOOLS_TOOL_ACTIVATED";
+    Events["TOOLGROUP_VIEWPORT_ADDED"] = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_ADDED";
+    Events["TOOLGROUP_VIEWPORT_REMOVED"] = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_REMOVED";
     Events["TOOL_MODE_CHANGED"] = "CORNERSTONE_TOOLS_TOOL_MODE_CHANGED";
     Events["ANNOTATION_ADDED"] = "CORNERSTONE_TOOLS_ANNOTATION_ADDED";
     Events["ANNOTATION_COMPLETED"] = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED";
@@ -45549,8 +45607,8 @@ var WorkerTypes_ChangeTypes;
 
 // UNUSED EXPORTS: annotationInterpolationEventDispatcher, cameraModifiedEventDispatcher, imageRenderedEventDispatcher, imageSpacingCalibratedEventDispatcher, keyboardToolEventDispatcher, mouseToolEventDispatcher, touchToolEventDispatcher
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/triggerAnnotationRender.js
 var triggerAnnotationRender = __webpack_require__(6805);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/eventDispatchers/imageRenderedEventDispatcher.js
@@ -45750,7 +45808,7 @@ const annotationInterpolationEventDispatcher_disable = function () {
 /* harmony export */   r: () => (/* binding */ createPolylineHole)
 /* harmony export */ });
 /* unused harmony export default */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _utilities_getViewportsForAnnotation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65903);
 /* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21013);
 /* harmony import */ var _utilities_viewportFilters__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(90252);
@@ -46097,8 +46155,8 @@ const segmentationRepresentationModifiedListener = function (evt) {
 var enums_SegmentationRepresentations = __webpack_require__(83946);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/segmentationState.js + 2 modules
 var segmentationState = __webpack_require__(30322);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/store/ToolGroupManager/index.js
 var ToolGroupManager = __webpack_require__(52610);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/eventListeners/segmentation/labelmap/onLabelmapSegmentationDataModified.js
@@ -46477,8 +46535,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // UNUSED EXPORTS: AdvancedMagnifyTool, AngleTool, AnnotationDisplayTool, AnnotationTool, ArrowAnnotateTool, BaseTool, BidirectionalTool, BrushTool, CONSTANTS, CircleROIStartEndThresholdTool, CircleROITool, CircleScissorsTool, CobbAngleTool, CrosshairsTool, DragProbeTool, EllipticalROITool, Enums, EraserTool, KeyImageTool, LengthTool, LivewireContourSegmentationTool, LivewireContourTool, MIPJumpToClickTool, MagnifyTool, OrientationMarkerTool, OverlayGridTool, PaintFillTool, PanTool, PlanarFreehandContourSegmentationTool, PlanarFreehandROITool, PlanarRotateTool, ProbeTool, RectangleROIStartEndThresholdTool, RectangleROIThresholdTool, RectangleROITool, RectangleScissorsTool, ReferenceCursors, ReferenceLines, ReferenceLinesTool, ScaleOverlayTool, SegmentSelectTool, SegmentationDisplayTool, SegmentationIntersectionTool, SphereScissorsTool, SplineContourSegmentationTool, SplineROITool, StackScrollMouseWheelTool, StackScrollTool, Synchronizer, SynchronizerManager, ToolGroupManager, TrackballRotateTool, Types, UltrasoundDirectionalTool, VideoRedactionTool, VolumeRotateMouseWheelTool, WindowLevelTool, ZoomTool, addTool, annotation, cancelActiveManipulations, cursors, destroy, drawing, init, removeTool, state, synchronizers, utilities
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // 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/stateManagement/segmentation/segmentationState.js + 2 modules
@@ -47357,7 +47415,7 @@ VideoRedactionTool.toolName = 'VideoRedaction';
 /* harmony export */ });
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(48463);
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73868);
 /* harmony import */ var _annotationLocking__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(48428);
 /* harmony import */ var _annotationVisibility__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21009);
 
@@ -47564,7 +47622,7 @@ const defaultFrameOfReferenceSpecificAnnotationManager = new FrameOfReferenceSpe
 /* harmony export */   isAnnotationLocked: () => (/* binding */ isAnnotationLocked)
 /* harmony export */ });
 /* unused harmony exports setAnnotationLocked, getAnnotationsLocked, getAnnotationsLockedCount, unlockAllAnnotations */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 
 
@@ -47667,7 +47725,7 @@ function getIsLocked() {
 /* harmony export */   setAnnotationSelected: () => (/* binding */ setAnnotationSelected)
 /* harmony export */ });
 /* unused harmony exports getAnnotationsSelected, getAnnotationsSelectedByToolName, getAnnotationsSelectedCount */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _annotationState__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38296);
 
@@ -47767,7 +47825,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   resetAnnotationManager: () => (/* binding */ resetAnnotationManager),
 /* harmony export */   setAnnotationManager: () => (/* binding */ setAnnotationManager)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _FrameOfReferenceSpecificAnnotationManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(22581);
 /* harmony import */ var _helpers_state__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(54177);
@@ -47896,7 +47954,7 @@ function invalidateAnnotation(annotation) {
 /* harmony export */   isAnnotationVisible: () => (/* binding */ isAnnotationVisible)
 /* harmony export */ });
 /* unused harmony exports setAnnotationVisibility, showAllAnnotations */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _annotationState__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38296);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84901);
 /* harmony import */ var _annotationSelection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42351);
@@ -48242,7 +48300,7 @@ var ToolStyle = __webpack_require__(31862);
 /* harmony export */   _3: () => (/* binding */ triggerAnnotationAddedForFOR),
 /* harmony export */   dZ: () => (/* binding */ triggerAnnotationCompleted)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52610);
 
@@ -48345,8 +48403,8 @@ var annotationState = __webpack_require__(38296);
 var annotationVisibility = __webpack_require__(21009);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js
 var FrameOfReferenceSpecificAnnotationManager = __webpack_require__(22581);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/enums/Events.js
 var enums_Events = __webpack_require__(28117);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/annotation/AnnotationGroup.js
@@ -48571,7 +48629,7 @@ function getSegmentVisibility(toolGroupId, segmentationRepresentationUID, segmen
 /* harmony export */   jU: () => (/* binding */ getSurfaceActorUID)
 /* harmony export */ });
 /* unused harmony exports generateCacheId, updatePolyDataCache */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21013);
 /* harmony import */ var _polySeg_registerPolySegWorker__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(65807);
@@ -48837,8 +48895,8 @@ function addSegmentations(segmentationInputArray) {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/store/ToolGroupManager/index.js
 var ToolGroupManager = __webpack_require__(52610);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/config/segmentationConfig.js
 
 function getGlobalConfig() {
@@ -50243,7 +50301,7 @@ async function canConvertFromTo(fromRepresentationType, toRepresentationType) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   b: () => (/* binding */ registerPolySegWorker)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 let registered = false;
 function registerPolySegWorker() {
@@ -50352,8 +50410,8 @@ __webpack_require__.d(__webpack_exports__, {
 // EXTERNAL MODULE: ../../../node_modules/lodash.clonedeep/index.js
 var lodash_clonedeep = __webpack_require__(48463);
 var lodash_clonedeep_default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/enums/index.js + 3 modules
 var enums = __webpack_require__(84901);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/displayTools/Contour/contourConfig.js
@@ -50807,7 +50865,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   triggerSegmentationRepresentationModified: () => (/* binding */ triggerSegmentationRepresentationModified),
 /* harmony export */   triggerSegmentationRepresentationRemoved: () => (/* binding */ triggerSegmentationRepresentationRemoved)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30322);
 /* harmony import */ var _utilities_segmentation_getUniqueSegmentIndices__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(94510);
@@ -50879,7 +50937,7 @@ function triggerSegmentationDataModified(segmentationId, modifiedSlicesToUse) {
 /***/ ((__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) => {
 
 "use strict";
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 class Synchronizer {
     constructor(synchronizerId, eventName, eventHandler, options) {
@@ -51201,7 +51259,7 @@ function destroySynchronizer(synchronizerId) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61738);
 
 
@@ -51382,8 +51440,8 @@ function _appendChild(newNode, referenceNode) {
     referenceNode.querySelector('div.viewport-element').appendChild(newNode);
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/store/filterToolsWithAnnotationsForElement.js
 var store_filterToolsWithAnnotationsForElement = __webpack_require__(9933);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/getToolsWithModesForElement.js
@@ -51589,7 +51647,7 @@ function resetSvgNodeCache() {
 
 "use strict";
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44753);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73868);
 /* harmony import */ var _utilities_getCalibratedUnits__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24592);
 /* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21013);
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(96214);
@@ -52212,22 +52270,29 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_4__/* .Annotation
                     continue;
                 }
                 const { imageData, dimensions } = image;
-                const scale = (0,_utilities_getCalibratedUnits__WEBPACK_IMPORTED_MODULE_2__/* .getCalibratedScale */ .yH)(image);
-                const dist1 = this._calculateLength(worldPos1, worldPos2) / scale;
-                const dist2 = this._calculateLength(worldPos3, worldPos4) / scale;
-                const length = dist1 > dist2 ? dist1 : dist2;
-                const width = dist1 > dist2 ? dist2 : dist1;
                 const index1 = transformWorldToIndex(imageData, worldPos1);
                 const index2 = transformWorldToIndex(imageData, worldPos2);
                 const index3 = transformWorldToIndex(imageData, worldPos3);
                 const index4 = transformWorldToIndex(imageData, worldPos4);
+                const handles1 = [index1, index2];
+                const handles2 = [index3, index4];
+                const { scale: scale1, units: units1 } = (0,_utilities_getCalibratedUnits__WEBPACK_IMPORTED_MODULE_2__/* .getCalibratedLengthUnitsAndScale */ .Op)(image, handles1);
+                const { scale: scale2, units: units2 } = (0,_utilities_getCalibratedUnits__WEBPACK_IMPORTED_MODULE_2__/* .getCalibratedLengthUnitsAndScale */ .Op)(image, handles2);
+                const dist1 = this._calculateLength(worldPos1, worldPos2) / scale1;
+                const dist2 = this._calculateLength(worldPos3, worldPos4) / scale2;
+                const length = dist1 > dist2 ? dist1 : dist2;
+                const width = dist1 > dist2 ? dist2 : dist1;
+                const lengthUnit = dist1 > dist2 ? units1 : units2;
+                const widthUnit = dist1 > dist2 ? units2 : units1;
                 this._isInsideVolume(index1, index2, index3, index4, dimensions)
                     ? (this.isHandleOutsideImage = false)
                     : (this.isHandleOutsideImage = true);
                 cachedStats[targetId] = {
                     length,
                     width,
-                    unit: (0,_utilities_getCalibratedUnits__WEBPACK_IMPORTED_MODULE_2__/* .getCalibratedLengthUnits */ .Nx)(null, image),
+                    unit: units1,
+                    lengthUnit,
+                    widthUnit,
                 };
             }
             annotation.invalidated = false;
@@ -52315,7 +52380,7 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_4__/* .Annotation
 }
 function defaultGetTextLines(data, targetId) {
     const { cachedStats, label } = data;
-    const { length, width, unit } = cachedStats[targetId];
+    const { length, width, unit, lengthUnit, widthUnit } = cachedStats[targetId];
     const textLines = [];
     if (label) {
         textLines.push(label);
@@ -52323,7 +52388,7 @@ function defaultGetTextLines(data, targetId) {
     if (length === undefined) {
         return textLines;
     }
-    textLines.push(`L: ${(0,_utilities__WEBPACK_IMPORTED_MODULE_3__.roundNumber)(length)} ${unit}`, `W: ${(0,_utilities__WEBPACK_IMPORTED_MODULE_3__.roundNumber)(width)} ${unit}`);
+    textLines.push(`L: ${(0,_utilities__WEBPACK_IMPORTED_MODULE_3__.roundNumber)(length)} ${lengthUnit || unit}`, `W: ${(0,_utilities__WEBPACK_IMPORTED_MODULE_3__.roundNumber)(width)} ${widthUnit || unit}`);
     return textLines;
 }
 BidirectionalTool.toolName = 'Bidirectional';
@@ -52339,7 +52404,7 @@ BidirectionalTool.toolName = 'Bidirectional';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(87682);
 /* harmony import */ var _PlanarFreehandROITool__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(78279);
 
@@ -52383,7 +52448,7 @@ PlanarFreehandContourSegmentationTool.toolName =
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _BaseTool__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(22338);
 /* harmony import */ var _stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38296);
 /* harmony import */ var _utilities_triggerAnnotationRender__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6805);
@@ -52466,7 +52531,7 @@ AnnotationDisplayTool.toolName = 'AnnotationDisplayTool';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44753);
 /* harmony import */ var _AnnotationDisplayTool__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28062);
 /* harmony import */ var _stateManagement_annotation_annotationLocking__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(48428);
@@ -52666,7 +52731,7 @@ AnnotationTool.toolName = 'AnnotationTool';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums_ToolModes__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12468);
 
 
@@ -52873,7 +52938,7 @@ function isValidLabelmapConfig(config) {
 /* unused harmony exports render, removeSegmentationRepresentation */
 /* harmony import */ var _kitware_vtk_js_Common_DataModel_PiecewiseFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29853);
 /* harmony import */ var _kitware_vtk_js_Rendering_Core_ColorTransferFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37452);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(73868);
 /* harmony import */ var _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(83946);
 /* harmony import */ var _stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30322);
 /* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(52610);
@@ -53168,8 +53233,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/index.js
 var base = __webpack_require__(96214);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/PanTool.js
 
 
@@ -58756,30 +58821,30 @@ class RectangleROITool extends base/* AnnotationTool */.EC {
                     continue;
                 }
                 const { dimensions, imageData, metadata } = image;
-                const scalarData = 'getScalarData' in image ? image.getScalarData() : image.scalarData;
-                const worldPos1Index = RectangleROITool_transformWorldToIndex(imageData, worldPos1);
-                worldPos1Index[0] = Math.floor(worldPos1Index[0]);
-                worldPos1Index[1] = Math.floor(worldPos1Index[1]);
-                worldPos1Index[2] = Math.floor(worldPos1Index[2]);
-                const worldPos2Index = RectangleROITool_transformWorldToIndex(imageData, worldPos2);
-                worldPos2Index[0] = Math.floor(worldPos2Index[0]);
-                worldPos2Index[1] = Math.floor(worldPos2Index[1]);
-                worldPos2Index[2] = Math.floor(worldPos2Index[2]);
-                if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) {
+                const pos1Index = RectangleROITool_transformWorldToIndex(imageData, worldPos1);
+                pos1Index[0] = Math.floor(pos1Index[0]);
+                pos1Index[1] = Math.floor(pos1Index[1]);
+                pos1Index[2] = Math.floor(pos1Index[2]);
+                const pos2Index = RectangleROITool_transformWorldToIndex(imageData, worldPos2);
+                pos2Index[0] = Math.floor(pos2Index[0]);
+                pos2Index[1] = Math.floor(pos2Index[1]);
+                pos2Index[2] = Math.floor(pos2Index[2]);
+                if (this._isInsideVolume(pos1Index, pos2Index, dimensions)) {
                     this.isHandleOutsideImage = false;
-                    const iMin = Math.min(worldPos1Index[0], worldPos2Index[0]);
-                    const iMax = Math.max(worldPos1Index[0], worldPos2Index[0]);
-                    const jMin = Math.min(worldPos1Index[1], worldPos2Index[1]);
-                    const jMax = Math.max(worldPos1Index[1], worldPos2Index[1]);
-                    const kMin = Math.min(worldPos1Index[2], worldPos2Index[2]);
-                    const kMax = Math.max(worldPos1Index[2], worldPos2Index[2]);
+                    const iMin = Math.min(pos1Index[0], pos2Index[0]);
+                    const iMax = Math.max(pos1Index[0], pos2Index[0]);
+                    const jMin = Math.min(pos1Index[1], pos2Index[1]);
+                    const jMax = Math.max(pos1Index[1], pos2Index[1]);
+                    const kMin = Math.min(pos1Index[2], pos2Index[2]);
+                    const kMax = Math.max(pos1Index[2], pos2Index[2]);
                     const boundsIJK = [
                         [iMin, iMax],
                         [jMin, jMax],
                         [kMin, kMax],
                     ];
                     const { worldWidth, worldHeight } = (0,getWorldWidthAndHeightFromCorners/* default */.A)(viewPlaneNormal, viewUp, worldPos1, worldPos2);
-                    const scale = (0,getCalibratedUnits/* getCalibratedScale */.yH)(image);
+                    const handles = [pos1Index, pos2Index];
+                    const { scale, areaUnits } = (0,getCalibratedUnits/* getCalibratedLengthUnitsAndScale */.Op)(image, handles);
                     const area = Math.abs(worldWidth * worldHeight) / (scale * scale);
                     const modalityUnitOptions = {
                         isPreScaled: (0,isViewportPreScaled/* isViewportPreScaled */.u)(viewport, targetId),
@@ -58796,7 +58861,7 @@ class RectangleROITool extends base/* AnnotationTool */.EC {
                         max: stats.max?.value,
                         statsArray: stats.array,
                         pointsInShape: pointsInShape,
-                        areaUnit: (0,getCalibratedUnits/* getCalibratedAreaUnits */.Ss)(null, image),
+                        areaUnit: areaUnits,
                         modalityUnit,
                     };
                 }
@@ -59279,7 +59344,7 @@ class EllipticalROITool extends base/* AnnotationTool */.EC {
                         stdDev: null,
                         areaUnit: null,
                     };
-                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                    this._calculateCachedStats(annotation, viewport, renderingEngine);
                 }
                 else if (annotation.invalidated) {
                     this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
@@ -59376,7 +59441,7 @@ class EllipticalROITool extends base/* AnnotationTool */.EC {
             }
             return renderStatus;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine) => {
             const data = annotation.data;
             const { element } = viewport;
             const { points } = data.handles;
@@ -59395,23 +59460,23 @@ class EllipticalROITool extends base/* AnnotationTool */.EC {
                 if (!image) {
                     continue;
                 }
-                const { dimensions, imageData, metadata, hasPixelSpacing } = image;
-                const worldPos1Index = EllipticalROITool_transformWorldToIndex(imageData, worldPos1);
-                worldPos1Index[0] = Math.floor(worldPos1Index[0]);
-                worldPos1Index[1] = Math.floor(worldPos1Index[1]);
-                worldPos1Index[2] = Math.floor(worldPos1Index[2]);
-                const worldPos2Index = EllipticalROITool_transformWorldToIndex(imageData, worldPos2);
-                worldPos2Index[0] = Math.floor(worldPos2Index[0]);
-                worldPos2Index[1] = Math.floor(worldPos2Index[1]);
-                worldPos2Index[2] = Math.floor(worldPos2Index[2]);
-                if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) {
+                const { dimensions, imageData, metadata } = image;
+                const pos1Index = EllipticalROITool_transformWorldToIndex(imageData, worldPos1);
+                pos1Index[0] = Math.floor(pos1Index[0]);
+                pos1Index[1] = Math.floor(pos1Index[1]);
+                pos1Index[2] = Math.floor(pos1Index[2]);
+                const post2Index = EllipticalROITool_transformWorldToIndex(imageData, worldPos2);
+                post2Index[0] = Math.floor(post2Index[0]);
+                post2Index[1] = Math.floor(post2Index[1]);
+                post2Index[2] = Math.floor(post2Index[2]);
+                if (this._isInsideVolume(pos1Index, post2Index, dimensions)) {
                     this.isHandleOutsideImage = false;
-                    const iMin = Math.min(worldPos1Index[0], worldPos2Index[0]);
-                    const iMax = Math.max(worldPos1Index[0], worldPos2Index[0]);
-                    const jMin = Math.min(worldPos1Index[1], worldPos2Index[1]);
-                    const jMax = Math.max(worldPos1Index[1], worldPos2Index[1]);
-                    const kMin = Math.min(worldPos1Index[2], worldPos2Index[2]);
-                    const kMax = Math.max(worldPos1Index[2], worldPos2Index[2]);
+                    const iMin = Math.min(pos1Index[0], post2Index[0]);
+                    const iMax = Math.max(pos1Index[0], post2Index[0]);
+                    const jMin = Math.min(pos1Index[1], post2Index[1]);
+                    const jMax = Math.max(pos1Index[1], post2Index[1]);
+                    const kMin = Math.min(pos1Index[2], post2Index[2]);
+                    const kMax = Math.max(pos1Index[2], post2Index[2]);
                     const boundsIJK = [
                         [iMin, iMax],
                         [jMin, jMax],
@@ -59430,7 +59495,8 @@ class EllipticalROITool extends base/* AnnotationTool */.EC {
                     };
                     const { worldWidth, worldHeight } = (0,getWorldWidthAndHeightFromTwoPoints/* default */.A)(viewPlaneNormal, viewUp, worldPos1, worldPos2);
                     const isEmptyArea = worldWidth === 0 && worldHeight === 0;
-                    const scale = (0,getCalibratedUnits/* getCalibratedScale */.yH)(image);
+                    const handles = [pos1Index, post2Index];
+                    const { scale, areaUnits } = (0,getCalibratedUnits/* getCalibratedLengthUnitsAndScale */.Op)(image, handles);
                     const area = Math.abs(Math.PI * (worldWidth / 2) * (worldHeight / 2)) /
                         scale /
                         scale;
@@ -59450,7 +59516,7 @@ class EllipticalROITool extends base/* AnnotationTool */.EC {
                         statsArray: stats.array,
                         pointsInShape,
                         isEmptyArea,
-                        areaUnit: (0,getCalibratedUnits/* getCalibratedAreaUnits */.Ss)(null, image),
+                        areaUnit: areaUnits,
                         modalityUnit,
                     };
                 }
@@ -59995,21 +60061,21 @@ class CircleROITool extends base/* AnnotationTool */.EC {
                     continue;
                 }
                 const { dimensions, imageData, metadata, hasPixelSpacing } = image;
-                const worldPos1Index = CircleROITool_transformWorldToIndex(imageData, worldPos1);
-                worldPos1Index[0] = Math.floor(worldPos1Index[0]);
-                worldPos1Index[1] = Math.floor(worldPos1Index[1]);
-                worldPos1Index[2] = Math.floor(worldPos1Index[2]);
-                const worldPos2Index = CircleROITool_transformWorldToIndex(imageData, worldPos2);
-                worldPos2Index[0] = Math.floor(worldPos2Index[0]);
-                worldPos2Index[1] = Math.floor(worldPos2Index[1]);
-                worldPos2Index[2] = Math.floor(worldPos2Index[2]);
-                if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) {
-                    const iMin = Math.min(worldPos1Index[0], worldPos2Index[0]);
-                    const iMax = Math.max(worldPos1Index[0], worldPos2Index[0]);
-                    const jMin = Math.min(worldPos1Index[1], worldPos2Index[1]);
-                    const jMax = Math.max(worldPos1Index[1], worldPos2Index[1]);
-                    const kMin = Math.min(worldPos1Index[2], worldPos2Index[2]);
-                    const kMax = Math.max(worldPos1Index[2], worldPos2Index[2]);
+                const pos1Index = CircleROITool_transformWorldToIndex(imageData, worldPos1);
+                pos1Index[0] = Math.floor(pos1Index[0]);
+                pos1Index[1] = Math.floor(pos1Index[1]);
+                pos1Index[2] = Math.floor(pos1Index[2]);
+                const pos2Index = CircleROITool_transformWorldToIndex(imageData, worldPos2);
+                pos2Index[0] = Math.floor(pos2Index[0]);
+                pos2Index[1] = Math.floor(pos2Index[1]);
+                pos2Index[2] = Math.floor(pos2Index[2]);
+                if (this._isInsideVolume(pos1Index, pos2Index, dimensions)) {
+                    const iMin = Math.min(pos1Index[0], pos2Index[0]);
+                    const iMax = Math.max(pos1Index[0], pos2Index[0]);
+                    const jMin = Math.min(pos1Index[1], pos2Index[1]);
+                    const jMax = Math.max(pos1Index[1], pos2Index[1]);
+                    const kMin = Math.min(pos1Index[2], pos2Index[2]);
+                    const kMax = Math.max(pos1Index[2], pos2Index[2]);
                     const boundsIJK = [
                         [iMin, iMax],
                         [jMin, jMax],
@@ -60028,7 +60094,8 @@ class CircleROITool extends base/* AnnotationTool */.EC {
                     };
                     const { worldWidth, worldHeight } = (0,getWorldWidthAndHeightFromTwoPoints/* default */.A)(viewPlaneNormal, viewUp, worldPos1, worldPos2);
                     const isEmptyArea = worldWidth === 0 && worldHeight === 0;
-                    const scale = (0,getCalibratedUnits/* getCalibratedScale */.yH)(image);
+                    const handles = [pos1Index, pos2Index];
+                    const { scale, units, areaUnits } = (0,utilities.getCalibratedLengthUnitsAndScale)(image, handles);
                     const aspect = (0,getCalibratedUnits/* getCalibratedAspect */.CQ)(image);
                     const area = Math.abs(Math.PI *
                         (worldWidth / scale / 2) *
@@ -60051,9 +60118,9 @@ class CircleROITool extends base/* AnnotationTool */.EC {
                         statsArray: stats.array,
                         pointsInShape: pointsInShape,
                         isEmptyArea,
-                        areaUnit: (0,getCalibratedUnits/* getCalibratedAreaUnits */.Ss)(null, image),
+                        areaUnit: areaUnits,
                         radius: worldWidth / 2 / scale,
-                        radiusUnit: (0,getCalibratedUnits/* getCalibratedLengthUnits */.Nx)(null, image),
+                        radiusUnit: units,
                         perimeter: (2 * Math.PI * (worldWidth / 2)) / scale,
                         modalityUnit,
                     };
@@ -60569,13 +60636,27 @@ class SplineROITool extends ContourSegmentationBaseTool/* default */.A {
                 ]);
                 const deltaInX = gl_matrix_esm/* vec3.distance */.eR.distance(originalWorldPoint, deltaXPoint);
                 const deltaInY = gl_matrix_esm/* vec3.distance */.eR.distance(originalWorldPoint, deltaYPoint);
-                const scale = (0,utilities.getCalibratedScale)(image);
+                const { imageData } = image;
+                const { scale, areaUnits } = (0,utilities.getCalibratedLengthUnitsAndScale)(image, () => {
+                    const { maxX: canvasMaxX, maxY: canvasMaxY, minX: canvasMinX, minY: canvasMinY, } = utilities.math.polyline.getAABB(canvasCoordinates);
+                    const topLeftBBWorld = viewport.canvasToWorld([
+                        canvasMinX,
+                        canvasMinY,
+                    ]);
+                    const topLeftBBIndex = esm.utilities.transformWorldToIndex(imageData, topLeftBBWorld);
+                    const bottomRightBBWorld = viewport.canvasToWorld([
+                        canvasMaxX,
+                        canvasMaxY,
+                    ]);
+                    const bottomRightBBIndex = esm.utilities.transformWorldToIndex(imageData, bottomRightBBWorld);
+                    return [topLeftBBIndex, bottomRightBBIndex];
+                });
                 let area = utilities.math.polyline.getArea(canvasCoordinates) / scale / scale;
                 area *= deltaInX * deltaInY;
                 cachedStats[targetId] = {
                     Modality: metadata.Modality,
                     area,
-                    areaUnit: (0,utilities.getCalibratedAreaUnits)(null, image),
+                    areaUnit: areaUnits,
                 };
             }
             this.triggerAnnotationModified(annotation, enabledElement, enums.ChangeTypes.StatsUpdated);
@@ -65495,6 +65576,7 @@ var PolyData = __webpack_require__(27398);
 
 
 
+
 const OverlayMarkerType = {
     ANNOTATED_CUBE: 1,
     AXES: 2,
@@ -65546,25 +65628,18 @@ class OrientationMarkerTool extends base/* BaseTool */.oS {
     }) {
         super(toolProps, defaultToolProps);
         this._resizeObservers = new Map();
-        this.configuration_invalidated = true;
         this.onSetToolEnabled = () => {
             this.initViewports();
-            this.configuration_invalidated = true;
             this._subscribeToViewportEvents();
         };
         this.onSetToolActive = () => {
             this.initViewports();
-            this.configuration_invalidated = true;
             this._subscribeToViewportEvents();
         };
         this.onSetToolDisabled = () => {
             this.cleanUpData();
             this._unsubscribeToViewportNewVolumeSet();
         };
-        this.reset = () => {
-            this.configuration_invalidated = true;
-            this.initViewports();
-        };
         this._getViewportsInfo = () => {
             const viewports = (0,ToolGroupManager.getToolGroup)(this.toolGroupId).viewportsInfo;
             return viewports;
@@ -65578,35 +65653,56 @@ class OrientationMarkerTool extends base/* BaseTool */.oS {
             orientationWidget.updateViewport();
         };
         this.orientationMarkers = {};
-        this.configuration_invalidated = true;
     }
     static { this.CUBE = 1; }
     static { this.AXIS = 2; }
     static { this.VTPFILE = 3; }
     static { this.OVERLAY_MARKER_TYPES = OverlayMarkerType; }
     _unsubscribeToViewportNewVolumeSet() {
-        const viewportsInfo = this._getViewportsInfo();
-        viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
-            const { viewport } = (0,esm.getEnabledElementByIds)(viewportId, renderingEngineId);
-            const { element } = viewport;
-            element.removeEventListener(esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, this.reset);
-            const resizeObserver = this._resizeObservers.get(viewportId);
-            resizeObserver.unobserve(element);
+        const unsubscribe = () => {
+            const viewportsInfo = this._getViewportsInfo();
+            viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
+                const { viewport } = (0,esm.getEnabledElementByIds)(viewportId, renderingEngineId);
+                const { element } = viewport;
+                element.removeEventListener(esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, this.initViewports.bind(this));
+                const resizeObserver = this._resizeObservers.get(viewportId);
+                resizeObserver.unobserve(element);
+            });
+        };
+        esm.eventTarget.removeEventListener(enums.Events.TOOLGROUP_VIEWPORT_ADDED, (evt) => {
+            if (evt.detail.toolGroupId !== this.toolGroupId) {
+                return;
+            }
+            unsubscribe();
+            this.initViewports();
         });
     }
     _subscribeToViewportEvents() {
-        const viewportsInfo = this._getViewportsInfo();
-        viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
-            const { viewport } = (0,esm.getEnabledElementByIds)(viewportId, renderingEngineId);
-            const { element } = viewport;
-            element.addEventListener(esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, this.reset);
-            const resizeObserver = new ResizeObserver(() => {
-                setTimeout(() => {
-                    this.reset();
-                }, 100);
+        const subscribeToElementResize = () => {
+            const viewportsInfo = this._getViewportsInfo();
+            viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
+                const { viewport } = (0,esm.getEnabledElementByIds)(viewportId, renderingEngineId);
+                const { element } = viewport;
+                this.initViewports();
+                element.addEventListener(esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, this.initViewports.bind(this));
+                const resizeObserver = new ResizeObserver(() => {
+                    setTimeout(() => {
+                        const { viewport } = (0,esm.getEnabledElementByIds)(viewportId, renderingEngineId);
+                        this.resize(viewportId);
+                        viewport.render();
+                    }, 100);
+                });
+                resizeObserver.observe(element);
+                this._resizeObservers.set(viewportId, resizeObserver);
             });
-            resizeObserver.observe(element);
-            this._resizeObservers.set(viewportId, resizeObserver);
+        };
+        subscribeToElementResize();
+        esm.eventTarget.addEventListener(enums.Events.TOOLGROUP_VIEWPORT_ADDED, (evt) => {
+            if (evt.detail.toolGroupId !== this.toolGroupId) {
+                return;
+            }
+            subscribeToElementResize();
+            this.initViewports();
         });
     }
     cleanUpData() {
@@ -65686,7 +65782,6 @@ class OrientationMarkerTool extends base/* BaseTool */.oS {
         viewport.addWidget(this.getToolName(), orientationWidget);
         renderWindow.render();
         viewport.getRenderingEngine().render();
-        this.configuration_invalidated = false;
     }
     async createCustomActor() {
         const url = this.configuration.overlayConfiguration[OverlayMarkerType.CUSTOM]
@@ -65925,7 +66020,7 @@ SegmentSelectTool.toolName = 'SegmentSelectTool';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44753);
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(96214);
 /* harmony import */ var _strategies_fillSphere__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(61604);
@@ -66403,7 +66498,7 @@ BrushTool.toolName = 'Brush';
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   r: () => (/* binding */ isVolumeSegmentation)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 function isVolumeSegmentation(operationData, viewport) {
     const { imageIdReferenceMap } = operationData;
@@ -66467,7 +66562,7 @@ function extend2DBoundingBoxInViewAxis(boundsIJK, numSlicesToProject) {
 /* harmony export */   C: () => (/* binding */ getBoundingBoxAroundShapeWorld),
 /* harmony export */   g: () => (/* binding */ getBoundingBoxAroundShapeIJK)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 const { EPSILON } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.CONSTANTS;
 function calculateBoundingBox(points, dimensions, isWorld = false) {
@@ -66686,7 +66781,7 @@ function calculatePerimeter(polyline, closed) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ findHandlePolylineIndex)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44753);
 
 
@@ -66941,8 +67036,8 @@ function processContourHoles(contours, points, useXOR = true) {
 }
 /* harmony default export */ const detectContourHoles = ({ processContourHoles });
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var dist_esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var dist_esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Filters/General/ImageMarchingSquares.js
 var ImageMarchingSquares = __webpack_require__(52754);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/DataArray.js
@@ -67185,7 +67280,7 @@ var calculatePerimeter = __webpack_require__(53891);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ updateContourPolyline)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39956);
 /* harmony import */ var _stateManagement__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(95778);
 
@@ -67407,13 +67502,10 @@ function _determineCorners(canvasPoints) {
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   CQ: () => (/* binding */ getCalibratedAspect),
-/* harmony export */   Nx: () => (/* binding */ getCalibratedLengthUnits),
 /* harmony export */   Op: () => (/* binding */ getCalibratedLengthUnitsAndScale),
-/* harmony export */   Ss: () => (/* binding */ getCalibratedAreaUnits),
-/* harmony export */   Xw: () => (/* binding */ getCalibratedProbeUnitsAndValue),
-/* harmony export */   yH: () => (/* binding */ getCalibratedScale)
+/* harmony export */   Xw: () => (/* binding */ getCalibratedProbeUnitsAndValue)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 const { CalibrationTypes } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.Enums;
 const PIXEL_UNITS = 'px';
@@ -67431,48 +67523,11 @@ const UNIT_MAPPING = {
     4: 'seconds',
 };
 const EPS = 1e-3;
-const getCalibratedLengthUnits = (handles, image) => {
-    const { calibration, hasPixelSpacing } = image;
-    const units = hasPixelSpacing ? 'mm' : PIXEL_UNITS;
-    if (!calibration ||
-        (!calibration.type && !calibration.sequenceOfUltrasoundRegions)) {
-        return units;
-    }
-    if (calibration.type === CalibrationTypes.UNCALIBRATED) {
-        return PIXEL_UNITS;
-    }
-    if (calibration.sequenceOfUltrasoundRegions) {
-        return 'US Region';
-    }
-    return `${units} ${calibration.type}`;
-};
 const SQUARE = '\xb2';
-const getCalibratedAreaUnits = (handles, image) => {
-    const { calibration, hasPixelSpacing } = image;
-    const units = (hasPixelSpacing ? 'mm' : PIXEL_UNITS) + SQUARE;
-    if (!calibration || !calibration.type) {
-        return units;
-    }
-    if (calibration.sequenceOfUltrasoundRegions) {
-        return 'US Region';
-    }
-    return `${units} ${calibration.type}`;
-};
-const getCalibratedScale = (image, handles = []) => {
-    if (image.calibration?.sequenceOfUltrasoundRegions) {
-    }
-    else if (image.calibration?.scale) {
-        return image.calibration.scale;
-    }
-    else {
-        return 1;
-    }
-};
 const getCalibratedLengthUnitsAndScale = (image, handles) => {
-    const [imageIndex1, imageIndex2] = handles;
     const { calibration, hasPixelSpacing } = image;
     let units = hasPixelSpacing ? 'mm' : PIXEL_UNITS;
-    const areaUnits = units + SQUARE;
+    let areaUnits = units + SQUARE;
     let scale = 1;
     let calibrationType = '';
     if (!calibration ||
@@ -67483,6 +67538,15 @@ const getCalibratedLengthUnitsAndScale = (image, handles) => {
         return { units: PIXEL_UNITS, areaUnits: PIXEL_UNITS + SQUARE, scale };
     }
     if (calibration.sequenceOfUltrasoundRegions) {
+        let imageIndex1, imageIndex2;
+        if (Array.isArray(handles) && handles.length === 2) {
+            [imageIndex1, imageIndex2] = handles;
+        }
+        else if (typeof handles === 'function') {
+            const points = handles();
+            imageIndex1 = points[0];
+            imageIndex2 = points[1];
+        }
         let regions = calibration.sequenceOfUltrasoundRegions.filter((region) => imageIndex1[0] >= region.regionLocationMinX0 &&
             imageIndex1[0] <= region.regionLocationMaxX1 &&
             imageIndex1[1] >= region.regionLocationMinY0 &&
@@ -67504,9 +67568,10 @@ const getCalibratedLengthUnitsAndScale = (image, handles) => {
         const physicalDeltaY = Math.abs(region.physicalDeltaY);
         const isSamePhysicalDelta = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.isEqual(physicalDeltaX, physicalDeltaY, EPS);
         if (isSamePhysicalDelta) {
-            scale = 1 / (physicalDeltaX * physicalDeltaY * 100);
+            scale = 1 / (physicalDeltaX * 10);
             calibrationType = 'US Region';
             units = 'mm';
+            areaUnits = 'mm' + SQUARE;
         }
         else {
             return { units: PIXEL_UNITS, areaUnits: PIXEL_UNITS + SQUARE, scale };
@@ -67573,7 +67638,6 @@ const getCalibratedProbeUnitsAndValue = (image, handles) => {
     };
 };
 const getCalibratedAspect = (image) => image.calibration?.aspect || 1;
-/* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (getCalibratedLengthUnits)));
 
 
 
@@ -67586,7 +67650,7 @@ const getCalibratedAspect = (image) => image.calibration?.aspect || 1;
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   R: () => (/* binding */ getSphereBoundsInfo)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44753);
 /* harmony import */ var _boundingBox__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15306);
 
@@ -67658,7 +67722,7 @@ function getViewportForAnnotation(annotation) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ getViewportsForAnnotation)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 const { isEqual } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities;
 function getViewportsForAnnotation(annotation) {
@@ -67687,8 +67751,7 @@ function getViewportsForAnnotation(annotation) {
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   debounce: () => (/* reexport */ debounce/* default */.A),
-  getCalibratedAreaUnits: () => (/* reexport */ getCalibratedUnits/* getCalibratedAreaUnits */.Ss),
-  getCalibratedScale: () => (/* reexport */ getCalibratedUnits/* getCalibratedScale */.yH),
+  getCalibratedLengthUnitsAndScale: () => (/* reexport */ getCalibratedUnits/* getCalibratedLengthUnitsAndScale */.Op),
   math: () => (/* reexport */ math),
   pointInShapeCallback: () => (/* reexport */ utilities_pointInShapeCallback/* default */.A),
   pointToString: () => (/* reexport */ pointToString/* pointToString */.l),
@@ -67700,7 +67763,7 @@ __webpack_require__.d(__webpack_exports__, {
   triggerAnnotationRenderForViewportIds: () => (/* reexport */ triggerAnnotationRenderForViewportIds/* default */.A)
 });
 
-// UNUSED EXPORTS: annotationFrameRange, boundingBox, calibrateImageSpacing, cine, clip, contourSegmentation, contours, drawing, dynamicVolume, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, getCalibratedLengthUnits, getSphereBoundsInfo, getViewportForAnnotation, isObject, jumpToSlice, orientation, planar, planarFreehandROITool, pointInSurroundingSphereCallback, rectangleROITool, segmentation, stackContextPrefetch, stackPrefetch, touch, triggerAnnotationRender, triggerEvent, viewport, viewportFilters, voi
+// UNUSED EXPORTS: annotationFrameRange, boundingBox, calibrateImageSpacing, cine, clip, contourSegmentation, contours, drawing, dynamicVolume, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, getCalibratedAspect, getCalibratedProbeUnitsAndValue, getSphereBoundsInfo, getViewportForAnnotation, isObject, jumpToSlice, orientation, planar, planarFreehandROITool, pointInSurroundingSphereCallback, rectangleROITool, segmentation, stackContextPrefetch, stackPrefetch, touch, triggerAnnotationRender, triggerEvent, viewport, viewportFilters, voi
 
 // NAMESPACE OBJECT: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/polyData/utils.js
 var utils_namespaceObject = {};
@@ -67711,8 +67774,8 @@ __webpack_require__.d(utils_namespaceObject, {
   getPolyDataPoints: () => (getPolyDataPoints)
 });
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // 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/store/ToolGroupManager/index.js
@@ -68472,15 +68535,17 @@ function prefetch(element) {
         }
     }
     const requestFn = (imageId, options) => esm.imageLoader.loadAndCacheImage(imageId, options);
-    const { useNorm16Texture } = (0,esm.getConfiguration)().rendering;
+    const { useNorm16Texture, preferSizeOverAccuracy } = (0,esm.getConfiguration)().rendering;
+    const useNativeDataType = useNorm16Texture || preferSizeOverAccuracy;
     imageIdsToPrefetch.forEach((imageId) => {
         const options = {
             targetBuffer: {
-                type: useNorm16Texture ? undefined : 'Float32Array',
+                type: useNativeDataType ? undefined : 'Float32Array',
             },
             preScale: {
                 enabled: true,
             },
+            useNativeDataType,
             requestType: stackPrefetchUtils/* requestType */.y9,
         };
         esm.imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), stackPrefetchUtils/* requestType */.y9, {
@@ -68644,16 +68709,18 @@ function stackContextPrefetch_prefetch(element) {
     }
     const requestFn = (imageId, options) => esm.imageLoader.loadAndCacheImage(imageId, options)
         .then(() => doneCallback(imageId));
-    const { useNorm16Texture } = (0,esm.getConfiguration)().rendering;
+    const { useNorm16Texture, preferSizeOverAccuracy } = (0,esm.getConfiguration)().rendering;
+    const useNativeDataType = useNorm16Texture || preferSizeOverAccuracy;
     indicesToRequestCopy.forEach((imageIdIndex) => {
         const imageId = stack.imageIds[imageIdIndex];
         const options = {
             targetBuffer: {
-                type: useNorm16Texture ? undefined : 'Float32Array',
+                type: useNativeDataType ? undefined : 'Float32Array',
             },
             preScale: {
                 enabled: true,
             },
+            useNativeDataType,
             requestType: stackPrefetchUtils/* requestType */.y9,
         };
         esm.imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), stackPrefetchUtils/* requestType */.y9, {
@@ -70557,8 +70624,8 @@ function getClosestLineSegmentIntersection(points, p1, q1, closed = true) {
     };
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var dist_esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var dist_esm = __webpack_require__(73868);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js
 
 
@@ -71130,7 +71197,7 @@ function pointToString(point, decimals = 5) {
 /***/ ((__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) => {
 
 "use strict";
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _boundingBox_getBoundingBoxAroundShape__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14471);
 /* harmony import */ var _boundingBox_extend2DBoundingBoxInViewAxis__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42290);
 
@@ -71189,7 +71256,7 @@ function getBoundsIJKFromRectangleAnnotations(annotations, referenceVolume, opti
 /* harmony export */   l: () => (/* binding */ isAxisAlignedRectangle)
 /* harmony export */ });
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44753);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73868);
 
 
 const { isEqual } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.utilities;
@@ -71224,7 +71291,7 @@ function calculateAnglesWithAxes(vec, axes) {
 /* harmony export */   A: () => (/* binding */ scroll)
 /* harmony export */ });
 /* unused harmony export scrollVolume */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 function scroll(viewport, options) {
     const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(viewport.element);
@@ -71293,7 +71360,7 @@ function scrollVolume(viewport, volumeId, delta, scrollSlabs = false) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ InterpolationManager)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _stateManagement_annotation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(45200);
 /* harmony import */ var _contours_interpolation_getInterpolationDataCollection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23237);
 /* harmony import */ var _contours_interpolation_interpolate__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7727);
@@ -71624,7 +71691,7 @@ function lpad(string, character, length) {
 /* harmony export */   OX: () => (/* binding */ getUniqueSegmentIndices)
 /* harmony export */ });
 /* unused harmony export setSegmentationClean */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30322);
 /* harmony import */ var _tools_segmentation_strategies_utils_stackVolumeCheck__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16124);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(84901);
@@ -71871,8 +71938,8 @@ function _validateAnnotations(annotations) {
 }
 /* harmony default export */ const segmentation_rectangleROIThresholdVolumeByRange = ((/* unused pure expression or super */ null && (rectangleROIThresholdVolumeByRange)));
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/segmentation/createMergedLabelmapForIndex.js
 
 function createMergedLabelmapForIndex(labelmaps, segmentIndex = 1, volumeId = 'mergedLabelmap') {
@@ -72689,7 +72756,7 @@ function getHoveredContourSegmentationAnnotation(segmentationId) {
 /* harmony export */   h6: () => (/* binding */ triggerSegmentationRender),
 /* harmony export */   px: () => (/* binding */ segmentationRenderingEngine)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52610);
 /* harmony import */ var _tools__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(94152);
@@ -72813,7 +72880,7 @@ function triggerSegmentationRender(toolGroupId) {
 /* harmony export */   n7: () => (/* binding */ getBrushToolInstances)
 /* harmony export */ });
 /* unused harmony exports getVoxelOverlap, processVolumes */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(52610);
 /* harmony import */ var _tools_segmentation_BrushTool__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53712);
 /* harmony import */ var _boundingBox_getBoundingBoxAroundShape__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(14471);
@@ -73099,7 +73166,7 @@ function _getDistance3D(point0, point1) {
 /* harmony export */   Ay: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* unused harmony exports annotationRenderingEngine, triggerAnnotationRender */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2746);
 /* harmony import */ var _getToolsWithModesForElement__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42360);
@@ -73277,7 +73344,7 @@ function triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRen
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   u: () => (/* binding */ isViewportPreScaled)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 
 function isViewportPreScaled(viewport, targetId) {
     if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.BaseVolumeViewport) {
@@ -73305,7 +73372,7 @@ function isViewportPreScaled(viewport, targetId) {
 /***/ ((__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) => {
 
 "use strict";
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var _clip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(88484);
 /* harmony import */ var _scroll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21783);
 
@@ -73355,7 +73422,7 @@ function _getImageIndexToJump(numberOfSlices, imageIndex) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ jumpToWorld)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44656);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73868);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44753);
 
 
@@ -73453,8 +73520,8 @@ function _toolGroupHasActiveEnabledOrPassiveTool(toolGroup, toolName) {
     return toolMode === Active || toolMode === Passive || toolMode === Enabled;
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
 var gl_matrix_esm = __webpack_require__(44753);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/viewportFilters/filterViewportsWithParallelNormals.js
@@ -73589,8 +73656,8 @@ class ICRPolySeg {
   }
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
-var esm = __webpack_require__(44656);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 328 modules
+var esm = __webpack_require__(73868);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/DataModel/Plane.js
 var Plane = __webpack_require__(84441);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/DataModel/PolyData.js + 9 modules