@cornerstonejs/tools 3.31.0 → 3.31.1

package/dist/esm/tools/CrosshairsTool.d.ts

@@ -1,18 +1,19 @@
 import { AnnotationTool } from './base';
 import type { Types } from '@cornerstonejs/core';
-import type { Annotation, Annotations, EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes, SVGDrawingHelper } from '../types';
-interface CrosshairsAnnotation extends Annotation {
-    data: {
-        handles: {
-            rotationPoints: Types.Point3[];
-            slabThicknessPoints: Types.Point3[];
-            activeOperation: number | null;
-            toolCenter: Types.Point3;
-        };
-        activeViewportIds: string[];
-        viewportId: string;
+import type { Annotation, AnnotationData, Annotations, EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes, SVGDrawingHelper } from '../types';
+export type CrosshairsAnnotationData = AnnotationData & {
+    handles: {
+        rotationPoints: Types.Point3[];
+        slabThicknessPoints: Types.Point3[];
+        activeOperation: number | null;
+        toolCenter: Types.Point3;
     };
-}
+    activeViewportIds: string[];
+    viewportId: string;
+};
+export type CrosshairsAnnotation = Annotation & {
+    data: CrosshairsAnnotationData;
+};
 declare class CrosshairsTool extends AnnotationTool {
     static toolName: any;
     toolCenter: Types.Point3;

package/dist/esm/tools/CrosshairsTool.js

@@ -32,7 +32,6 @@ const OPERATION = {
     ROTATE: 2,
     SLAB: 3,
 };
-const EPSILON = 1e-3;
 class CrosshairsTool extends AnnotationTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse'],
@@ -1052,7 +1051,7 @@ class CrosshairsTool extends AnnotationTool {
                         ];
                         const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
                         if (!viewportDraggableRotatable) {
-                            const { rotationPoints } = this.editData.annotation.data.handles;
+                            const { rotationPoints } = (this.editData.annotation.data).handles;
                             const otherViewportRotationPoints = rotationPoints.filter((point) => point[1].uid === otherViewport.id);
                             if (otherViewportRotationPoints.length === 2) {
                                 const point1 = viewport.canvasToWorld(otherViewportRotationPoints[0][3]);

package/dist/esm/tools/OverlayGridTool.d.ts

@@ -1,12 +1,12 @@
 import type { Types } from '@cornerstonejs/core';
 import type { PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../types';
 import AnnotationDisplayTool from './base/AnnotationDisplayTool';
-export interface OverlayGridAnnotation extends Annotation {
+export type OverlayGridAnnotation = Annotation & {
     data: {
         viewportData: Map<string, object>;
         pointSets: Array<object>;
     };
-}
+};
 declare class OverlayGridTool extends AnnotationDisplayTool {
     static toolName: any;
     _throttledCalculateCachedStats: Function;

package/dist/esm/tools/SegmentationIntersectionTool.d.ts

@@ -1,12 +1,15 @@
 import type { Types } from '@cornerstonejs/core';
-import type { PublicToolProps, ToolProps, SVGDrawingHelper } from '../types';
+import type { PublicToolProps, ToolProps, SVGDrawingHelper, Annotation } from '../types';
 import AnnotationDisplayTool from './base/AnnotationDisplayTool';
-import type { Annotation } from '../types';
-export interface SegmentationIntersectionAnnotation extends Annotation {
+export type WorldPointSet = {
+    worldPointsSet: any;
+    color: any;
+};
+export type SegmentationIntersectionAnnotation = Annotation & {
     data: {
-        actorsWorldPointsMap: Map<string, Map<string, object>>;
+        actorsWorldPointsMap: Map<string, Map<string, WorldPointSet>>;
     };
-}
+};
 declare class SegmentationIntersectionTool extends AnnotationDisplayTool {
     static toolName: any;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);

package/dist/esm/tools/SegmentationIntersectionTool.js

@@ -60,7 +60,7 @@ class SegmentationIntersectionTool extends AnnotationDisplayTool {
             }
             const annotation = annotations[0];
             const { annotationUID } = annotation;
-            const actorsWorldPointsMap = annotation.data.actorsWorldPointsMap;
+            const actorsWorldPointsMap = (annotation).data.actorsWorldPointsMap;
             calculateSurfaceSegmentationIntersectionsForViewport(actorsWorldPointsMap, viewport);
             const actorEntries = viewport.getActors();
             const cacheId = getCacheId(viewport);

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

@@ -22,7 +22,7 @@ declare class VideoRedactionTool extends AnnotationTool {
     handleSelectedCallback: (evt: any, annotation: any, handle: any, interactionType?: string) => void;
     _endCallback: (evt: any) => void;
     _dragCallback: (evt: any) => void;
-    cancel(element: any): any;
+    cancel(element: any): string;
     _activateDraw: (element: any) => void;
     _deactivateDraw: (element: any) => void;
     _activateModify: (element: any) => void;

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

@@ -424,7 +424,7 @@ class VideoRedactionTool extends AnnotationTool {
         data.handles.activeHandleIndex = null;
         triggerAnnotationRenderForViewportIds(viewportUIDsToRender);
         this.editData = null;
-        return annotation.metadata.annotationUID;
+        return annotation.annotationUID;
     }
     _getImageVolumeFromTargetUID(targetUID, renderingEngine) {
         let imageVolume, viewport;

package/dist/esm/tools/base/AnnotationTool.d.ts

@@ -40,17 +40,7 @@ declare abstract class AnnotationTool extends AnnotationDisplayTool {
     private _imagePointNearToolOrHandle;
     protected static createAnnotationState(annotation: Annotation, deleting?: boolean): {
         annotationUID: string;
-        data: {
-            [key: string]: unknown;
-            handles?: import("../../types/AnnotationTypes").Handles;
-            cachedStats?: Record<string, unknown>;
-            label?: string;
-            contour?: {
-                polyline?: Types.Point3[];
-                pointsManager?: Types.IPointsManager<Types.Point3>;
-                closed?: boolean;
-            };
-        };
+        data: import("../../types").AnnotationData;
         deleting: boolean;
     };
     static createAnnotationMemo(element: any, annotation: Annotation, options?: {

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

@@ -1,5 +1,18 @@
 import type { Types } from '@cornerstonejs/core';
-type Annotation = {
+export type AnnotationMetadata = Types.ViewReference & {
+    toolName: string;
+    cameraPosition?: Types.Point3;
+    viewUp?: Types.Point3;
+    segmentColor?: any;
+};
+export type AnnotationData = {
+    handles?: Handles;
+    cachedStats?: Record<string, unknown>;
+    label?: string;
+    contour?: Contour;
+    [key: string]: unknown;
+};
+export type Annotation = {
     annotationUID?: string;
     parentAnnotationUID?: string;
     interpolationUID?: string;
@@ -10,32 +23,22 @@ type Annotation = {
     invalidated?: boolean;
     isSelected?: boolean;
     autoGenerated?: boolean;
-    metadata: Types.ViewReference & {
-        toolName: string;
-        cameraPosition?: Types.Point3;
-        viewUp?: Types.Point3;
-    };
-    data: {
-        handles?: Handles;
-        [key: string]: unknown;
-        cachedStats?: Record<string, unknown>;
-        label?: string;
-        contour?: Contour;
-    };
+    metadata?: AnnotationMetadata;
+    data: AnnotationData;
 };
-type Contour = {
+export type Contour = {
     polyline?: Types.Point3[];
     pointsManager?: Types.IPointsManager<Types.Point3>;
     closed?: boolean;
 };
-type Annotations = Array<Annotation>;
-type GroupSpecificAnnotations = {
+export type Annotations = Array<Annotation>;
+export type GroupSpecificAnnotations = {
     [toolName: string]: Annotations;
 };
-type AnnotationState = {
+export type AnnotationState = {
     [key: string]: GroupSpecificAnnotations;
 };
-type Handles = {
+export type Handles = {
     points?: Types.Point3[];
     activeHandleIndex?: number | null;
     textBox?: {
@@ -50,4 +53,3 @@ type Handles = {
     };
     [key: string]: unknown;
 };
-export type { Annotation, Annotations, GroupSpecificAnnotations, AnnotationState, Handles, };

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

@@ -8,6 +8,7 @@ export declare enum ContourWindingDirection {
 export type ContourAnnotationData = {
     data: {
         cachedStats?: Record<string, unknown>;
+        polyline?: Types.Point3[];
         contour: {
             polyline: Types.Point3[];
             closed: boolean;

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

@@ -1,4 +1,4 @@
-import type { Annotation, Annotations, AnnotationState, GroupSpecificAnnotations } from './AnnotationTypes';
+export type * from './AnnotationTypes';
 import type { ContourAnnotationData, ContourAnnotation } from './ContourAnnotation';
 import type { ContourSegmentationAnnotationData, ContourSegmentationAnnotation } from './ContourSegmentationAnnotation';
 import type * as EventTypes from './EventTypes';
@@ -47,4 +47,4 @@ import type { RepresentationStyle } from './../stateManagement/segmentation/Segm
 import type { LogicalOperation } from '../utilities/contourSegmentation';
 import type { LabelmapStyle, LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume, BaseLabelmapStyle, InactiveLabelmapStyle } from './LabelmapTypes';
 import type { SurfaceStyle, SurfaceSegmentationData, SurfaceStateStyles } from './SurfaceTypes';
-export type { Annotation, Annotations, ContourAnnotationData, ContourAnnotation, ContourSegmentationAnnotationData, ContourSegmentationAnnotation, BidirectionalData, CanvasCoordinates, IAnnotationManager, InterpolationViewportData, ImageInterpolationData, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, AnnotationGroupSelector, AnnotationRenderContext, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationRepresentation, SegmentationState, RepresentationData, RepresentationsData, SVGCursorDescriptor, SVGPoint, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, ISculptToolShape, Statistics, NamedStatistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, CardinalSplineProps, ClosestControlPoint, ClosestPoint, ClosestSplinePoint, ControlPointInfo, ISpline, SplineCurveSegment, SplineLineSegment, SplineProps, IBaseTool, RepresentationStyle, Segment, SegmentationPublicInput, LabelmapStyle, ContourStyle, SurfaceStyle, SurfaceSegmentationData, SurfaceStateStyles, LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume, BaseLabelmapStyle, InactiveLabelmapStyle, LogicalOperation, };
+export type { ContourAnnotationData, ContourAnnotation, ContourSegmentationAnnotationData, ContourSegmentationAnnotation, BidirectionalData, CanvasCoordinates, IAnnotationManager, InterpolationViewportData, ImageInterpolationData, AnnotationStyle, ToolSpecificAnnotationTypes, AnnotationGroupSelector, AnnotationRenderContext, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationRepresentation, SegmentationState, RepresentationData, RepresentationsData, SVGCursorDescriptor, SVGPoint, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, ISculptToolShape, Statistics, NamedStatistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, CardinalSplineProps, ClosestControlPoint, ClosestPoint, ClosestSplinePoint, ControlPointInfo, ISpline, SplineCurveSegment, SplineLineSegment, SplineProps, IBaseTool, RepresentationStyle, Segment, SegmentationPublicInput, LabelmapStyle, ContourStyle, SurfaceStyle, SurfaceSegmentationData, SurfaceStateStyles, LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume, BaseLabelmapStyle, InactiveLabelmapStyle, LogicalOperation, };

package/dist/esm/utilities/planar/filterAnnotationsWithinSlice.js

@@ -6,23 +6,35 @@ const PARALLEL_THRESHOLD = 1 - EPSILON;
 export default function filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirection) {
     const { viewPlaneNormal } = camera;
     const annotationsWithParallelNormals = annotations.filter((td) => {
-        let annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+        const { planeRestriction, referencedImageId } = td.metadata;
+        let { viewPlaneNormal: annotationViewPlaneNormal } = td.metadata;
+        if (planeRestriction) {
+            const { inPlaneVector1, inPlaneVector2 } = planeRestriction;
+            if (inPlaneVector1 &&
+                !isEqual(0, vec3.dot(viewPlaneNormal, inPlaneVector1))) {
+                return false;
+            }
+            if (inPlaneVector2 &&
+                !isEqual(0, vec3.dot(viewPlaneNormal, inPlaneVector2))) {
+                return false;
+            }
+            return true;
+        }
         if (!td.metadata.referencedImageId &&
             !annotationViewPlaneNormal &&
             td.metadata.FrameOfReferenceUID) {
             for (const point of td.data.handles.points) {
                 const vector = vec3.sub(vec3.create(), point, camera.focalPoint);
-                const dotProduct = vec3.dot(vector, camera.viewPlaneNormal);
+                const dotProduct = vec3.dot(vector, viewPlaneNormal);
                 if (!isEqual(dotProduct, 0)) {
                     return false;
                 }
             }
-            td.metadata.viewPlaneNormal = camera.viewPlaneNormal;
+            td.metadata.viewPlaneNormal = viewPlaneNormal;
             td.metadata.cameraFocalPoint = camera.focalPoint;
             return true;
         }
-        if (!annotationViewPlaneNormal) {
-            const { referencedImageId } = td.metadata;
+        if (!annotationViewPlaneNormal && referencedImageId) {
             const { imageOrientationPatient } = metaData.get('imagePlaneModule', referencedImageId);
             const rowCosineVec = vec3.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
             const colCosineVec = vec3.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.31.0";
+export declare const version = "3.31.1";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.31.0';
+export const version = '3.31.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.31.0",
+  "version": "3.31.1",
   "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.31.0",
+    "@cornerstonejs/core": "^3.31.1",
     "@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": "ea3e44970a9e535db1f38c8186653ffb7376ecf9"
+  "gitHead": "0fc65e9cc1d86a9a8b97ee9e7eb5802ce5e1e635"
 }