@ohif/app 3.7.0-beta.32 → 3.7.0-beta.33

package/dist/{270.bundle.a4ff08f18e3da39a030b.js → 270.bundle.49a50e13715da82c083f.js}

@@ -11672,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
@@ -11877,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) {
@@ -11912,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,
@@ -11958,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?.PT &&
-            (imageVolume.scaling.PT.suvbwToSuvbsa ||
-                imageVolume.scaling.PT.suvbwToSuvlbm)) {
-            const { suvbwToSuvlbm, suvbwToSuvbsa } = imageVolume.scaling.PT;
-            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];
@@ -12032,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 {
@@ -12144,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');
@@ -12162,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,
@@ -12579,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] = {
@@ -12589,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) {
@@ -12638,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;
                 }
@@ -12671,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];
@@ -12748,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,
@@ -12755,6 +12739,7 @@ class RectangleROITool extends base_AnnotationTool {
                         stdDev,
                         max,
                         areaUnit: hasPixelSpacing ? 'mm' : 'px',
+                        modalityUnit,
                     };
                 }
                 else {
@@ -13245,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] = {
@@ -13255,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) {
@@ -13315,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;
                 }
@@ -13340,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`
@@ -13352,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;
@@ -13436,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,
@@ -13444,6 +13431,7 @@ class EllipticalROITool extends base_AnnotationTool {
                         stdDev,
                         isEmptyArea,
                         areaUnit: hasPixelSpacing ? 'mm' : 'px',
+                        modalityUnit,
                     };
                 }
                 else {
@@ -13883,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] = {
@@ -13896,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) {
@@ -13954,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;
                 }
@@ -13979,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`
@@ -13997,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;
@@ -14081,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,
@@ -14092,6 +14082,7 @@ class CircleROITool extends base_AnnotationTool {
                         radius: worldWidth / 2,
                         radiusUnit: hasPixelSpacing ? 'mm' : 'px',
                         perimeter: 2 * Math.PI * (worldWidth / 2),
+                        modalityUnit,
                     };
                 }
                 else {
@@ -16061,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] ||
@@ -16073,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);
@@ -16178,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,
@@ -16185,6 +16181,7 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                     max,
                     stdDev,
                     areaUnit: hasPixelSpacing ? 'mm' : 'px',
+                    modalityUnit,
                 };
             }
             this.triggerAnnotationModified(annotation, enabledElement);
@@ -16194,9 +16191,7 @@ class PlanarFreehandROITool extends base_AnnotationTool {
         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));
@@ -16221,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`
@@ -16233,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;
         };
@@ -22875,7 +22869,7 @@ function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, v
     if (invertStateChanged) {
         tProperties.invert = invert;
     }
-    if (tViewport instanceof esm.VolumeViewport) {
+    if (tViewport instanceof esm.BaseVolumeViewport) {
         tViewport.setProperties(tProperties, volumeId);
     }
     else if (tViewport instanceof esm.StackViewport) {

package/dist/{331.bundle.0293a1135afc1a55d93c.js → 331.bundle.6d141ff13ae957b1db6f.js}

@@ -45518,6 +45518,13 @@ async function createVolumeActor(props, element, viewportId, suppressEvents = fa
     }
     const volumeActor = vtkVolume$1.newInstance();
     volumeActor.setMapper(volumeMapper);
+    const numberOfComponents = imageData
+        .getPointData()
+        .getScalars()
+        .getNumberOfComponents();
+    if (numberOfComponents === 3) {
+        volumeActor.getProperty().setIndependentComponents(false);
+    }
     if (imageVolume.imageIds) {
         await helpers_setDefaultVolumeVOI(volumeActor, imageVolume, use16BitTexture);
     }
@@ -46327,6 +46334,7 @@ class Viewport {
 
 
 
+
 class BaseVolumeViewport extends RenderingEngine_Viewport {
     constructor(props) {
         super(props);
@@ -46408,12 +46416,6 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
                 return volumeImageURIs.includes(imageURI);
             });
         };
-        this.getCurrentImageIdIndex = () => {
-            throw new Error('Method not implemented.');
-        };
-        this.getCurrentImageId = () => {
-            throw new Error('Method not implemented.');
-        };
         this.useCPURendering = getShouldUseCPURendering();
         this.use16BitTexture = this._shouldUseNativeDataType();
         if (this.useCPURendering) {
@@ -46805,20 +46807,30 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
             throw new Error(`Invalid orientation: ${orientation}. Valid orientations are: ${Object.keys(constants_mprCameraValues).join(', ')}`);
         }
     }
-    resetCamera(resetPan, resetZoom, resetToCenter) {
-        return super.resetCamera(resetPan, resetZoom, resetToCenter);
+    getSlabThickness() {
+        const actors = this.getActors();
+        let slabThickness = rendering.MINIMUM_SLAB_THICKNESS;
+        actors.forEach((actor) => {
+            if (actor.slabThickness > slabThickness) {
+                slabThickness = actor.slabThickness;
+            }
+        });
+        return slabThickness;
     }
     getIntensityFromWorld(point) {
-        throw new Error('Method not implemented.');
-    }
-    setBlendMode(blendMode, filterActorUIDs, immediate) {
-        throw new Error('Method not implemented.');
-    }
-    setSlabThickness(slabThickness, filterActorUIDs) {
-        throw new Error('Method not implemented.');
-    }
-    getSlabThickness() {
-        throw new Error('Method not implemented.');
+        const actorEntry = this.getDefaultActor();
+        if (!actorIsA(actorEntry, 'vtkVolume')) {
+            return;
+        }
+        const { actor, uid } = actorEntry;
+        const imageData = actor.getMapper().getInputData();
+        const volume = esm_cache.getVolume(uid);
+        const { dimensions } = volume;
+        const index = transformWorldToIndex(imageData, point);
+        const voxelIndex = index[2] * dimensions[0] * dimensions[1] +
+            index[1] * dimensions[0] +
+            index[0];
+        return volume.getScalarData()[voxelIndex];
     }
 }
 /* harmony default export */ const RenderingEngine_BaseVolumeViewport = (BaseVolumeViewport);
@@ -46831,7 +46843,6 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
 
 
 
-
 class VolumeViewport extends RenderingEngine_BaseVolumeViewport {
     constructor(props) {
         super(props);
@@ -46945,21 +46956,6 @@ class VolumeViewport extends RenderingEngine_BaseVolumeViewport {
         });
         this.resetCamera();
     }
-    getIntensityFromWorld(point) {
-        const actorEntry = this.getDefaultActor();
-        if (!actorIsA(actorEntry, 'vtkVolume')) {
-            return;
-        }
-        const { actor, uid } = actorEntry;
-        const imageData = actor.getMapper().getInputData();
-        const volume = esm_cache.getVolume(uid);
-        const { dimensions } = volume;
-        const index = transformWorldToIndex(imageData, point);
-        const voxelIndex = index[2] * dimensions[0] * dimensions[1] +
-            index[1] * dimensions[0] +
-            index[0];
-        return volume.getScalarData()[voxelIndex];
-    }
     setBlendMode(blendMode, filterActorUIDs = [], immediate = false) {
         let actorEntries = this.getActors();
         if (filterActorUIDs && filterActorUIDs.length > 0) {
@@ -47020,16 +47016,6 @@ class VolumeViewport extends RenderingEngine_BaseVolumeViewport {
         this.updateClippingPlanesForActors(currentCamera);
         this.triggerCameraModifiedEventIfNecessary(currentCamera, currentCamera);
     }
-    getSlabThickness() {
-        const actors = this.getActors();
-        let slabThickness = rendering.MINIMUM_SLAB_THICKNESS;
-        actors.forEach((actor) => {
-            if (actor.slabThickness > slabThickness) {
-                slabThickness = actor.slabThickness;
-            }
-        });
-        return slabThickness;
-    }
 }
 /* harmony default export */ const RenderingEngine_VolumeViewport = (VolumeViewport);
 //# sourceMappingURL=VolumeViewport.js.map
@@ -49715,6 +49701,12 @@ class VolumeViewport3D extends RenderingEngine_BaseVolumeViewport {
         this.resetVolumeViewportClippingRange();
         return;
     }
+    setSlabThickness(slabThickness, filterActorUIDs) {
+        return null;
+    }
+    setBlendMode(blendMode, filterActorUIDs, immediate) {
+        return null;
+    }
 }
 /* harmony default export */ const RenderingEngine_VolumeViewport3D = (VolumeViewport3D);
 //# sourceMappingURL=VolumeViewport3D.js.map