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

package/dist/{270.bundle.4564621556b0f963a004.js → 270.bundle.2d215f8720350f03e171.js}

@@ -578,8 +578,8 @@ __webpack_require__.d(synchronizers_namespaceObject, {
 var types_namespaceObject = {};
 __webpack_require__.r(types_namespaceObject);
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var esm = __webpack_require__(77331);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 336 modules
+var esm = __webpack_require__(58389);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/enums/ToolBindings.js
 var MouseBindings;
 (function (MouseBindings) {
@@ -5561,7 +5561,7 @@ class AnnotationTool extends base_AnnotationDisplayTool {
         if (viewport instanceof esm.BaseVolumeViewport) {
             const volumeId = targetId.split('volumeId:')[1];
             const volume = esm.cache.getVolume(volumeId);
-            return volume.scaling?.PET !== undefined;
+            return volume.scaling?.PT !== undefined;
         }
         else if (viewport instanceof esm.StackViewport) {
             const scalingModule = imageId && esm.metaData.get('scalingModule', imageId);
@@ -8483,6 +8483,7 @@ function _applyShift(viewport, delta) {
 
 
 
+
 class MIPJumpToClickTool extends base_BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -8512,9 +8513,16 @@ class MIPJumpToClickTool extends base_BaseTool {
         if (!brightestPoint || !brightestPoint.length) {
             return;
         }
-        const { targetViewportIds } = this.configuration;
-        targetViewportIds.forEach((viewportId) => {
-            const viewport = renderingEngine.getViewport(viewportId);
+        const { targetViewportIds, toolGroupId } = this.configuration;
+        const viewports = renderingEngine.getViewports().filter((vp) => {
+            if (targetViewportIds?.indexOf(vp.id) >= 0)
+                return true;
+            const foundToolGroup = ToolGroupManager_getToolGroupForViewport(vp.id, renderingEngine.id);
+            if (toolGroupId && toolGroupId === foundToolGroup?.id)
+                return true;
+            return false;
+        });
+        viewports.forEach((viewport) => {
             if (viewport instanceof esm.VolumeViewport) {
                 jumpToWorld(viewport, brightestPoint);
             }
@@ -11664,19 +11672,28 @@ LengthTool.toolName = 'Length';
 /* harmony default export */ const annotation_LengthTool = (LengthTool);
 //# sourceMappingURL=LengthTool.js.map
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/getModalityUnit.js
-function getModalityUnit(modality, isPreScaled, isSuvScaled) {
+
+function getModalityUnit(modality, imageId, options) {
     if (modality === 'CT') {
         return 'HU';
     }
-    else if (modality === 'PT' &&
-        isPreScaled === true &&
-        isSuvScaled === true) {
-        return 'SUV';
+    else if (modality === 'PT') {
+        return _handlePTModality(imageId, options);
     }
     else {
         return '';
     }
 }
+function _handlePTModality(imageId, options) {
+    if (!options.isPreScaled) {
+        return 'raw';
+    }
+    if (options.isSuvScaled) {
+        return 'SUV';
+    }
+    const petSeriesModule = esm.metaData.get('petSeriesModule', imageId);
+    return petSeriesModule?.units || 'unitless';
+}
 
 //# sourceMappingURL=getModalityUnit.js.map
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/viewport/isViewportPreScaled.js
@@ -11869,16 +11886,20 @@ class ProbeTool extends base_AnnotationTool {
                 const canvasCoordinates = viewport.worldToCanvas(point);
                 styleSpecifier.annotationUID = annotationUID;
                 const color = this.getStyle('color', styleSpecifier, annotation);
+                const modalityUnitOptions = {
+                    isPreScaled: isViewportPreScaled(viewport, targetId),
+                    isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                };
                 if (!data.cachedStats[targetId]) {
                     data.cachedStats[targetId] = {
                         Modality: null,
                         index: null,
                         value: null,
                     };
-                    this._calculateCachedStats(annotation, renderingEngine, enabledElement);
+                    this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
                 }
                 else if (annotation.invalidated) {
-                    this._calculateCachedStats(annotation, renderingEngine, enabledElement);
+                    this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -11904,9 +11925,7 @@ class ProbeTool extends base_AnnotationTool {
                 const handleGroupUID = '0';
                 drawingSvg_drawHandles(svgDrawingHelper, annotationUID, handleGroupUID, [canvasCoordinates], { color });
                 renderStatus = true;
-                const isPreScaled = isViewportPreScaled(viewport, targetId);
-                const isSuvScaled = this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId);
-                const textLines = this._getTextLines(data, targetId, isPreScaled, isSuvScaled);
+                const textLines = this._getTextLines(data, targetId);
                 if (textLines) {
                     const textCanvasCoordinates = [
                         canvasCoordinates[0] + 6,
@@ -11950,50 +11969,18 @@ class ProbeTool extends base_AnnotationTool {
         utilities_triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
         evt.preventDefault();
     }
-    _getTextLines(data, targetId, isPreScaled, isSuvScaled) {
+    _getTextLines(data, targetId) {
         const cachedVolumeStats = data.cachedStats[targetId];
-        const { index, Modality, value, SUVBw, SUVLbm, SUVBsa } = cachedVolumeStats;
-        if (value === undefined && SUVBw === undefined) {
+        const { index, value, modalityUnit } = cachedVolumeStats;
+        if (value === undefined) {
             return;
         }
         const textLines = [];
-        const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
         textLines.push(`(${index[0]}, ${index[1]}, ${index[2]})`);
-        if (Modality === 'PT' && isPreScaled === true && SUVBw !== undefined) {
-            textLines.push(`${SUVBw.toFixed(2)} SUV bw`);
-            if (SUVLbm) {
-                textLines.push(`${SUVLbm.toFixed(2)} SUV lbm`);
-            }
-            if (SUVBsa) {
-                textLines.push(`${SUVBsa.toFixed(2)} SUV bsa`);
-            }
-        }
-        else {
-            textLines.push(`${value.toFixed(2)} ${unit}`);
-        }
+        textLines.push(`${value.toFixed(2)} ${modalityUnit}`);
         return textLines;
     }
-    _getValueForModality(value, imageVolume, modality) {
-        const values = {};
-        values['value'] = value;
-        if (modality === 'PT' &&
-            imageVolume.scaling?.PET &&
-            (imageVolume.scaling.PET.suvbwToSuvbsa ||
-                imageVolume.scaling.PET.suvbwToSuvlbm)) {
-            const { suvbwToSuvlbm, suvbwToSuvbsa } = imageVolume.scaling.PET;
-            values['SUVBw'] = value;
-            if (suvbwToSuvlbm) {
-                const SUVLbm = value * suvbwToSuvlbm;
-                values['SUVLbm'] = SUVLbm;
-            }
-            if (suvbwToSuvbsa) {
-                const SUVBsa = value * suvbwToSuvbsa;
-                values['SUVBsa'] = SUVBsa;
-            }
-        }
-        return values;
-    }
-    _calculateCachedStats(annotation, renderingEngine, enabledElement) {
+    _calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions) {
         const data = annotation.data;
         const { viewportId, renderingEngineId } = enabledElement;
         const worldPos = data.handles.points[0];
@@ -12024,11 +12011,12 @@ class ProbeTool extends base_AnnotationTool {
                     const viewport = viewports[0];
                     index[2] = viewport.getCurrentImageIdIndex();
                 }
-                const values = this._getValueForModality(value, image, modality);
+                const modalityUnit = getModalityUnit(modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                 cachedStats[targetId] = {
                     index,
-                    ...values,
+                    value,
                     Modality: modality,
+                    modalityUnit,
                 };
             }
             else {
@@ -12136,16 +12124,20 @@ class DragProbeTool extends annotation_ProbeTool {
             const canvasCoordinates = viewport.worldToCanvas(point);
             styleSpecifier.annotationUID = annotationUID;
             const color = this.getStyle('color', styleSpecifier, annotation);
+            const modalityUnitOptions = {
+                isPreScaled: isViewportPreScaled(viewport, targetId),
+                isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+            };
             if (!data.cachedStats[targetId]) {
                 data.cachedStats[targetId] = {
                     Modality: null,
                     index: null,
                     value: null,
                 };
-                this._calculateCachedStats(annotation, renderingEngine, enabledElement);
+                this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
             }
             else if (annotation.invalidated) {
-                this._calculateCachedStats(annotation, renderingEngine, enabledElement);
+                this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
             }
             if (!viewport.getRenderingEngine()) {
                 console.warn('Rendering Engine has been destroyed');
@@ -12154,9 +12146,7 @@ class DragProbeTool extends annotation_ProbeTool {
             const handleGroupUID = '0';
             drawingSvg_drawHandles(svgDrawingHelper, annotationUID, handleGroupUID, [canvasCoordinates], { color });
             renderStatus = true;
-            const isPreScaled = isViewportPreScaled(viewport, targetId);
-            const isSuvScaled = this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId);
-            const textLines = this._getTextLines(data, targetId, isPreScaled, isSuvScaled);
+            const textLines = this._getTextLines(data, targetId);
             if (textLines) {
                 const textCanvasCoordinates = [
                     canvasCoordinates[0] + 6,
@@ -12571,6 +12561,10 @@ class RectangleROITool extends base_AnnotationTool {
                 const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
                 const color = this.getStyle('color', styleSpecifier, annotation);
                 const { viewPlaneNormal, viewUp } = viewport.getCamera();
+                const modalityUnitOptions = {
+                    isPreScaled: isViewportPreScaled(viewport, targetId),
+                    isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                };
                 if (!data.cachedStats[targetId] ||
                     data.cachedStats[targetId].areaUnit === undefined) {
                     data.cachedStats[targetId] = {
@@ -12581,10 +12575,10 @@ class RectangleROITool extends base_AnnotationTool {
                         stdDev: null,
                         areaUnit: null,
                     };
-                    this._calculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement);
+                    this._calculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement, modalityUnitOptions);
                 }
                 else if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement);
+                    this._throttledCalculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement, modalityUnitOptions);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -12630,9 +12624,7 @@ class RectangleROITool extends base_AnnotationTool {
                     lineWidth,
                 }, dataId);
                 renderStatus = true;
-                const isPreScaled = isViewportPreScaled(viewport, targetId);
-                const isSuvScaled = this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId);
-                const textLines = this._getTextLines(data, targetId, isPreScaled, isSuvScaled);
+                const textLines = this._getTextLines(data, targetId);
                 if (!textLines || textLines.length === 0) {
                     continue;
                 }
@@ -12663,21 +12655,20 @@ class RectangleROITool extends base_AnnotationTool {
                 height: Math.abs(point0[1] - point1[1]),
             };
         };
-        this._getTextLines = (data, targetId, isPreScaled, isSuvScaled) => {
+        this._getTextLines = (data, targetId) => {
             const cachedVolumeStats = data.cachedStats[targetId];
-            const { area, mean, max, stdDev, Modality, areaUnit } = cachedVolumeStats;
+            const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats;
             if (mean === undefined) {
                 return;
             }
             const textLines = [];
-            const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
             textLines.push(`Area: ${area.toFixed(2)} ${areaUnit}\xb2`);
-            textLines.push(`Mean: ${mean.toFixed(2)} ${unit}`);
-            textLines.push(`Max: ${max.toFixed(2)} ${unit}`);
-            textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${unit}`);
+            textLines.push(`Mean: ${mean.toFixed(2)} ${modalityUnit}`);
+            textLines.push(`Max: ${max.toFixed(2)} ${modalityUnit}`);
+            textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${modalityUnit}`);
             return textLines;
         };
-        this._calculateCachedStats = (annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement) => {
+        this._calculateCachedStats = (annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement, modalityUnitOptions) => {
             const { data } = annotation;
             const { viewportId, renderingEngineId } = enabledElement;
             const worldPos1 = data.handles.points[0];
@@ -12740,6 +12731,7 @@ class RectangleROITool extends base_AnnotationTool {
                     }
                     stdDev /= count;
                     stdDev = Math.sqrt(stdDev);
+                    const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                     cachedStats[targetId] = {
                         Modality: metadata.Modality,
                         area,
@@ -12747,6 +12739,7 @@ class RectangleROITool extends base_AnnotationTool {
                         stdDev,
                         max,
                         areaUnit: hasPixelSpacing ? 'mm' : 'px',
+                        modalityUnit,
                     };
                 }
                 else {
@@ -13237,6 +13230,10 @@ class EllipticalROITool extends base_AnnotationTool {
                     canvasCorners = (getCanvasEllipseCorners(canvasCoordinates));
                 }
                 const { centerPointRadius } = this.configuration;
+                const modalityUnitOptions = {
+                    isPreScaled: isViewportPreScaled(viewport, targetId),
+                    isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                };
                 if (!data.cachedStats[targetId] ||
                     data.cachedStats[targetId].areaUnit === undefined) {
                     data.cachedStats[targetId] = {
@@ -13247,10 +13244,10 @@ class EllipticalROITool extends base_AnnotationTool {
                         stdDev: null,
                         areaUnit: null,
                     };
-                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
                 }
                 else if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -13307,9 +13304,7 @@ class EllipticalROITool extends base_AnnotationTool {
                     }
                 }
                 renderStatus = true;
-                const isPreScaled = isViewportPreScaled(viewport, targetId);
-                const isSuvScaled = this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId);
-                const textLines = this._getTextLines(data, targetId, isPreScaled, isSuvScaled);
+                const textLines = this._getTextLines(data, targetId);
                 if (!textLines || textLines.length === 0) {
                     continue;
                 }
@@ -13332,11 +13327,10 @@ class EllipticalROITool extends base_AnnotationTool {
             }
             return renderStatus;
         };
-        this._getTextLines = (data, targetId, isPreScaled, isSuvScaled) => {
+        this._getTextLines = (data, targetId) => {
             const cachedVolumeStats = data.cachedStats[targetId];
-            const { area, mean, stdDev, max, isEmptyArea, Modality, areaUnit } = cachedVolumeStats;
+            const { area, mean, stdDev, max, isEmptyArea, areaUnit, modalityUnit } = cachedVolumeStats;
             const textLines = [];
-            const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
             if (area) {
                 const areaLine = isEmptyArea
                     ? `Area: Oblique not supported`
@@ -13344,17 +13338,17 @@ class EllipticalROITool extends base_AnnotationTool {
                 textLines.push(areaLine);
             }
             if (mean) {
-                textLines.push(`Mean: ${mean.toFixed(2)} ${unit}`);
+                textLines.push(`Mean: ${mean.toFixed(2)} ${modalityUnit}`);
             }
             if (max) {
-                textLines.push(`Max: ${max.toFixed(2)} ${unit}`);
+                textLines.push(`Max: ${max.toFixed(2)} ${modalityUnit}`);
             }
             if (stdDev) {
-                textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${unit}`);
+                textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${modalityUnit}`);
             }
             return textLines;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions) => {
             const data = annotation.data;
             const { viewportId, renderingEngineId } = enabledElement;
             const { points } = data.handles;
@@ -13428,6 +13422,7 @@ class EllipticalROITool extends base_AnnotationTool {
                     pointInShapeCallback(imageData, (pointLPS, pointIJK) => pointInEllipse(ellipseObj, pointLPS), stdCalculator, boundsIJK);
                     stdDev /= count;
                     stdDev = Math.sqrt(stdDev);
+                    const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                     cachedStats[targetId] = {
                         Modality: metadata.Modality,
                         area,
@@ -13436,6 +13431,7 @@ class EllipticalROITool extends base_AnnotationTool {
                         stdDev,
                         isEmptyArea,
                         areaUnit: hasPixelSpacing ? 'mm' : 'px',
+                        modalityUnit,
                     };
                 }
                 else {
@@ -13875,6 +13871,10 @@ class CircleROITool extends base_AnnotationTool {
                 const radius = getCanvasCircleRadius(canvasCoordinates);
                 const canvasCorners = getCanvasCircleCorners(canvasCoordinates);
                 const { centerPointRadius } = this.configuration;
+                const modalityUnitOptions = {
+                    isPreScaled: isViewportPreScaled(viewport, targetId),
+                    isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                };
                 if (!data.cachedStats[targetId] ||
                     data.cachedStats[targetId].areaUnit === undefined) {
                     data.cachedStats[targetId] = {
@@ -13888,10 +13888,10 @@ class CircleROITool extends base_AnnotationTool {
                         radiusUnit: null,
                         perimeter: null,
                     };
-                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
                 }
                 else if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -13946,9 +13946,7 @@ class CircleROITool extends base_AnnotationTool {
                     }
                 }
                 renderStatus = true;
-                const isPreScaled = isViewportPreScaled(viewport, targetId);
-                const isSuvScaled = this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId);
-                const textLines = this._getTextLines(data, targetId, isPreScaled, isSuvScaled);
+                const textLines = this._getTextLines(data, targetId);
                 if (!textLines || textLines.length === 0) {
                     continue;
                 }
@@ -13971,11 +13969,10 @@ class CircleROITool extends base_AnnotationTool {
             }
             return renderStatus;
         };
-        this._getTextLines = (data, targetId, isPreScaled, isSuvScaled) => {
+        this._getTextLines = (data, targetId) => {
             const cachedVolumeStats = data.cachedStats[targetId];
-            const { radius, radiusUnit, area, mean, stdDev, max, isEmptyArea, Modality, areaUnit, } = cachedVolumeStats;
+            const { radius, radiusUnit, area, mean, stdDev, max, isEmptyArea, Modality, areaUnit, modalityUnit, } = cachedVolumeStats;
             const textLines = [];
-            const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
             if (radius) {
                 const radiusLine = isEmptyArea
                     ? `Radius: Oblique not supported`
@@ -13989,17 +13986,17 @@ class CircleROITool extends base_AnnotationTool {
                 textLines.push(areaLine);
             }
             if (mean) {
-                textLines.push(`Mean: ${mean.toFixed(2)} ${unit}`);
+                textLines.push(`Mean: ${mean.toFixed(2)} ${modalityUnit}`);
             }
             if (max) {
-                textLines.push(`Max: ${max.toFixed(2)} ${unit}`);
+                textLines.push(`Max: ${max.toFixed(2)} ${modalityUnit}`);
             }
             if (stdDev) {
-                textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${unit}`);
+                textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${modalityUnit}`);
             }
             return textLines;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions) => {
             const data = annotation.data;
             const { viewportId, renderingEngineId } = enabledElement;
             const { points } = data.handles;
@@ -14073,6 +14070,7 @@ class CircleROITool extends base_AnnotationTool {
                     pointInShapeCallback(imageData, (pointLPS, pointIJK) => pointInEllipse(ellipseObj, pointLPS), stdCalculator, boundsIJK);
                     stdDev /= count;
                     stdDev = Math.sqrt(stdDev);
+                    const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                     cachedStats[targetId] = {
                         Modality: metadata.Modality,
                         area,
@@ -14084,6 +14082,7 @@ class CircleROITool extends base_AnnotationTool {
                         radius: worldWidth / 2,
                         radiusUnit: hasPixelSpacing ? 'mm' : 'px',
                         perimeter: 2 * Math.PI * (worldWidth / 2),
+                        modalityUnit,
                     };
                 }
                 else {
@@ -14775,7 +14774,10 @@ function completeDrawClosedContour(element) {
     const worldPoints = updatedPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
     annotation.data.polyline = worldPoints;
     annotation.data.isOpenContour = false;
-    this.triggerAnnotationCompleted(annotation);
+    const { textBox } = annotation.data.handles;
+    if (!textBox.hasMoved) {
+        this.triggerAnnotationCompleted(annotation);
+    }
     this.isDrawing = false;
     this.drawData = undefined;
     this.commonData = undefined;
@@ -14808,6 +14810,7 @@ function completeDrawOpenContour(element) {
     const worldPoints = updatedPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
     annotation.data.polyline = worldPoints;
     annotation.data.isOpenContour = true;
+    const { textBox } = annotation.data.handles;
     annotation.data.handles.points = [
         worldPoints[0],
         worldPoints[worldPoints.length - 1],
@@ -14816,7 +14819,9 @@ function completeDrawOpenContour(element) {
         annotation.data.openUShapeContourVectorToPeak =
             findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
     }
-    this.triggerAnnotationCompleted(annotation);
+    if (!textBox.hasMoved) {
+        this.triggerAnnotationCompleted(annotation);
+    }
     this.isDrawing = false;
     this.drawData = undefined;
     this.commonData = undefined;
@@ -15257,6 +15262,7 @@ function completeClosedContourEdit(element) {
         const worldPoints = updatedPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
         annotation.data.polyline = worldPoints;
         annotation.data.isOpenContour = false;
+        annotation.invalidated = true;
         this.triggerAnnotationModified(annotation, enabledElement);
     }
     this.isEditingClosed = false;
@@ -15565,6 +15571,7 @@ function completeOpenContourEdit(element) {
             annotation.data.openUShapeContourVectorToPeak =
                 findOpenUShapedContourVectorToPeak(fusedCanvasPoints, viewport);
         }
+        annotation.invalidated = true;
         this.triggerAnnotationModified(annotation, enabledElement);
     }
     this.isEditingOpen = false;
@@ -16045,6 +16052,10 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                 if (annotation.annotationUID === activeAnnotationUID &&
                     !this.commonData?.movingTextBox)
                     return;
+                const modalityUnitOptions = {
+                    isPreScaled: isViewportPreScaled(viewport, targetId),
+                    isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                };
                 if (!this.commonData?.movingTextBox) {
                     const { data } = annotation;
                     if (!data.cachedStats[targetId] ||
@@ -16057,17 +16068,17 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                             stdDev: null,
                             areaUnit: null,
                         };
-                        this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                        this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
                     }
                     else if (annotation.invalidated) {
-                        this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
+                        this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
                     }
                 }
                 this._renderStats(annotation, viewport, enabledElement, svgDrawingHelper);
             });
             return renderStatus;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions) => {
             const data = annotation.data;
             const { cachedStats, polyline: points } = data;
             const targetIds = Object.keys(cachedStats);
@@ -16162,6 +16173,7 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                 const mean = sum / count;
                 let stdDev = sumSquares / count - mean ** 2;
                 stdDev = Math.sqrt(stdDev);
+                const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                 cachedStats[targetId] = {
                     Modality: metadata.Modality,
                     area,
@@ -16169,17 +16181,17 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                     max,
                     stdDev,
                     areaUnit: hasPixelSpacing ? 'mm' : 'px',
+                    modalityUnit,
                 };
             }
+            this.triggerAnnotationModified(annotation, enabledElement);
             annotation.invalidated = false;
             return cachedStats;
         };
         this._renderStats = (annotation, viewport, enabledElement, svgDrawingHelper) => {
             const data = annotation.data;
             const targetId = this.getTargetId(viewport);
-            const isPreScaled = isViewportPreScaled(viewport, targetId);
-            const isSuvScaled = this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId);
-            const textLines = this._getTextLines(data, targetId, isPreScaled, isSuvScaled);
+            const textLines = this._getTextLines(data, targetId);
             if (!textLines || textLines.length === 0)
                 return;
             const canvasCoordinates = data.polyline.map((p) => viewport.worldToCanvas(p));
@@ -16204,11 +16216,10 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                 bottomRight: viewport.canvasToWorld([left + width, top + height]),
             };
         };
-        this._getTextLines = (data, targetId, isPreScaled, isSuvScaled) => {
+        this._getTextLines = (data, targetId) => {
             const cachedVolumeStats = data.cachedStats[targetId];
-            const { area, mean, stdDev, max, isEmptyArea, Modality, areaUnit } = cachedVolumeStats;
+            const { area, mean, stdDev, max, isEmptyArea, areaUnit, modalityUnit } = cachedVolumeStats;
             const textLines = [];
-            const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
             if (area) {
                 const areaLine = isEmptyArea
                     ? `Area: Oblique not supported`
@@ -16216,13 +16227,13 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                 textLines.push(areaLine);
             }
             if (mean) {
-                textLines.push(`Mean: ${mean.toFixed(2)} ${unit}`);
+                textLines.push(`Mean: ${mean.toFixed(2)} ${modalityUnit}`);
             }
             if (max) {
-                textLines.push(`Max: ${max.toFixed(2)} ${unit}`);
+                textLines.push(`Max: ${max.toFixed(2)} ${modalityUnit}`);
             }
             if (stdDev) {
-                textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${unit}`);
+                textLines.push(`Std Dev: ${stdDev.toFixed(2)} ${modalityUnit}`);
             }
             return textLines;
         };
@@ -16299,7 +16310,6 @@ PlanarFreehandROITool.toolName = 'PlanarFreehandROI';
 
 
 
-
 class ArrowAnnotateTool extends base_AnnotationTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -16646,7 +16656,7 @@ class ArrowAnnotateTool extends base_AnnotationTool {
                     continue;
                 }
                 if (!data.handles.textBox.hasMoved) {
-                    const canvasTextBoxCoords = getTextBoxCoordsCanvas(canvasCoordinates);
+                    const canvasTextBoxCoords = canvasCoordinates[1];
                     data.handles.textBox.worldPosition =
                         viewport.canvasToWorld(canvasTextBoxCoords);
                 }
@@ -16731,7 +16741,6 @@ ArrowAnnotateTool.toolName = 'ArrowAnnotate';
 
 
 
-
 class AngleTool extends base_AnnotationTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -17064,7 +17073,7 @@ class AngleTool extends base_AnnotationTool {
                 }
                 const textLines = this._getTextLines(data, targetId);
                 if (!data.handles.textBox.hasMoved) {
-                    const canvasTextBoxCoords = getTextBoxCoordsCanvas(canvasCoordinates);
+                    const canvasTextBoxCoords = canvasCoordinates[1];
                     data.handles.textBox.worldPosition =
                         viewport.canvasToWorld(canvasTextBoxCoords);
                 }
@@ -22848,21 +22857,23 @@ function createCameraPositionSynchronizer(synchronizerName) {
 
 function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, voiModifiedEvent) {
     const eventDetail = voiModifiedEvent.detail;
-    const { volumeId, range } = eventDetail;
+    const { volumeId, range, invertStateChanged, invert } = eventDetail;
     const renderingEngine = (0,esm.getRenderingEngine)(targetViewport.renderingEngineId);
     if (!renderingEngine) {
         throw new Error(`Rendering Engine does not exist: ${targetViewport.renderingEngineId}`);
     }
     const tViewport = renderingEngine.getViewport(targetViewport.viewportId);
-    if (tViewport instanceof esm.VolumeViewport) {
-        tViewport.setProperties({
-            voiRange: range,
-        }, volumeId);
+    const tProperties = {
+        voiRange: range,
+    };
+    if (invertStateChanged) {
+        tProperties.invert = invert;
+    }
+    if (tViewport instanceof esm.BaseVolumeViewport) {
+        tViewport.setProperties(tProperties, volumeId);
     }
     else if (tViewport instanceof esm.StackViewport) {
-        tViewport.setProperties({
-            voiRange: range,
-        });
+        tViewport.setProperties(tProperties);
     }
     else {
         throw new Error('Viewport type not supported.');