@cornerstonejs/tools 4.15.26 → 4.15.27

package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDownActivate.js

@@ -13,7 +13,12 @@ export default function mouseDownActivate(evt) {
         return;
     }
     if (activeTool.addNewAnnotation) {
-        const annotation = activeTool.addNewAnnotation(evt, 'mouse');
-        setAnnotationSelected(annotation.annotationUID);
+        try {
+            const annotation = activeTool.addNewAnnotation(evt, 'mouse');
+            setAnnotationSelected(annotation.annotationUID);
+        }
+        catch (error) {
+            console.warn('Error adding new annotation, viewport not ready:', error);
+        }
     }
 }

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

@@ -492,12 +492,14 @@ class CircleROITool extends AnnotationTool {
                 const targetId = targetIds[i];
                 const image = this.getTargetImageData(targetId);
                 if (!image) {
+                    console.warn('image not found for stats:', targetId);
+                    delete cachedStats[targetId];
                     continue;
                 }
                 const { dimensions, imageData, metadata, voxelManager } = image;
                 const handles = points.map((point) => imageData.worldToIndex(point));
                 const calibrate = getCalibratedLengthUnitsAndScale(image, handles);
-                const radius = CircleROITool.calculateLengthInIndex(calibrate, handles);
+                const radius = CircleROITool.calculateLengthInIndex(calibrate, handles.slice(0, 2));
                 const area = Math.PI * radius * radius;
                 const perimeter = 2 * Math.PI * radius;
                 const isEmptyArea = radius === 0;

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

@@ -1,5 +1,6 @@
 import { AnnotationTool } from '../base';
 import { getEnabledElement, VolumeViewport, utilities as csUtils, getEnabledElementByViewportId, } from '@cornerstonejs/core';
+import { vec3 } from 'gl-matrix';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement';
@@ -12,7 +13,6 @@ import { ChangeTypes, Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import * as rectangle from '../../utilities/math/rectangle';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
-import getWorldWidthAndHeightFromCorners from '../../utilities/planar/getWorldWidthAndHeightFromCorners';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
@@ -448,8 +448,7 @@ class RectangleROITool extends AnnotationTool {
             const { data } = annotation;
             const { viewport } = enabledElement;
             const { element } = viewport;
-            const worldPos1 = data.handles.points[0];
-            const worldPos2 = data.handles.points[3];
+            const worldHandles = data.handles.points;
             const { cachedStats } = data;
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
@@ -459,14 +458,9 @@ class RectangleROITool extends AnnotationTool {
                     continue;
                 }
                 const { dimensions, imageData, metadata, voxelManager } = image;
-                const pos1Index = transformWorldToIndex(imageData, worldPos1);
-                pos1Index[0] = Math.floor(pos1Index[0]);
-                pos1Index[1] = Math.floor(pos1Index[1]);
-                pos1Index[2] = Math.floor(pos1Index[2]);
-                const pos2Index = transformWorldToIndex(imageData, worldPos2);
-                pos2Index[0] = Math.floor(pos2Index[0]);
-                pos2Index[1] = Math.floor(pos2Index[1]);
-                pos2Index[2] = Math.floor(pos2Index[2]);
+                const indexHandles = worldHandles.map((worldHandle) => transformWorldToIndex(imageData, worldHandle));
+                const pos1Index = indexHandles[0].map(Math.floor);
+                const pos2Index = indexHandles[3].map(Math.floor);
                 if (this._isInsideVolume(pos1Index, pos2Index, dimensions)) {
                     this.isHandleOutsideImage = false;
                     const iMin = Math.min(pos1Index[0], pos2Index[0]);
@@ -480,10 +474,12 @@ class RectangleROITool extends AnnotationTool {
                         [jMin, jMax],
                         [kMin, kMax],
                     ];
-                    const { worldWidth, worldHeight } = getWorldWidthAndHeightFromCorners(viewPlaneNormal, viewUp, worldPos1, worldPos2);
                     const handles = [pos1Index, pos2Index];
-                    const { scale, areaUnit } = getCalibratedLengthUnitsAndScale(image, handles);
-                    const area = Math.abs(worldWidth * worldHeight) / (scale * scale);
+                    const calibrate = getCalibratedLengthUnitsAndScale(image, handles);
+                    const width = RectangleROITool.calculateLengthInIndex(calibrate, indexHandles.slice(0, 2));
+                    const height = RectangleROITool.calculateLengthInIndex(calibrate, indexHandles.slice(2, 4));
+                    const area = Math.abs(width * height);
+                    const { areaUnit } = calibrate;
                     const pixelUnitsOptions = {
                         isPreScaled: isViewportPreScaled(viewport, targetId),
                         isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.26";
+export declare const version = "4.15.27";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.15.26';
+export const version = '4.15.27';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.15.26",
+  "version": "4.15.27",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.15.26",
+    "@cornerstonejs/core": "4.15.27",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "740af8d0a34bdced61440107cb8f0334dce93c47"
+  "gitHead": "af3578dd13210050d2f9c309f69483deb1f67168"
 }