@cornerstonejs/tools 3.33.4 → 3.33.5

package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.js

@@ -140,7 +140,8 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
             this._deactivateModify(element);
             this._deactivateDraw(element);
             resetElementCursor(element);
-            const enabledElement = getEnabledElement(element);
+            const { metadata } = annotation;
+            const { enabledElement } = metadata;
             this.editData = null;
             this.isDrawing = false;
             if (this.isHandleOutsideImage &&
@@ -176,6 +177,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
                 const { annotationUID, data, metadata } = annotation;
                 const { startCoordinate, endCoordinate } = data;
                 const { points, activeHandleIndex } = data.handles;
+                const { enabledElement: annotationEnabledElement } = metadata;
                 styleSpecifier.annotationUID = annotationUID;
                 const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
                 const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
@@ -219,8 +221,12 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
                     isMiddleSlice = true;
                 }
                 data.handles.points[0][this._getIndexOfCoordinatesForViewplaneNormal(viewplaneNormal)] = middleCoordinate;
-                if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, enabledElement);
+                const iteratorVolumeIDs = annotationEnabledElement.viewport?.volumeIds.values();
+                for (const volumeId of iteratorVolumeIDs) {
+                    if (annotation.invalidated &&
+                        annotation.metadata.volumeId === volumeId) {
+                        this._throttledCalculateCachedStats(annotation, annotationEnabledElement);
+                    }
                 }
                 if (!viewport.getRenderingEngine()) {
                     console.warn('Rendering Engine has been destroyed');
@@ -323,24 +329,32 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
         const { viewPlaneNormal, spacingInNormal } = metadata;
         const { startCoordinate, endCoordinate } = data;
         const { points } = data.handles;
-        const handlesToStart = csUtils.deepClone(points);
+        const projectionAxisIndex = this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal);
         const startWorld = vec3.clone(points[0]);
+        startWorld[projectionAxisIndex] = startCoordinate;
         const endWorld = vec3.clone(points[0]);
-        const indexOfNormal = this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal);
-        startWorld[indexOfNormal] = startCoordinate;
-        endWorld[indexOfNormal] = endCoordinate;
-        handlesToStart.forEach((handlePoint) => {
-            handlePoint[indexOfNormal] = startCoordinate;
-        });
-        const distance = vec3.distance(startWorld, endWorld);
-        const newProjectionPoints = [];
-        if (distance >= 0) {
-            newProjectionPoints.push(handlesToStart.map((p) => Array.from(p)));
+        endWorld[projectionAxisIndex] = endCoordinate;
+        const direction = vec3.create();
+        vec3.subtract(direction, endWorld, startWorld);
+        const distance = vec3.length(direction);
+        if (distance === 0) {
+            const handlesOnStartPlane = points.map(p => {
+                const newPoint = vec3.clone(p);
+                newPoint[projectionAxisIndex] = startCoordinate;
+                return Array.from(newPoint);
+            });
+            data.cachedStats.projectionPoints = [handlesOnStartPlane];
+            return;
         }
-        for (let dist = spacingInNormal; dist <= distance; dist += spacingInNormal) {
+        vec3.normalize(direction, direction);
+        const handlesToStart = csUtils.deepClone(points);
+        handlesToStart[0][projectionAxisIndex] = startCoordinate;
+        handlesToStart[1][projectionAxisIndex] = startCoordinate;
+        const newProjectionPoints = [];
+        for (let dist = 0; dist <= distance + 1e-6; dist += spacingInNormal) {
             newProjectionPoints.push(handlesToStart.map((point) => {
                 const newPoint = vec3.create();
-                vec3.scaleAndAdd(newPoint, point, viewPlaneNormal, dist);
+                vec3.scaleAndAdd(newPoint, point, direction, dist);
                 return Array.from(newPoint);
             }));
         }

package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js

@@ -128,7 +128,8 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
             this._deactivateModify(element);
             this._deactivateDraw(element);
             resetElementCursor(element);
-            const enabledElement = getEnabledElement(element);
+            const { metadata } = annotation;
+            const { enabledElement } = metadata;
             this.editData = null;
             this.isDrawing = false;
             if (this.isHandleOutsideImage &&
@@ -164,6 +165,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
                 const { annotationUID, data, metadata } = annotation;
                 const { startCoordinate, endCoordinate } = data;
                 const { points, activeHandleIndex } = data.handles;
+                const { enabledElement: annotationEnabledElement } = metadata;
                 const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
                 styleSpecifier.annotationUID = annotationUID;
                 const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
@@ -194,8 +196,12 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
                     roundedCoord > Math.max(roundedStartCoord, roundedEndCoord)) {
                     continue;
                 }
-                if (annotation.invalidated) {
-                    this._throttledCalculateCachedStats(annotation, enabledElement);
+                const iteratorVolumeIDs = annotationEnabledElement.viewport?.volumeIds.values();
+                for (const volumeId of iteratorVolumeIDs) {
+                    if (annotation.invalidated &&
+                        annotation.metadata.volumeId === volumeId) {
+                        this._throttledCalculateCachedStats(annotation, annotationEnabledElement);
+                    }
                 }
                 let firstOrLastSlice = false;
                 if (roundedCoord === roundedStartCoord ||

package/dist/esm/types/AnnotationTypes.d.ts

@@ -4,6 +4,7 @@ export type AnnotationMetadata = Types.ViewReference & {
     cameraPosition?: Types.Point3;
     viewUp?: Types.Point3;
     segmentColor?: any;
+    enabledElement?: Types.IEnabledElement;
 };
 export type AnnotationData = {
     handles?: Handles;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.33.4";
+export declare const version = "3.33.5";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.33.4';
+export const version = '3.33.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.33.4",
+  "version": "3.33.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.33.4",
+    "@cornerstonejs/core": "^3.33.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": "b88b09753745ab843cb89e4232b19c9018ed075f"
+  "gitHead": "2b17e979df54cdc1fd91df95141feaa273a29de7"
 }