@cornerstonejs/tools 0.61.2 → 0.61.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.61.2",
+  "version": "0.61.4",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -26,7 +26,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^0.41.2",
+    "@cornerstonejs/core": "^0.42.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "e682bc7d33796f1ff962e42f3bed54d276dc6ad4"
+  "gitHead": "1ddefd3cf71aff541732dd6879dd282866e37217"
 }

package/src/tools/annotation/CircleROITool.ts

@@ -799,7 +799,18 @@ class CircleROITool extends AnnotationTool {
 
       const isPreScaled = isViewportPreScaled(viewport, targetId);
 
-      const textLines = this._getTextLines(data, targetId, isPreScaled);
+      const isSuvScaled = this.isSuvScaled(
+        viewport,
+        targetId,
+        annotation.metadata.referencedImageId
+      );
+
+      const textLines = this._getTextLines(
+        data,
+        targetId,
+        isPreScaled,
+        isSuvScaled
+      );
       if (!textLines || textLines.length === 0) {
         continue;
       }
@@ -843,7 +854,12 @@ class CircleROITool extends AnnotationTool {
     return renderStatus;
   };
 
-  _getTextLines = (data, targetId: string, isPreScaled: boolean): string[] => {
+  _getTextLines = (
+    data,
+    targetId: string,
+    isPreScaled: boolean,
+    isSuvScaled: boolean
+  ): string[] => {
     const cachedVolumeStats = data.cachedStats[targetId];
     const {
       radius,
@@ -858,7 +874,7 @@ class CircleROITool extends AnnotationTool {
     } = cachedVolumeStats;
 
     const textLines: string[] = [];
-    const unit = getModalityUnit(Modality, isPreScaled);
+    const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
 
     if (radius) {
       const radiusLine = isEmptyArea

package/src/tools/annotation/DragProbeTool.ts

@@ -187,7 +187,18 @@ class DragProbeTool extends ProbeTool {
 
     const isPreScaled = isViewportPreScaled(viewport, targetId);
 
-    const textLines = this._getTextLines(data, targetId, isPreScaled);
+    const isSuvScaled = this.isSuvScaled(
+      viewport,
+      targetId,
+      annotation.metadata.referencedImageId
+    );
+
+    const textLines = this._getTextLines(
+      data,
+      targetId,
+      isPreScaled,
+      isSuvScaled
+    );
     if (textLines) {
       const textCanvasCoordinates = [
         canvasCoordinates[0] + 6,

package/src/tools/annotation/EllipticalROITool.ts

@@ -927,7 +927,18 @@ class EllipticalROITool extends AnnotationTool {
 
       const isPreScaled = isViewportPreScaled(viewport, targetId);
 
-      const textLines = this._getTextLines(data, targetId, isPreScaled);
+      const isSuvScaled = this.isSuvScaled(
+        viewport,
+        targetId,
+        annotation.metadata.referencedImageId
+      );
+
+      const textLines = this._getTextLines(
+        data,
+        targetId,
+        isPreScaled,
+        isSuvScaled
+      );
       if (!textLines || textLines.length === 0) {
         continue;
       }
@@ -971,13 +982,18 @@ class EllipticalROITool extends AnnotationTool {
     return renderStatus;
   };
 
-  _getTextLines = (data, targetId: string, isPreScaled: boolean): string[] => {
+  _getTextLines = (
+    data,
+    targetId: string,
+    isPreScaled: boolean,
+    isSuvScaled: boolean
+  ): string[] => {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { area, mean, stdDev, max, isEmptyArea, Modality, areaUnit } =
       cachedVolumeStats;
 
     const textLines: string[] = [];
-    const unit = getModalityUnit(Modality, isPreScaled);
+    const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
 
     if (area) {
       const areaLine = isEmptyArea

package/src/tools/annotation/ProbeTool.ts

@@ -504,7 +504,18 @@ class ProbeTool extends AnnotationTool {
 
       const isPreScaled = isViewportPreScaled(viewport, targetId);
 
-      const textLines = this._getTextLines(data, targetId, isPreScaled);
+      const isSuvScaled = this.isSuvScaled(
+        viewport,
+        targetId,
+        annotation.metadata.referencedImageId
+      );
+
+      const textLines = this._getTextLines(
+        data,
+        targetId,
+        isPreScaled,
+        isSuvScaled
+      );
       if (textLines) {
         const textCanvasCoordinates = [
           canvasCoordinates[0] + 6,
@@ -529,7 +540,8 @@ class ProbeTool extends AnnotationTool {
   _getTextLines(
     data,
     targetId: string,
-    isPreScaled: boolean
+    isPreScaled: boolean,
+    isSuvScaled: boolean
   ): string[] | undefined {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { index, Modality, value, SUVBw, SUVLbm, SUVBsa } = cachedVolumeStats;
@@ -539,7 +551,7 @@ class ProbeTool extends AnnotationTool {
     }
 
     const textLines = [];
-    const unit = getModalityUnit(Modality, isPreScaled);
+    const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
 
     textLines.push(`(${index[0]}, ${index[1]}, ${index[2]})`);
 
@@ -567,7 +579,7 @@ class ProbeTool extends AnnotationTool {
     // Check if we have scaling for the other 2 SUV types for the PET.
     if (
       modality === 'PT' &&
-      imageVolume.scaling.PET &&
+      imageVolume.scaling?.PET &&
       (imageVolume.scaling.PET.suvbwToSuvbsa ||
         imageVolume.scaling.PET.suvbwToSuvlbm)
     ) {

package/src/tools/annotation/RectangleROITool.ts

@@ -771,7 +771,18 @@ class RectangleROITool extends AnnotationTool {
 
       const isPreScaled = isViewportPreScaled(viewport, targetId);
 
-      const textLines = this._getTextLines(data, targetId, isPreScaled);
+      const isSuvScaled = this.isSuvScaled(
+        viewport,
+        targetId,
+        annotation.metadata.referencedImageId
+      );
+
+      const textLines = this._getTextLines(
+        data,
+        targetId,
+        isPreScaled,
+        isSuvScaled
+      );
       if (!textLines || textLines.length === 0) {
         continue;
       }
@@ -841,7 +852,8 @@ class RectangleROITool extends AnnotationTool {
   _getTextLines = (
     data,
     targetId: string,
-    isPreScaled: boolean
+    isPreScaled: boolean,
+    isSuvScaled: boolean
   ): string[] | undefined => {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { area, mean, max, stdDev, Modality, areaUnit } = cachedVolumeStats;
@@ -851,7 +863,7 @@ class RectangleROITool extends AnnotationTool {
     }
 
     const textLines: string[] = [];
-    const unit = getModalityUnit(Modality, isPreScaled);
+    const unit = getModalityUnit(Modality, isPreScaled, isSuvScaled);
 
     textLines.push(`Area: ${area.toFixed(2)} ${areaUnit}\xb2`);
     textLines.push(`Mean: ${mean.toFixed(2)} ${unit}`);

package/src/tools/base/AnnotationTool.ts

@@ -1,4 +1,10 @@
-import { getEnabledElement } from '@cornerstonejs/core';
+import {
+  BaseVolumeViewport,
+  StackViewport,
+  cache,
+  getEnabledElement,
+  metaData,
+} from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 
 import { vec2 } from 'gl-matrix';
@@ -260,6 +266,31 @@ abstract class AnnotationTool extends AnnotationDisplayTool {
     };
   }
 
+  /**
+   * Returns true if the viewport is scaled to SUV units
+   * @param viewport - The viewport
+   * @param targetId - The annotation targetId
+   * @param imageId - The annotation imageId
+   * @returns
+   */
+  isSuvScaled(
+    viewport: Types.IStackViewport | Types.IVolumeViewport,
+    targetId: string,
+    imageId?: string
+  ): boolean {
+    if (viewport instanceof BaseVolumeViewport) {
+      const volumeId = targetId.split('volumeId:')[1];
+      const volume = cache.getVolume(volumeId);
+      return volume.scaling?.PET !== undefined;
+    } else if (viewport instanceof StackViewport) {
+      const scalingModule: Types.ScalingParameters | undefined =
+        imageId && metaData.get('scalingModule', imageId);
+      return typeof scalingModule?.suvbw === 'number';
+    } else {
+      throw new Error('Viewport is not a valid type');
+    }
+  }
+
   /**
    * Returns true if the `canvasCoords` are near a handle or selectable part of the tool
    *

package/src/utilities/getModalityUnit.ts

@@ -1,7 +1,15 @@
-function getModalityUnit(modality: string, isPreScaled: boolean): string {
+function getModalityUnit(
+  modality: string,
+  isPreScaled: boolean,
+  isSuvScaled: boolean
+): string {
   if (modality === 'CT') {
     return 'HU';
-  } else if (modality === 'PT' && isPreScaled === true) {
+  } else if (
+    modality === 'PT' &&
+    isPreScaled === true &&
+    isSuvScaled === true
+  ) {
     return 'SUV';
   } else {
     return '';