@cornerstonejs/tools 3.19.4 → 3.19.5

package/dist/esm/tools/annotation/PlanarFreehandROITool.d.ts

@@ -35,7 +35,7 @@ declare class PlanarFreehandROITool extends ContourSegmentationBaseTool {
     protected renderAnnotationInstance(renderContext: AnnotationRenderContext): boolean;
     _calculateStatsIfActive(annotation: PlanarFreehandROIAnnotation, targetId: string, viewport: any, renderingEngine: any, enabledElement: any): void;
     private _calculateCachedStats;
-    protected updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, }: {
+    protected updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }: {
         viewport: any;
         points: any;
         imageData: any;
@@ -45,14 +45,18 @@ declare class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         modalityUnit: any;
         canvasCoordinates: any;
         calibratedScale: any;
+        deltaInX: any;
+        deltaInY: any;
     }): void;
-    protected updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, }: {
+    protected updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, deltaInX, deltaInY, }: {
         targetId: any;
         metadata: any;
         canvasCoordinates: any;
         cachedStats: any;
         modalityUnit: any;
         calibratedScale: any;
+        deltaInX: any;
+        deltaInY: any;
     }): void;
     private _renderStats;
 }

package/dist/esm/tools/annotation/PlanarFreehandROITool.js

@@ -168,6 +168,18 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                     const bottomRightBBIndex = csUtils.transformWorldToIndex(imageData, bottomRightBBWorld);
                     return [topLeftBBIndex, bottomRightBBIndex];
                 });
+                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);
                 if (closed) {
                     this.updateClosedCachedStats({
                         targetId,
@@ -179,6 +191,8 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                         cachedStats,
                         modalityUnit,
                         calibratedScale,
+                        deltaInX,
+                        deltaInY,
                     });
                 }
                 else {
@@ -189,6 +203,8 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                         cachedStats,
                         modalityUnit,
                         calibratedScale,
+                        deltaInX,
+                        deltaInY,
                     });
                 }
             }
@@ -410,21 +426,9 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             }
         }
     }
-    updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, }) {
+    updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }) {
         const { scale, areaUnit, unit } = calibratedScale;
         const { voxelManager } = viewport.getImageData();
-        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]);
@@ -453,6 +457,8 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         worldPosIndex2[2] = Math.floor(worldPosIndex2[2]);
         let area = polyline.getArea(canvasCoordinates) / scale / scale;
         area *= deltaInX * deltaInY;
+        let perimeter = calculatePerimeter(canvasCoordinates, closed) / scale;
+        perimeter *= Math.sqrt(Math.pow(deltaInX, 2) + Math.pow(deltaInY, 2));
         const iDelta = 0.01 * (iMax - iMin);
         const jDelta = 0.01 * (jMax - jMin);
         const kDelta = 0.01 * (kMax - kMin);
@@ -510,7 +516,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         cachedStats[targetId] = {
             Modality: metadata.Modality,
             area,
-            perimeter: calculatePerimeter(canvasCoordinates, closed) / scale,
+            perimeter,
             mean: stats.mean?.value,
             max: stats.max?.value,
             min: stats.min?.value,
@@ -522,11 +528,13 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             unit,
         };
     }
-    updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, }) {
+    updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, deltaInX, deltaInY, }) {
         const { scale, unit } = calibratedScale;
+        let length = calculatePerimeter(canvasCoordinates, closed) / scale;
+        length *= Math.sqrt(Math.pow(deltaInX, 2) + Math.pow(deltaInY, 2));
         cachedStats[targetId] = {
             Modality: metadata.Modality,
-            length: calculatePerimeter(canvasCoordinates, false) / scale,
+            length,
             modalityUnit,
             unit,
         };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.19.4";
+export declare const version = "3.19.5";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.19.4';
+export const version = '3.19.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.19.4",
+  "version": "3.19.5",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.19.4",
+    "@cornerstonejs/core": "^3.19.5",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "dd5d1bd7024e51dcfa9811554f9e7c2d2ae4c90a"
+  "gitHead": "0ac2936cd680904f6af5a2da670548d92399a727"
 }