@cornerstonejs/tools 5.0.0 → 5.0.1

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

@@ -35,11 +35,12 @@ 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, deltaInX, deltaInY, }: {
+    protected updateClosedCachedStats({ viewport, points, imageData, metadata, voxelManager, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }: {
         viewport: any;
         points: any;
         imageData: any;
         metadata: any;
+        voxelManager: any;
         cachedStats: any;
         targetId: any;
         modalityUnit: any;

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

@@ -20,6 +20,7 @@ import { BasicStatsCalculator } from '../../utilities/math/basic';
 import ContourSegmentationBaseTool from '../base/ContourSegmentationBaseTool';
 import { KeyboardBindings, ChangeTypes, MeasurementType } from '../../enums';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
+import snapIndexBounds from '../../utilities/boundingBox/snapIndexBounds';
 const { pointCanProjectOnLine } = polyline;
 const { EPSILON } = CONSTANTS;
 const PARALLEL_THRESHOLD = 1 - EPSILON;
@@ -139,7 +140,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                 if (!image) {
                     continue;
                 }
-                const { imageData, metadata } = image;
+                const { imageData, metadata, voxelManager } = image;
                 const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
                 const modalityUnitOptions = {
                     isPreScaled: isViewportPreScaled(viewport, targetId),
@@ -181,6 +182,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
                     points,
                     imageData,
                     metadata,
+                    voxelManager,
                     cachedStats,
                     modalityUnit,
                     calibratedScale,
@@ -407,9 +409,8 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             }
         }
     }
-    updateClosedCachedStats({ viewport, points, imageData, metadata, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }) {
+    updateClosedCachedStats({ viewport, points, imageData, metadata, voxelManager, cachedStats, targetId, modalityUnit, canvasCoordinates, calibratedScale, deltaInX, deltaInY, }) {
         const { areaUnit, unit } = calibratedScale;
-        const { voxelManager } = viewport.getImageData();
         const indexPoints = points.map((point) => imageData.worldToIndex(point));
         let iMin = Number.MAX_SAFE_INTEGER;
         let iMax = Number.MIN_SAFE_INTEGER;
@@ -418,7 +419,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         let kMin = Number.MAX_SAFE_INTEGER;
         let kMax = Number.MIN_SAFE_INTEGER;
         for (let j = 0; j < points.length; j++) {
-            const worldPosIndex = indexPoints[j].map(Math.floor);
+            const worldPosIndex = indexPoints[j];
             iMin = Math.min(iMin, worldPosIndex[0]);
             iMax = Math.max(iMax, worldPosIndex[0]);
             jMin = Math.min(jMin, worldPosIndex[1]);
@@ -426,6 +427,9 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             kMin = Math.min(kMin, worldPosIndex[2]);
             kMax = Math.max(kMax, worldPosIndex[2]);
         }
+        [iMin, iMax] = snapIndexBounds(iMin, iMax);
+        [jMin, jMax] = snapIndexBounds(jMin, jMax);
+        [kMin, kMax] = snapIndexBounds(kMin, kMax);
         const area = polyline.getArea(canvasCoordinates) * deltaInX * deltaInY;
         const perimeter = PlanarFreehandROITool.calculateLengthInIndex(calibratedScale, indexPoints, closed);
         const iDelta = 0.01 * (iMax - iMin);

package/dist/esm/utilities/boundingBox/index.d.ts

@@ -1,3 +1,4 @@
 import extend2DBoundingBoxInViewAxis from './extend2DBoundingBoxInViewAxis';
 import { getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld } from './getBoundingBoxAroundShape';
-export { extend2DBoundingBoxInViewAxis, getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld, getBoundingBoxAroundShapeIJK as getBoundingBoxAroundShape, };
+import snapIndexBounds from './snapIndexBounds';
+export { extend2DBoundingBoxInViewAxis, getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld, snapIndexBounds, getBoundingBoxAroundShapeIJK as getBoundingBoxAroundShape, };

package/dist/esm/utilities/boundingBox/index.js

@@ -1,3 +1,4 @@
 import extend2DBoundingBoxInViewAxis from './extend2DBoundingBoxInViewAxis';
 import { getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld, } from './getBoundingBoxAroundShape';
-export { extend2DBoundingBoxInViewAxis, getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld, getBoundingBoxAroundShapeIJK as getBoundingBoxAroundShape, };
+import snapIndexBounds from './snapIndexBounds';
+export { extend2DBoundingBoxInViewAxis, getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld, snapIndexBounds, getBoundingBoxAroundShapeIJK as getBoundingBoxAroundShape, };

package/dist/esm/utilities/boundingBox/snapIndexBounds.d.ts

@@ -0,0 +1,3 @@
+import type { Types } from '@cornerstonejs/core';
+declare function snapIndexBounds(min: number, max: number): Types.Point2;
+export default snapIndexBounds;

package/dist/esm/utilities/boundingBox/snapIndexBounds.js

@@ -0,0 +1,9 @@
+function snapIndexBounds(min, max) {
+    const delta = max - min;
+    if (delta <= 1) {
+        const index = Math.round((min + max) / 2);
+        return [index, index];
+    }
+    return [Math.floor(min), Math.ceil(max)];
+}
+export default snapIndexBounds;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.0.0";
+export declare const version = "5.0.1";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.0.0';
+export const version = '5.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "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": "5.0.0",
+    "@cornerstonejs/core": "5.0.1",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.0.0",
+    "@cornerstonejs/core": "5.0.1",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -128,5 +128,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "d6f3fba43abcbaaf7468ff534588f6a88720b875"
+  "gitHead": "b9a412e903308bff798b913ed0f9539bbd11380a"
 }