@cornerstonejs/tools 4.22.6 → 4.22.7

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

@@ -335,12 +335,9 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 const deltaInX = vec3.distance(originalWorldPoint, deltaXPoint);
                 const deltaInY = vec3.distance(originalWorldPoint, deltaYPoint);
                 const { imageData } = image;
-                const { scale, areaUnit } = getCalibratedLengthUnitsAndScale(image, () => {
+                const { areaUnit } = getCalibratedLengthUnitsAndScale(image, () => {
                     const { maxX: canvasMaxX, maxY: canvasMaxY, minX: canvasMinX, minY: canvasMinY, } = math.polyline.getAABB(canvasCoordinates);
-                    const topLeftBBWorld = viewport.canvasToWorld([
-                        canvasMinX,
-                        canvasMinY,
-                    ]);
+                    const topLeftBBWorld = viewport.canvasToWorld([canvasMinX, canvasMinY]);
                     const topLeftBBIndex = utilities.transformWorldToIndex(imageData, topLeftBBWorld);
                     const bottomRightBBWorld = viewport.canvasToWorld([
                         canvasMaxX,
@@ -349,8 +346,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                     const bottomRightBBIndex = utilities.transformWorldToIndex(imageData, bottomRightBBWorld);
                     return [topLeftBBIndex, bottomRightBBIndex];
                 });
-                let area = math.polyline.getArea(canvasCoordinates) / scale / scale;
-                area *= deltaInX * deltaInY;
+                const area = math.polyline.getArea(canvasCoordinates) * deltaInX * deltaInY;
                 cachedStats[targetId] = {
                     Modality: metadata.Modality,
                     area,

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

@@ -409,7 +409,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         }
     }
     updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }) {
-        const { scale, areaUnit, unit } = calibratedScale;
+        const { areaUnit, unit } = calibratedScale;
         const { voxelManager } = viewport.getImageData();
         const indexPoints = points.map((point) => imageData.worldToIndex(point));
         let iMin = Number.MAX_SAFE_INTEGER;
@@ -427,8 +427,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             kMin = Math.min(kMin, worldPosIndex[2]);
             kMax = Math.max(kMax, worldPosIndex[2]);
         }
-        let area = polyline.getArea(canvasCoordinates) / scale / scale;
-        area *= deltaInX * deltaInY;
+        const area = polyline.getArea(canvasCoordinates) * deltaInX * deltaInY;
         const perimeter = PlanarFreehandROITool.calculateLengthInIndex(calibratedScale, indexPoints, closed);
         const iDelta = 0.01 * (iMax - iMin);
         const jDelta = 0.01 * (jMax - jMin);

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

@@ -456,8 +456,14 @@ class RectangleROITool extends AnnotationTool {
                     ];
                     const handles = [pos1Index, pos2Index];
                     const calibrate = getCalibratedLengthUnitsAndScale(image, handles);
-                    const width = RectangleROITool.calculateLengthInIndex(calibrate, indexHandles.slice(0, 2));
-                    const height = RectangleROITool.calculateLengthInIndex(calibrate, indexHandles.slice(2, 4));
+                    const width = RectangleROITool.calculateLengthInIndex(calibrate, [
+                        indexHandles[0],
+                        indexHandles[1],
+                    ]);
+                    const height = RectangleROITool.calculateLengthInIndex(calibrate, [
+                        indexHandles[0],
+                        indexHandles[2],
+                    ]);
                     const area = Math.abs(width * height);
                     const { areaUnit } = calibrate;
                     const pixelUnitsOptions = {

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

@@ -473,12 +473,9 @@ class SplineROITool extends ContourSegmentationBaseTool {
                 const deltaInX = vec3.distance(originalWorldPoint, deltaXPoint);
                 const deltaInY = vec3.distance(originalWorldPoint, deltaYPoint);
                 const { imageData } = image;
-                const { scale, areaUnit } = getCalibratedLengthUnitsAndScale(image, () => {
+                const { areaUnit } = getCalibratedLengthUnitsAndScale(image, () => {
                     const { maxX: canvasMaxX, maxY: canvasMaxY, minX: canvasMinX, minY: canvasMinY, } = math.polyline.getAABB(canvasCoordinates);
-                    const topLeftBBWorld = viewport.canvasToWorld([
-                        canvasMinX,
-                        canvasMinY,
-                    ]);
+                    const topLeftBBWorld = viewport.canvasToWorld([canvasMinX, canvasMinY]);
                     const topLeftBBIndex = utilities.transformWorldToIndex(imageData, topLeftBBWorld);
                     const bottomRightBBWorld = viewport.canvasToWorld([
                         canvasMaxX,
@@ -487,8 +484,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
                     const bottomRightBBIndex = utilities.transformWorldToIndex(imageData, bottomRightBBWorld);
                     return [topLeftBBIndex, bottomRightBBIndex];
                 });
-                let area = math.polyline.getArea(canvasCoordinates) / scale / scale;
-                area *= deltaInX * deltaInY;
+                const area = math.polyline.getArea(canvasCoordinates) * deltaInX * deltaInY;
                 cachedStats[targetId] = {
                     Modality: metadata.Modality,
                     area,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.22.6";
+export declare const version = "4.22.7";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.22.6';
+export const version = '4.22.7';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.22.6",
+  "version": "4.22.7",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -105,11 +105,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "4.22.6",
+    "@cornerstonejs/core": "4.22.7",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.22.6",
+    "@cornerstonejs/core": "4.22.7",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -128,5 +128,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "7f73487d7ef2023ee875a7da3c4ee31ccbc12175"
+  "gitHead": "0cc73058d26dd99741a7682ff8ee1256106a8eeb"
 }