@cornerstonejs/tools 1.67.1 → 1.68.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.67.1",
+  "version": "1.68.1",
   "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.67.1",
+    "@cornerstonejs/core": "^1.68.1",
     "@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": "db814beff9b7af805fcb5e84d6f1f0c7f366c624"
+  "gitHead": "bc07d0e3bfd08cffba904f3deb5ce18b3079255d"
 }

package/src/tools/annotation/PlanarFreehandROITool.ts

@@ -45,6 +45,7 @@ import pointInShapeCallback from '../../utilities/pointInShapeCallback';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { getModalityUnit } from '../../utilities/getModalityUnit';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
+import calculatePerimeter from '../../utilities/contours/calculatePerimeter';
 import ContourSegmentationBaseTool from '../base/ContourSegmentationBaseTool';
 import { KeyboardBindings, ChangeTypes } from '../../enums';
 
@@ -52,6 +53,7 @@ const { pointCanProjectOnLine } = polyline;
 const { EPSILON } = CONSTANTS;
 
 const PARALLEL_THRESHOLD = 1 - EPSILON;
+
 /**
  * PlanarFreehandROITool lets you draw annotations that define an arbitrarily drawn region.
  * You can use the PlanarFreehandROITool in all perpendicular views (axial, sagittal, coronal),
@@ -243,7 +245,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
            */
           epsilon: 0.1,
         },
-        calculateStats: false,
+        calculateStats: true,
         getTextLines: defaultGetTextLines,
         statsCalculator: BasicStatsCalculator,
       },
@@ -294,7 +296,9 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
     );
 
     this.activateDraw(evt, annotation, viewportIdsToRender);
+
     evt.preventDefault();
+
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
 
     return annotation;
@@ -350,6 +354,8 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
     } else {
       this.activateOpenContourEdit(evt, annotation, viewportIdsToRender);
     }
+
+    evt.preventDefault();
   };
 
   /**
@@ -536,16 +542,21 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
       annotation.data.handles.points.length = 0;
     };
 
-    return <PlanarFreehandROIAnnotation>csUtils.deepMerge(contourAnnotation, {
-      data: {
-        contour: {
-          polyline: [<Types.Point3>[...worldPos]],
+    const annotation = <PlanarFreehandROIAnnotation>csUtils.deepMerge(
+      contourAnnotation,
+      {
+        data: {
+          contour: {
+            polyline: [<Types.Point3>[...worldPos]],
+          },
+          label: '',
+          cachedStats: {},
         },
-        label: '',
-        cachedStats: {},
-      },
-      onInterpolationComplete,
-    });
+        onInterpolationComplete,
+      }
+    );
+
+    return annotation;
   }
 
   protected getAnnotationStyle(context) {
@@ -682,7 +693,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
   ) => {
     const { data } = annotation;
     const { cachedStats } = data;
-    const { polyline: points } = data.contour;
+    const { polyline: points, closed } = data.contour;
 
     const targetIds = Object.keys(cachedStats);
 
@@ -835,6 +846,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
       cachedStats[targetId] = {
         Modality: metadata.Modality,
         area,
+        perimeter: calculatePerimeter(canvasCoordinates, closed),
         mean: stats.mean?.value,
         max: stats.max?.value,
         stdDev: stats.stdDev?.value,
@@ -920,8 +932,16 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
 
 function defaultGetTextLines(data, targetId): string[] {
   const cachedVolumeStats = data.cachedStats[targetId];
-  const { area, mean, stdDev, max, isEmptyArea, areaUnit, modalityUnit } =
-    cachedVolumeStats || {};
+  const {
+    area,
+    mean,
+    stdDev,
+    perimeter,
+    max,
+    isEmptyArea,
+    areaUnit,
+    modalityUnit,
+  } = cachedVolumeStats || {};
 
   const textLines: string[] = [];
 
@@ -944,6 +964,10 @@ function defaultGetTextLines(data, targetId): string[] {
     textLines.push(`Std Dev: ${roundNumber(stdDev)} ${modalityUnit}`);
   }
 
+  if (perimeter) {
+    textLines.push(`Perimeter: ${roundNumber(perimeter)} ${modalityUnit}`);
+  }
+
   return textLines;
 }
 

package/src/types/ToolSpecificAnnotationTypes.ts

@@ -285,7 +285,6 @@ export interface CircleROIStartEndThresholdAnnotation extends Annotation {
 export type PlanarFreehandROIAnnotation = ContourAnnotation & {
   data: {
     label?: string;
-    isOpenContour?: boolean;
     isOpenUShapeContour?: boolean;
     // Present if isOpenUShapeContour is true:
     openUShapeContourVectorToPeak?: Types.Point3[];

package/src/utilities/contours/calculatePerimeter.ts

@@ -0,0 +1,31 @@
+/**
+ * Calculates the perimeter of a polyline.
+ *
+ * @param polyline - The polyline represented as an array of points.
+ * @param closed - Indicates whether the polyline is closed or not.
+ * @returns The perimeter of the polyline.
+ */
+function calculatePerimeter(polyline: number[][], closed: boolean): number {
+  let perimeter = 0;
+
+  for (let i = 0; i < polyline.length - 1; i++) {
+    const point1 = polyline[i];
+    const point2 = polyline[i + 1];
+    perimeter += Math.sqrt(
+      Math.pow(point2[0] - point1[0], 2) + Math.pow(point2[1] - point1[1], 2)
+    );
+  }
+
+  if (closed) {
+    const firstPoint = polyline[0];
+    const lastPoint = polyline[polyline.length - 1];
+    perimeter += Math.sqrt(
+      Math.pow(lastPoint[0] - firstPoint[0], 2) +
+        Math.pow(lastPoint[1] - firstPoint[1], 2)
+    );
+  }
+
+  return perimeter;
+}
+
+export default calculatePerimeter;

package/src/utilities/contours/index.ts

@@ -10,6 +10,7 @@ import updateContourPolyline from './updateContourPolyline';
 import acceptAutogeneratedInterpolations from './interpolation/acceptAutogeneratedInterpolations';
 import * as interpolation from './interpolation';
 import findHandlePolylineIndex from './findHandlePolylineIndex';
+import calculatePerimeter from './calculatePerimeter';
 
 export {
   areCoplanarContours,
@@ -24,4 +25,5 @@ export {
   interpolation,
   acceptAutogeneratedInterpolations,
   findHandlePolylineIndex,
+  calculatePerimeter,
 };

package/src/utilities/segmentation/triggerSegmentationRender.ts

@@ -11,7 +11,7 @@ import {
   getToolGroupForViewport,
 } from '../../store/ToolGroupManager';
 
-import SegmentationDisplayTool from '../../tools/displayTools/SegmentationDisplayTool';
+import { SegmentationDisplayTool } from '../../tools';
 import { SegmentationRenderedEventDetail } from '../../types/EventTypes';
 
 /**