@cornerstonejs/tools 1.81.2 → 1.81.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.81.2",
+  "version": "1.81.4",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.81.2",
+    "@cornerstonejs/core": "^1.81.4",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "c40bb7db80f4ec39a8597563dd8379f8adf79785"
+  "gitHead": "53b48392fab3f763c665d403b1f9fc3091c9510f"
 }

package/src/tools/CrosshairsTool.ts

@@ -298,7 +298,8 @@ class CrosshairsTool extends AnnotationTool {
 
   resetCrosshairs = () => {
     const viewportsInfo = this._getViewportsInfo();
-    viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
+    for (const viewportInfo of viewportsInfo) {
+      const { viewportId, renderingEngineId } = viewportInfo;
       const enabledElement = getEnabledElementByIds(
         viewportId,
         renderingEngineId
@@ -308,13 +309,13 @@ class CrosshairsTool extends AnnotationTool {
       const resetZoom = true;
       const resetToCenter = true;
       const resetRotation = true;
-      const supressEvents = true;
+      const suppressEvents = true;
       viewport.resetCamera(
         resetPan,
         resetZoom,
         resetToCenter,
         resetRotation,
-        supressEvents
+        suppressEvents
       );
       (viewport as Types.IVolumeViewport).resetSlabThickness();
       const { element } = viewport;
@@ -327,7 +328,7 @@ class CrosshairsTool extends AnnotationTool {
         removeAnnotation(annotations[0].annotationUID);
       }
       viewport.render();
-    });
+    }
 
     this.computeToolCenter(viewportsInfo);
   };
@@ -1433,7 +1434,6 @@ class CrosshairsTool extends AnnotationTool {
     data.handles.rotationPoints = newRtpoints;
     data.handles.slabThicknessPoints = newStpoints;
 
-    debugger;
     if (this.configuration.viewportIndicators) {
       const { viewportIndicatorsConfig } = this.configuration;
 

package/src/tools/annotation/PlanarFreehandROITool.ts

@@ -737,169 +737,6 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
       const { imageData, metadata } = image;
       const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
 
-      // Using an arbitrary start point (canvasPoint), calculate the
-      // mm spacing for the canvas in the X and Y directions.
-      const canvasPoint = canvasCoordinates[0];
-      const originalWorldPoint = viewport.canvasToWorld(canvasPoint);
-      const deltaXPoint = viewport.canvasToWorld([
-        canvasPoint[0] + 1,
-        canvasPoint[1],
-      ]);
-      const deltaYPoint = viewport.canvasToWorld([
-        canvasPoint[0],
-        canvasPoint[1] + 1,
-      ]);
-
-      const deltaInX = vec3.distance(originalWorldPoint, deltaXPoint);
-      const deltaInY = vec3.distance(originalWorldPoint, deltaYPoint);
-
-      const worldPosIndex = csUtils.transformWorldToIndex(imageData, points[0]);
-      worldPosIndex[0] = Math.floor(worldPosIndex[0]);
-      worldPosIndex[1] = Math.floor(worldPosIndex[1]);
-      worldPosIndex[2] = Math.floor(worldPosIndex[2]);
-
-      let iMin = worldPosIndex[0];
-      let iMax = worldPosIndex[0];
-
-      let jMin = worldPosIndex[1];
-      let jMax = worldPosIndex[1];
-
-      let kMin = worldPosIndex[2];
-      let kMax = worldPosIndex[2];
-
-      for (let j = 1; j < points.length; j++) {
-        const worldPosIndex = csUtils.transformWorldToIndex(
-          imageData,
-          points[j]
-        );
-        worldPosIndex[0] = Math.floor(worldPosIndex[0]);
-        worldPosIndex[1] = Math.floor(worldPosIndex[1]);
-        worldPosIndex[2] = Math.floor(worldPosIndex[2]);
-        iMin = Math.min(iMin, worldPosIndex[0]);
-        iMax = Math.max(iMax, worldPosIndex[0]);
-
-        jMin = Math.min(jMin, worldPosIndex[1]);
-        jMax = Math.max(jMax, worldPosIndex[1]);
-
-        kMin = Math.min(kMin, worldPosIndex[2]);
-        kMax = Math.max(kMax, worldPosIndex[2]);
-      }
-
-      const worldPosIndex2 = csUtils.transformWorldToIndex(
-        imageData,
-        points[1]
-      );
-      worldPosIndex2[0] = Math.floor(worldPosIndex2[0]);
-      worldPosIndex2[1] = Math.floor(worldPosIndex2[1]);
-      worldPosIndex2[2] = Math.floor(worldPosIndex2[2]);
-
-      const { scale, areaUnits } = getCalibratedLengthUnitsAndScale(
-        image,
-        () => {
-          const polyline = data.contour.polyline;
-          const numPoints = polyline.length;
-          const projectedPolyline = new Array(numPoints);
-
-          for (let i = 0; i < numPoints; i++) {
-            projectedPolyline[i] = viewport.worldToCanvas(polyline[i]);
-          }
-
-          const {
-            maxX: canvasMaxX,
-            maxY: canvasMaxY,
-            minX: canvasMinX,
-            minY: canvasMinY,
-          } = math.polyline.getAABB(projectedPolyline);
-
-          const topLeftBBWorld = viewport.canvasToWorld([
-            canvasMinX,
-            canvasMinY,
-          ]);
-
-          const topLeftBBIndex = csUtils.transformWorldToIndex(
-            imageData,
-            topLeftBBWorld
-          );
-
-          const bottomRightBBWorld = viewport.canvasToWorld([
-            canvasMaxX,
-            canvasMaxY,
-          ]);
-
-          const bottomRightBBIndex = csUtils.transformWorldToIndex(
-            imageData,
-            bottomRightBBWorld
-          );
-
-          return [topLeftBBIndex, bottomRightBBIndex];
-        }
-      );
-      let area = polyline.getArea(canvasCoordinates) / scale / scale;
-      // Convert from canvas_pixels ^2 to mm^2
-      area *= deltaInX * deltaInY;
-
-      // Expand bounding box
-      const iDelta = 0.01 * (iMax - iMin);
-      const jDelta = 0.01 * (jMax - jMin);
-      const kDelta = 0.01 * (kMax - kMin);
-
-      iMin = Math.floor(iMin - iDelta);
-      iMax = Math.ceil(iMax + iDelta);
-      jMin = Math.floor(jMin - jDelta);
-      jMax = Math.ceil(jMax + jDelta);
-      kMin = Math.floor(kMin - kDelta);
-      kMax = Math.ceil(kMax + kDelta);
-
-      const boundsIJK = [
-        [iMin, iMax],
-        [jMin, jMax],
-        [kMin, kMax],
-      ] as [Types.Point2, Types.Point2, Types.Point2];
-
-      const worldPosEnd = imageData.indexToWorld([iMax, jMax, kMax]);
-      const canvasPosEnd = viewport.worldToCanvas(worldPosEnd);
-
-      let curRow = 0;
-      let intersections = [];
-      let intersectionCounter = 0;
-      const pointsInShape = pointInShapeCallback(
-        imageData,
-        (pointLPS, pointIJK) => {
-          let result = true;
-          const point = viewport.worldToCanvas(pointLPS);
-          if (point[1] != curRow) {
-            intersectionCounter = 0;
-            curRow = point[1];
-            intersections = getLineSegmentIntersectionsCoordinates(
-              canvasCoordinates,
-              point,
-              [canvasPosEnd[0], point[1]]
-            );
-            intersections.sort(
-              (function (index) {
-                return function (a, b) {
-                  return a[index] === b[index]
-                    ? 0
-                    : a[index] < b[index]
-                    ? -1
-                    : 1;
-                };
-              })(0)
-            );
-          }
-          if (intersections.length && point[0] > intersections[0][0]) {
-            intersections.shift();
-            intersectionCounter++;
-          }
-          if (intersectionCounter % 2 === 0) {
-            result = false;
-          }
-          return result;
-        },
-        this.configuration.statsCalculator.statsCallback,
-        boundsIJK
-      );
-
       const modalityUnitOptions = {
         isPreScaled: isViewportPreScaled(viewport, targetId),
         isSuvScaled: this.isSuvScaled(
@@ -914,21 +751,64 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         annotation.metadata.referencedImageId,
         modalityUnitOptions
       );
+      const calibratedScale = getCalibratedLengthUnitsAndScale(image, () => {
+        const polyline = data.contour.polyline;
+        const numPoints = polyline.length;
+        const projectedPolyline = new Array(numPoints);
 
-      const stats = this.configuration.statsCalculator.getStatistics();
-
-      cachedStats[targetId] = {
-        Modality: metadata.Modality,
-        area,
-        perimeter: calculatePerimeter(canvasCoordinates, closed),
-        mean: stats.mean?.value,
-        max: stats.max?.value,
-        stdDev: stats.stdDev?.value,
-        statsArray: stats.array,
-        pointsInShape: pointsInShape,
-        areaUnit: areaUnits,
-        modalityUnit,
-      };
+        for (let i = 0; i < numPoints; i++) {
+          projectedPolyline[i] = viewport.worldToCanvas(polyline[i]);
+        }
+
+        const {
+          maxX: canvasMaxX,
+          maxY: canvasMaxY,
+          minX: canvasMinX,
+          minY: canvasMinY,
+        } = math.polyline.getAABB(projectedPolyline);
+
+        const topLeftBBWorld = viewport.canvasToWorld([canvasMinX, canvasMinY]);
+
+        const topLeftBBIndex = csUtils.transformWorldToIndex(
+          imageData,
+          topLeftBBWorld
+        );
+
+        const bottomRightBBWorld = viewport.canvasToWorld([
+          canvasMaxX,
+          canvasMaxY,
+        ]);
+
+        const bottomRightBBIndex = csUtils.transformWorldToIndex(
+          imageData,
+          bottomRightBBWorld
+        );
+
+        return [topLeftBBIndex, bottomRightBBIndex];
+      });
+
+      if (closed) {
+        this.updateClosedCachedStats({
+          targetId,
+          viewport,
+          canvasCoordinates,
+          points,
+          imageData,
+          metadata,
+          cachedStats,
+          modalityUnit,
+          calibratedScale,
+        });
+      } else {
+        this.updateOpenCachedStats({
+          metadata,
+          canvasCoordinates,
+          targetId,
+          cachedStats,
+          modalityUnit,
+          calibratedScale,
+        });
+      }
     }
 
     triggerAnnotationModified(
@@ -942,6 +822,170 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
     return cachedStats;
   };
 
+  protected updateClosedCachedStats({
+    viewport,
+    points,
+    imageData,
+    metadata,
+    cachedStats,
+    targetId,
+    modalityUnit,
+    canvasCoordinates,
+    calibratedScale,
+  }) {
+    const { scale, areaUnits, units } = calibratedScale;
+
+    // Using an arbitrary start point (canvasPoint), calculate the
+    // mm spacing for the canvas in the X and Y directions.
+    const canvasPoint = canvasCoordinates[0];
+    const originalWorldPoint = viewport.canvasToWorld(canvasPoint);
+    const deltaXPoint = viewport.canvasToWorld([
+      canvasPoint[0] + 1,
+      canvasPoint[1],
+    ]);
+    const deltaYPoint = viewport.canvasToWorld([
+      canvasPoint[0],
+      canvasPoint[1] + 1,
+    ]);
+
+    const deltaInX = vec3.distance(originalWorldPoint, deltaXPoint);
+    const deltaInY = vec3.distance(originalWorldPoint, deltaYPoint);
+
+    const worldPosIndex = csUtils.transformWorldToIndex(imageData, points[0]);
+    worldPosIndex[0] = Math.floor(worldPosIndex[0]);
+    worldPosIndex[1] = Math.floor(worldPosIndex[1]);
+    worldPosIndex[2] = Math.floor(worldPosIndex[2]);
+
+    let iMin = worldPosIndex[0];
+    let iMax = worldPosIndex[0];
+
+    let jMin = worldPosIndex[1];
+    let jMax = worldPosIndex[1];
+
+    let kMin = worldPosIndex[2];
+    let kMax = worldPosIndex[2];
+
+    for (let j = 1; j < points.length; j++) {
+      const worldPosIndex = csUtils.transformWorldToIndex(imageData, points[j]);
+      worldPosIndex[0] = Math.floor(worldPosIndex[0]);
+      worldPosIndex[1] = Math.floor(worldPosIndex[1]);
+      worldPosIndex[2] = Math.floor(worldPosIndex[2]);
+      iMin = Math.min(iMin, worldPosIndex[0]);
+      iMax = Math.max(iMax, worldPosIndex[0]);
+
+      jMin = Math.min(jMin, worldPosIndex[1]);
+      jMax = Math.max(jMax, worldPosIndex[1]);
+
+      kMin = Math.min(kMin, worldPosIndex[2]);
+      kMax = Math.max(kMax, worldPosIndex[2]);
+    }
+
+    const worldPosIndex2 = csUtils.transformWorldToIndex(imageData, points[1]);
+    worldPosIndex2[0] = Math.floor(worldPosIndex2[0]);
+    worldPosIndex2[1] = Math.floor(worldPosIndex2[1]);
+    worldPosIndex2[2] = Math.floor(worldPosIndex2[2]);
+
+    let area = polyline.getArea(canvasCoordinates) / scale / scale;
+    // Convert from canvas_pixels ^2 to mm^2
+    area *= deltaInX * deltaInY;
+
+    // Expand bounding box
+    const iDelta = 0.01 * (iMax - iMin);
+    const jDelta = 0.01 * (jMax - jMin);
+    const kDelta = 0.01 * (kMax - kMin);
+
+    iMin = Math.floor(iMin - iDelta);
+    iMax = Math.ceil(iMax + iDelta);
+    jMin = Math.floor(jMin - jDelta);
+    jMax = Math.ceil(jMax + jDelta);
+    kMin = Math.floor(kMin - kDelta);
+    kMax = Math.ceil(kMax + kDelta);
+
+    const boundsIJK = [
+      [iMin, iMax],
+      [jMin, jMax],
+      [kMin, kMax],
+    ] as [Types.Point2, Types.Point2, Types.Point2];
+
+    const worldPosEnd = imageData.indexToWorld([iMax, jMax, kMax]);
+    const canvasPosEnd = viewport.worldToCanvas(worldPosEnd);
+
+    let curRow = 0;
+    let intersections = [];
+    let intersectionCounter = 0;
+    const pointsInShape = pointInShapeCallback(
+      imageData,
+      (pointLPS, _pointIJK) => {
+        let result = true;
+        const point = viewport.worldToCanvas(pointLPS);
+        if (point[1] != curRow) {
+          intersectionCounter = 0;
+          curRow = point[1];
+          intersections = getLineSegmentIntersectionsCoordinates(
+            canvasCoordinates,
+            point,
+            [canvasPosEnd[0], point[1]]
+          );
+          intersections.sort(
+            (function (index) {
+              return function (a, b) {
+                return a[index] === b[index] ? 0 : a[index] < b[index] ? -1 : 1;
+              };
+            })(0)
+          );
+        }
+        if (intersections.length && point[0] > intersections[0][0]) {
+          intersections.shift();
+          intersectionCounter++;
+        }
+        if (intersectionCounter % 2 === 0) {
+          result = false;
+        }
+        return result;
+      },
+      this.configuration.statsCalculator.statsCallback,
+      boundsIJK
+    );
+    const stats = this.configuration.statsCalculator.getStatistics();
+
+    cachedStats[targetId] = {
+      Modality: metadata.Modality,
+      area,
+      perimeter: calculatePerimeter(canvasCoordinates, closed) / scale,
+      mean: stats.mean?.value,
+      max: stats.max?.value,
+      stdDev: stats.stdDev?.value,
+      statsArray: stats.array,
+      pointsInShape: pointsInShape,
+      /**
+       * areaUnits are sizing, eg mm^2 typically
+       * modality units are pixel value units, eg HU or other
+       * unit is linear measurement unit, eg mm
+       */
+      areaUnit: areaUnits,
+      modalityUnit,
+      unit: units,
+    };
+  }
+
+  protected updateOpenCachedStats({
+    targetId,
+    metadata,
+    canvasCoordinates,
+    cachedStats,
+    modalityUnit,
+    calibratedScale,
+  }) {
+    const { scale, units } = calibratedScale;
+
+    cachedStats[targetId] = {
+      Modality: metadata.Modality,
+      length: calculatePerimeter(canvasCoordinates, false) / scale,
+      modalityUnit,
+      unit: units,
+    };
+  }
+
   private _renderStats = (
     annotation,
     viewport,
@@ -1010,11 +1054,13 @@ function defaultGetTextLines(data, targetId): string[] {
     area,
     mean,
     stdDev,
+    length,
     perimeter,
     max,
     isEmptyArea,
     areaUnit,
     modalityUnit,
+    unit,
   } = cachedVolumeStats || {};
 
   const textLines: string[] = [];
@@ -1039,7 +1085,12 @@ function defaultGetTextLines(data, targetId): string[] {
   }
 
   if (perimeter) {
-    textLines.push(`Perimeter: ${roundNumber(perimeter)} ${modalityUnit}`);
+    textLines.push(`Perimeter: ${roundNumber(perimeter)} ${unit}`);
+  }
+
+  if (length) {
+    // No need to show length prefix as there is just the single value
+    textLines.push(`${roundNumber(length)} ${unit}`);
   }
 
   return textLines;

package/src/utilities/getCalibratedUnits.ts

@@ -16,8 +16,17 @@ const SUPPORTED_PROBE_VARIANT = [
 ];
 
 const UNIT_MAPPING = {
+  0: 'px',
+  1: 'percent',
+  2: 'dB',
   3: 'cm',
   4: 'seconds',
+  5: 'hertz',
+  6: 'dB/seconds',
+  7: 'cm/sec',
+  8: 'cm\xb2',
+  9: 'cm\xb2/s',
+  0xc: 'degrees',
 };
 
 const EPS = 1e-3;
@@ -109,10 +118,10 @@ const getCalibratedLengthUnitsAndScale = (image, handles) => {
 
     if (isSamePhysicalDelta) {
       // 1 to 1 aspect ratio, we use just one of them
-      scale = 1 / (physicalDeltaX * 10);
+      scale = 1 / physicalDeltaX;
       calibrationType = 'US Region';
-      units = 'mm';
-      areaUnits = 'mm' + SQUARE;
+      units = UNIT_MAPPING[region.physicalUnitsXDirection] || 'unknown';
+      areaUnits = units + SQUARE;
     } else {
       // here we are showing at the aspect ratio of the physical delta
       // if they are not the same, then we should show px, but the correct solution