@ohif/app 3.7.0-beta.99 → 3.7.0

package/dist/{82.bundle.e83d670b0199d1bc717c.js → 82.bundle.ec05d3de5ac5b0c577fe.js}

@@ -4736,7 +4736,6 @@ function disableSync(syncName, servicesManager) {
     syncGroupService.removeViewportFromSyncGroup(viewport.id, viewport.getRenderingEngine().id, syncName);
   });
 }
-;
 
 /**
  * Gets the consistent spacing stack viewport types, which are the ones which
@@ -4767,7 +4766,6 @@ function getReconstructableStackViewports(viewportGridService, displaySetService
   });
   return viewports;
 }
-;
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/commandsModule.ts
 
 
@@ -4786,7 +4784,6 @@ function commandsModule(_ref) {
     toolGroupService,
     cineService,
     toolbarService,
-    stateSyncService,
     uiDialogService,
     cornerstoneViewportService,
     uiNotificationService,
@@ -4913,7 +4910,7 @@ function commandsModule(_ref) {
      * @param props - containing the updates to apply
      * @param props.measurementKey - chooses the measurement key to apply the
      *        code to.  This will typically be finding or site to apply a
-     *        finind code or a findingSites code.
+     *        finding code or a findingSites code.
      * @param props.code - A coding scheme value from DICOM, including:
      *       * CodeValue - the language independent code, for example '1234'
      *       * CodingSchemeDesignator - the issue of the code value
@@ -4989,6 +4986,22 @@ function commandsModule(_ref) {
       } = _ref7;
       utils_callInputDialog(uiDialogService, data, callback);
     },
+    cleanUpCrosshairs: () => {
+      // if the crosshairs tool is active, deactivate it and set window level active
+      // since we are going back to main non-mpr HP
+      const activeViewportToolGroup = toolGroupService.getToolGroup(null);
+      if (activeViewportToolGroup._toolInstances?.Crosshairs?.mode === dist_esm.Enums.ToolModes.Active) {
+        actions.toolbarServiceRecordInteraction({
+          interactionType: 'tool',
+          commands: [{
+            commandOptions: {
+              toolName: 'WindowLevel'
+            },
+            context: 'CORNERSTONE'
+          }]
+        });
+      }
+    },
     toggleCine: () => {
       const {
         viewports
@@ -5075,16 +5088,7 @@ function commandsModule(_ref) {
         return;
       }
       const toolGroup = toolGroupService.getToolGroup(toolGroupId);
-      const toolGroupViewportIds = toolGroup?.getViewportIds?.();
-
-      // if toolGroup has been destroyed, or its viewports have been removed
-      if (!toolGroupViewportIds || !toolGroupViewportIds.length) {
-        return;
-      }
-      const filteredViewports = Array.from(viewports.values()).filter(viewport => {
-        return toolGroupViewportIds.includes(viewport.viewportId);
-      });
-      if (!filteredViewports.length) {
+      if (!toolGroup) {
         return;
       }
       if (!toolGroup.getToolInstance(toolName)) {
@@ -5243,7 +5247,7 @@ function commandsModule(_ref) {
         viewport.resetProperties();
         viewport.resetCamera();
       } else {
-        // Todo: add reset properties for volume viewport
+        viewport.resetProperties();
         viewport.resetCamera();
       }
       viewport.render();
@@ -5546,6 +5550,9 @@ function commandsModule(_ref) {
     },
     setToolbarToggled: {
       commandFn: actions.setToolbarToggled
+    },
+    cleanUpCrosshairs: {
+      commandFn: actions.cleanUpCrosshairs
     }
   };
   return {
@@ -5579,16 +5586,7 @@ const mpr = {
     }],
     // Turns off crosshairs when switching out of MPR mode
     onProtocolExit: [{
-      commandName: 'toolbarServiceRecordInteraction',
-      commandOptions: {
-        interactionType: 'tool',
-        commands: [{
-          commandOptions: {
-            toolName: 'WindowLevel'
-          },
-          context: 'CORNERSTONE'
-        }]
-      }
+      commandName: 'cleanUpCrosshairs'
     }]
   },
   displaySetSelectors: {
@@ -6462,7 +6460,7 @@ class SegmentationService extends src/* PubSubService */.hC {
         volumeId: segmentationId,
         targetBuffer: {
           type: 'Uint8Array',
-          sharedArrayBuffer: true
+          sharedArrayBuffer: window.SharedArrayBuffer
         }
       });
       const defaultScheme = this._getDefaultSegmentationScheme();
@@ -6589,7 +6587,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       }
     };
     this.getConfiguration = toolGroupId => {
-      toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
+      toolGroupId = toolGroupId ?? this._getApplicableToolGroupId();
       const brushSize = 1;
       // const brushSize = cstUtils.segmentation.getBrushSizeForToolGroup(
       //   toolGroupId
@@ -6716,7 +6714,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       if (segmentInfo === undefined) {
         throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
       }
-      toolGroupId = toolGroupId ?? _this._getFirstToolGroupId();
+      toolGroupId = toolGroupId ?? _this._getApplicableToolGroupId();
       const segmentationRepresentation = _this._getSegmentationRepresentation(segmentationId, toolGroupId);
       if (!segmentationRepresentation) {
         throw new Error('Must add representation to toolgroup before setting segments');
@@ -6743,7 +6741,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       if (segmentInfo === undefined) {
         throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
       }
-      toolGroupId = toolGroupId ?? _this._getFirstToolGroupId();
+      toolGroupId = toolGroupId ?? _this._getApplicableToolGroupId();
       const segmentationRepresentation = _this._getSegmentationRepresentation(segmentationId, toolGroupId);
       if (!segmentationRepresentation) {
         throw new Error('Must add representation to toolgroup before setting segments');
@@ -6865,12 +6863,18 @@ class SegmentationService extends src/* PubSubService */.hC {
         });
       });
     };
-    this._getFirstToolGroupId = () => {
+    this._getApplicableToolGroupId = () => {
       const {
-        toolGroupService
+        toolGroupService,
+        viewportGridService,
+        cornerstoneViewportService
       } = this.servicesManager.services;
-      const toolGroupIds = toolGroupService.getToolGroupIds();
-      return toolGroupIds[0];
+      const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportGridService.getActiveViewportId());
+      if (!viewportInfo) {
+        const toolGroupIds = toolGroupService.getToolGroupIds();
+        return toolGroupIds[0];
+      }
+      return viewportInfo.getToolGroupId();
     };
     this.getNextColorLUTIndex = () => {
       let i = 0;
@@ -6914,7 +6918,7 @@ class SegmentationService extends src/* PubSubService */.hC {
     if (config?.segmentIndex === 0) {
       throw new Error('Segment index 0 is reserved for "no label"');
     }
-    const toolGroupId = config.toolGroupId ?? this._getFirstToolGroupId();
+    const toolGroupId = config.toolGroupId ?? this._getApplicableToolGroupId();
     const {
       segmentationRepresentationUID,
       segmentation
@@ -6958,7 +6962,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       if (visibility !== undefined) {
         this._setSegmentVisibility(segmentationId, segmentIndex, visibility, toolGroupId, suppressEvents);
       }
-      if (active !== undefined) {
+      if (active === true) {
         this._setActiveSegment(segmentationId, segmentIndex, suppressEvents);
       }
       if (isLocked !== undefined) {
@@ -7051,7 +7055,7 @@ class SegmentationService extends src/* PubSubService */.hC {
     this._setSegmentOpacity(segmentationId, segmentIndex, opacity, toolGroupId);
   }
   setActiveSegmentationForToolGroup(segmentationId, toolGroupId) {
-    toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
+    toolGroupId = toolGroupId ?? this._getApplicableToolGroupId();
     const suppressEvents = false;
     this._setActiveSegmentationForToolGroup(segmentationId, toolGroupId, suppressEvents);
   }
@@ -7081,6 +7085,21 @@ class SegmentationService extends src/* PubSubService */.hC {
     const segmentations = this.arrayOfObjects(this.segmentations);
     return segmentations && segmentations.map(m => this.segmentations[Object.keys(m)[0]]);
   }
+  getActiveSegmentation() {
+    const segmentations = this.getSegmentations();
+    return segmentations.find(segmentation => segmentation.isActive);
+  }
+  getActiveSegment() {
+    const activeSegmentation = this.getActiveSegmentation();
+    const {
+      activeSegmentIndex,
+      segments
+    } = activeSegmentation;
+    if (activeSegmentIndex === null) {
+      return;
+    }
+    return segments[activeSegmentIndex];
+  }
 
   /**
    * Get specific segmentation by its id.
@@ -7202,7 +7221,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       volumeId: segmentationId,
       targetBuffer: {
         type: 'Uint8Array',
-        sharedArrayBuffer: true
+        sharedArrayBuffer: window.SharedArrayBuffer
       }
     });
     const derivedVolumeScalarData = derivedVolume.getScalarData();
@@ -7439,7 +7458,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       clearInterval(this.highlightIntervalId);
     }
     const segmentation = this.getSegmentation(segmentationId);
-    toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
+    toolGroupId = toolGroupId ?? this._getApplicableToolGroupId();
     const segmentationRepresentation = this._getSegmentationRepresentation(segmentationId, toolGroupId);
     const {
       type
@@ -7569,7 +7588,7 @@ class SegmentationService extends src/* PubSubService */.hC {
         const {
           id
         } = remainingHydratedSegmentations[0];
-        this._setActiveSegmentationForToolGroup(id, this._getFirstToolGroupId(), false);
+        this._setActiveSegmentationForToolGroup(id, this._getApplicableToolGroupId(), false);
       }
     }
     this._setDisplaySetIsHydrated(segmentationId, false);
@@ -7724,7 +7743,7 @@ class SegmentationService extends src/* PubSubService */.hC {
   }
   _setSegmentVisibility(segmentationId, segmentIndex, isVisible, toolGroupId) {
     let suppressEvents = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-    toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
+    toolGroupId = toolGroupId ?? this._getApplicableToolGroupId();
     const {
       segmentationRepresentationUID,
       segmentation
@@ -8069,7 +8088,8 @@ class CornerstoneCacheService {
     for (const segmentation of segmentations) {
       const segDisplaySetInstanceUID = segmentation.displaySetInstanceUID;
       const segDisplaySet = displaySetService.getDisplaySetByUID(segDisplaySetInstanceUID);
-      const shouldDisplaySeg = segmentationService.shouldRenderSegmentation(viewportDisplaySetInstanceUIDs, segDisplaySet.instances[0].FrameOfReferenceUID);
+      const instance = segDisplaySet.instances?.[0] || segDisplaySet.instance;
+      const shouldDisplaySeg = segmentationService.shouldRenderSegmentation(viewportDisplaySetInstanceUIDs, instance.FrameOfReferenceUID);
       if (shouldDisplaySeg) {
         return true;
       }

package/dist/{957.bundle.71558794566041f37a92.js → 957.bundle.9ea4506963ef8b2d84ba.js}

@@ -12119,8 +12119,11 @@ function _handlePTModality(imageId, options) {
     if (options.isSuvScaled) {
         return 'SUV';
     }
-    const petSeriesModule = esm.metaData.get('petSeriesModule', imageId);
-    return petSeriesModule?.units || 'unitless';
+    const generalSeriesModule = esm.metaData.get('generalSeriesModule', imageId);
+    if (generalSeriesModule?.modality === 'PT') {
+        const petSeriesModule = esm.metaData.get('petSeriesModule', imageId);
+        return petSeriesModule?.units || 'unitless';
+    }
 }
 
 
@@ -12315,10 +12318,6 @@ 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].value == null) {
                     data.cachedStats[targetId] = {
@@ -12326,10 +12325,10 @@ class ProbeTool extends base_AnnotationTool {
                         index: null,
                         value: null,
                     };
-                    this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._calculateCachedStats(annotation, renderingEngine, enabledElement);
                 }
                 else if (annotation.invalidated) {
-                    this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._calculateCachedStats(annotation, renderingEngine, enabledElement);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -12403,14 +12402,18 @@ class ProbeTool extends base_AnnotationTool {
         utilities_triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
         evt.preventDefault();
     }
-    _calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions) {
+    _calculateCachedStats(annotation, renderingEngine, enabledElement) {
         const data = annotation.data;
-        const { viewportId, renderingEngineId } = enabledElement;
+        const { viewportId, renderingEngineId, viewport } = enabledElement;
         const worldPos = data.handles.points[0];
         const { cachedStats } = data;
         const targetIds = Object.keys(cachedStats);
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
+            const modalityUnitOptions = {
+                isPreScaled: isViewportPreScaled(viewport, targetId),
+                isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+            };
             const image = this.getTargetIdImage(targetId, renderingEngine);
             if (!image) {
                 continue;
@@ -12570,10 +12573,10 @@ class DragProbeTool extends annotation_ProbeTool {
                     index: null,
                     value: null,
                 };
-                this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
+                this._calculateCachedStats(annotation, renderingEngine, enabledElement);
             }
             else if (annotation.invalidated) {
-                this._calculateCachedStats(annotation, renderingEngine, enabledElement, modalityUnitOptions);
+                this._calculateCachedStats(annotation, renderingEngine, enabledElement);
             }
             if (!viewport.getRenderingEngine()) {
                 console.warn('Rendering Engine has been destroyed');
@@ -13061,10 +13064,6 @@ 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 == null) {
                     data.cachedStats[targetId] = {
@@ -13075,10 +13074,10 @@ class RectangleROITool extends base_AnnotationTool {
                         stdDev: null,
                         areaUnit: null,
                     };
-                    this._calculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._calculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement);
                 }
                 else if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._throttledCalculateCachedStats(annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -13169,9 +13168,9 @@ class RectangleROITool extends base_AnnotationTool {
                 height: Math.abs(point0[1] - point1[1]),
             };
         };
-        this._calculateCachedStats = (annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement, modalityUnitOptions) => {
+        this._calculateCachedStats = (annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement) => {
             const { data } = annotation;
-            const { viewportId, renderingEngineId } = enabledElement;
+            const { viewportId, renderingEngineId, viewport } = enabledElement;
             const worldPos1 = data.handles.points[0];
             const worldPos2 = data.handles.points[3];
             const { cachedStats } = data;
@@ -13208,6 +13207,10 @@ class RectangleROITool extends base_AnnotationTool {
                     const { worldWidth, worldHeight } = getWorldWidthAndHeightFromCorners(viewPlaneNormal, viewUp, worldPos1, worldPos2);
                     const scale = getCalibratedScale(image);
                     const area = Math.abs(worldWidth * worldHeight) / (scale * scale);
+                    const modalityUnitOptions = {
+                        isPreScaled: isViewportPreScaled(viewport, targetId),
+                        isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                    };
                     const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                     const pointsInShape = pointInShapeCallback(imageData, () => true, this.configuration.statsCalculator.statsCallback, boundsIJK);
                     const stats = this.configuration.statsCalculator.getStatistics();
@@ -13729,10 +13732,6 @@ 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 == null) {
                     data.cachedStats[targetId] = {
@@ -13743,10 +13742,10 @@ class EllipticalROITool extends base_AnnotationTool {
                         stdDev: null,
                         areaUnit: null,
                     };
-                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
                 }
                 else if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -13840,7 +13839,7 @@ class EllipticalROITool extends base_AnnotationTool {
             }
             return renderStatus;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
             const data = annotation.data;
             const { viewportId, renderingEngineId } = enabledElement;
             const { points } = data.handles;
@@ -13897,6 +13896,10 @@ class EllipticalROITool extends base_AnnotationTool {
                     const area = Math.abs(Math.PI * (worldWidth / 2) * (worldHeight / 2)) /
                         scale /
                         scale;
+                    const modalityUnitOptions = {
+                        isPreScaled: isViewportPreScaled(viewport, targetId),
+                        isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                    };
                     const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                     const pointsInShape = pointInShapeCallback(imageData, (pointLPS, pointIJK) => pointInEllipse(ellipseObj, pointLPS), this.configuration.statsCalculator.statsCallback, boundsIJK);
                     const stats = this.configuration.statsCalculator.getStatistics();
@@ -14377,10 +14380,6 @@ 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 == null) {
                     data.cachedStats[targetId] = {
@@ -14394,10 +14393,10 @@ class CircleROITool extends base_AnnotationTool {
                         radiusUnit: null,
                         perimeter: null,
                     };
-                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
                 }
                 else if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
+                    this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
                     if (viewport instanceof esm.VolumeViewport) {
                         const { referencedImageId } = annotation.metadata;
                         for (const targetId in data.cachedStats) {
@@ -14489,7 +14488,7 @@ class CircleROITool extends base_AnnotationTool {
             }
             return renderStatus;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
             const data = annotation.data;
             const { viewportId, renderingEngineId } = enabledElement;
             const { points } = data.handles;
@@ -14547,6 +14546,10 @@ class CircleROITool extends base_AnnotationTool {
                     const area = Math.abs(Math.PI *
                         (worldWidth / scale / 2) *
                         (worldHeight / aspect / scale / 2));
+                    const modalityUnitOptions = {
+                        isPreScaled: isViewportPreScaled(viewport, targetId),
+                        isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                    };
                     const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                     const pointsInShape = pointInShapeCallback(imageData, (pointLPS, pointIJK) => pointInEllipse(ellipseObj, pointLPS), this.configuration.statsCalculator.statsCallback, boundsIJK);
                     const stats = this.configuration.statsCalculator.getStatistics();
@@ -16568,10 +16571,6 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                     !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] ||
@@ -16584,17 +16583,17 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                             stdDev: null,
                             areaUnit: null,
                         };
-                        this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
+                        this._calculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
                     }
                     else if (annotation.invalidated) {
-                        this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions);
+                        this._throttledCalculateCachedStats(annotation, viewport, renderingEngine, enabledElement);
                     }
                 }
                 this._renderStats(annotation, viewport, enabledElement, svgDrawingHelper);
             });
             return renderStatus;
         };
-        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement, modalityUnitOptions) => {
+        this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
             const data = annotation.data;
             const { cachedStats, polyline: points } = data;
             const targetIds = Object.keys(cachedStats);
@@ -16688,6 +16687,10 @@ class PlanarFreehandROITool extends base_AnnotationTool {
                     }
                     return result;
                 }, this.configuration.statsCalculator.statsCallback, boundsIJK);
+                const modalityUnitOptions = {
+                    isPreScaled: isViewportPreScaled(viewport, targetId),
+                    isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
+                };
                 const modalityUnit = getModalityUnit(metadata.Modality, annotation.metadata.referencedImageId, modalityUnitOptions);
                 const stats = this.configuration.statsCalculator.getStatistics();
                 cachedStats[targetId] = {