@cornerstonejs/tools 2.0.0-beta.29 → 2.0.0-beta.30

package/dist/esm/index.d.ts

@@ -9,7 +9,7 @@ import * as cursors from './cursors';
 import * as Types from './types';
 import * as annotation from './stateManagement/annotation';
 import * as segmentation from './stateManagement/segmentation';
-import { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, KeyImageTool, CrosshairsTool, ReferenceLinesTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OverlayGridTool, SegmentationIntersectionTool, EraserTool, SculptorTool, SegmentSelectTool, WindowLevelRegionTool } from './tools';
+import { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, KeyImageTool, CrosshairsTool, ReferenceLinesTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OverlayGridTool, SegmentationIntersectionTool, EraserTool, SculptorTool, SegmentSelectTool, WindowLevelRegionTool, VolumeRotateMouseWheelTool } from './tools';
 import VideoRedactionTool from './tools/annotation/VideoRedactionTool';
 import * as Enums from './enums';
-export { VideoRedactionTool, init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ScaleOverlayTool, SculptorTool, EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, OrientationMarkerTool, SegmentSelectTool, synchronizers, Synchronizer, SynchronizerManager, PaintFillTool, Types, state, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
+export { VideoRedactionTool, init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ScaleOverlayTool, SculptorTool, EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, OrientationMarkerTool, SegmentSelectTool, synchronizers, Synchronizer, SynchronizerManager, PaintFillTool, Types, state, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, VolumeRotateMouseWheelTool, };

package/dist/esm/index.js

@@ -9,7 +9,7 @@ import * as cursors from './cursors';
 import * as Types from './types';
 import * as annotation from './stateManagement/annotation';
 import * as segmentation from './stateManagement/segmentation';
-import { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, KeyImageTool, CrosshairsTool, ReferenceLinesTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OverlayGridTool, SegmentationIntersectionTool, EraserTool, SculptorTool, SegmentSelectTool, WindowLevelRegionTool, } from './tools';
+import { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, KeyImageTool, CrosshairsTool, ReferenceLinesTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OverlayGridTool, SegmentationIntersectionTool, EraserTool, SculptorTool, SegmentSelectTool, WindowLevelRegionTool, VolumeRotateMouseWheelTool, } from './tools';
 import VideoRedactionTool from './tools/annotation/VideoRedactionTool';
 import * as Enums from './enums';
-export { VideoRedactionTool, init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ScaleOverlayTool, SculptorTool, EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, OrientationMarkerTool, SegmentSelectTool, synchronizers, Synchronizer, SynchronizerManager, PaintFillTool, Types, state, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
+export { VideoRedactionTool, init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, ZoomTool, StackScrollTool, PlanarRotateTool, MIPJumpToClickTool, LengthTool, HeightTool, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, SplineContourSegmentationTool, BidirectionalTool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ScaleOverlayTool, SculptorTool, EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, BrushTool, OrientationMarkerTool, SegmentSelectTool, synchronizers, Synchronizer, SynchronizerManager, PaintFillTool, Types, state, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, VolumeRotateMouseWheelTool, };

package/dist/esm/stateManagement/segmentation/polySeg/Surface/createAndCacheSurfacesFromRaw.js

@@ -23,7 +23,7 @@ export async function createAndCacheSurfacesFromRaw(segmentationId, rawSurfacesD
         const geometryId = closedSurface.id;
         geometryIds.set(segmentIndex, geometryId);
         return geometryLoader.createAndCacheGeometry(geometryId, {
-            type: Enums.GeometryType.Surface,
+            type: Enums.GeometryType.SURFACE,
             geometryData: closedSurface,
         });
     });

package/dist/esm/store/ToolGroupManager/createToolGroup.d.ts

@@ -1,3 +1,3 @@
 import type { IToolGroup } from '../../types';
-declare function createToolGroup(toolGroupId: string): IToolGroup;
+declare function createToolGroup(toolGroupId: string): IToolGroup | undefined;
 export default createToolGroup;

package/dist/esm/store/ToolGroupManager/createToolGroup.js

@@ -1,10 +1,10 @@
 import { state } from '../state';
 import ToolGroup from './ToolGroup';
 function createToolGroup(toolGroupId) {
-    const toolGroupWithSameId = state.toolGroups.find((tg) => tg.id === toolGroupId);
-    if (toolGroupWithSameId) {
+    const toolGroupWithIdExists = state.toolGroups.some((tg) => tg.id === toolGroupId);
+    if (toolGroupWithIdExists) {
         console.warn(`'${toolGroupId}' already exists.`);
-        return toolGroupWithSameId;
+        return;
     }
     const toolGroup = new ToolGroup(toolGroupId);
     state.toolGroups.push(toolGroup);

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

@@ -8,9 +8,7 @@ declare class StackScrollTool extends BaseTool {
     mouseDragCallback(evt: EventTypes.InteractionEventType): void;
     touchDragCallback(evt: EventTypes.InteractionEventType): void;
     _dragCallback(evt: EventTypes.InteractionEventType): void;
-    _rotateDrag(evt: EventTypes.InteractionEventType): void;
     _scrollDrag(evt: EventTypes.InteractionEventType): void;
-    _rotate(evt: any): void;
     _scroll(evt: EventTypes.MouseWheelEventType): void;
     _getPixelPerImage(viewport: any): number;
 }

package/dist/esm/tools/StackScrollTool.js

@@ -1,13 +1,6 @@
 import { getEnabledElementByIds, getEnabledElement, VolumeViewport, BaseVolumeViewport, } from '@cornerstonejs/core';
 import { BaseTool } from './base';
 import { scroll } from '../utilities';
-import { mat4, vec3 } from 'gl-matrix';
-const DIRECTIONS = {
-    X: [1, 0, 0],
-    Y: [0, 1, 0],
-    Z: [0, 0, 1],
-    CUSTOM: [],
-};
 class StackScrollTool extends BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -15,23 +8,13 @@ class StackScrollTool extends BaseTool {
             invert: false,
             debounceIfNotLoaded: true,
             loop: false,
-            rotate: {
-                enabled: false,
-                direction: DIRECTIONS.Z,
-                rotateIncrementDegrees: 30,
-            },
         },
     }) {
         super(toolProps, defaultToolProps);
         this.deltaY = 1;
     }
     mouseWheelCallback(evt) {
-        if (this.configuration.rotate.enabled) {
-            this._rotate(evt);
-        }
-        else {
-            this._scroll(evt);
-        }
+        this._scroll(evt);
     }
     mouseDragCallback(evt) {
         this._dragCallback(evt);
@@ -40,42 +23,7 @@ class StackScrollTool extends BaseTool {
         this._dragCallback(evt);
     }
     _dragCallback(evt) {
-        if (this.configuration.rotate.enabled) {
-            this._rotateDrag(evt);
-        }
-        else {
-            this._scrollDrag(evt);
-        }
-    }
-    _rotateDrag(evt) {
-        const { deltaPoints, element } = evt.detail;
-        const enabledElement = getEnabledElement(element);
-        const { viewport } = enabledElement;
-        const { direction, rotateIncrementDegrees } = this.configuration.rotate;
-        const camera = viewport.getCamera();
-        const { viewUp, position, focalPoint } = camera;
-        const deltaY = deltaPoints.canvas[1];
-        const [cx, cy, cz] = focalPoint;
-        const [ax, ay, az] = direction;
-        const angle = (deltaY * (rotateIncrementDegrees * Math.PI)) / 180;
-        const newPosition = [0, 0, 0];
-        const newFocalPoint = [0, 0, 0];
-        const newViewUp = [0, 0, 0];
-        const transform = mat4.identity(new Float32Array(16));
-        mat4.translate(transform, transform, [cx, cy, cz]);
-        mat4.rotate(transform, transform, angle, [ax, ay, az]);
-        mat4.translate(transform, transform, [-cx, -cy, -cz]);
-        vec3.transformMat4(newPosition, position, transform);
-        vec3.transformMat4(newFocalPoint, focalPoint, transform);
-        mat4.identity(transform);
-        mat4.rotate(transform, transform, angle, [ax, ay, az]);
-        vec3.transformMat4(newViewUp, viewUp, transform);
-        viewport.setCamera({
-            position: newPosition,
-            viewUp: newViewUp,
-            focalPoint: newFocalPoint,
-        });
-        viewport.render();
+        this._scrollDrag(evt);
     }
     _scrollDrag(evt) {
         const { deltaPoints, viewportId, renderingEngineId } = evt.detail;
@@ -105,36 +53,6 @@ class StackScrollTool extends BaseTool {
             this.deltaY = deltaY;
         }
     }
-    _rotate(evt) {
-        const { element, wheel } = evt.detail;
-        const enabledElement = getEnabledElement(element);
-        const { viewport } = enabledElement;
-        const { direction, rotateIncrementDegrees } = this.configuration.rotate;
-        const camera = viewport.getCamera();
-        const { viewUp, position, focalPoint } = camera;
-        const { direction: deltaY } = wheel;
-        const [cx, cy, cz] = focalPoint;
-        const [ax, ay, az] = direction;
-        const angle = (deltaY * (rotateIncrementDegrees * Math.PI)) / 180;
-        const newPosition = [0, 0, 0];
-        const newFocalPoint = [0, 0, 0];
-        const newViewUp = [0, 0, 0];
-        const transform = mat4.identity(new Float32Array(16));
-        mat4.translate(transform, transform, [cx, cy, cz]);
-        mat4.rotate(transform, transform, angle, [ax, ay, az]);
-        mat4.translate(transform, transform, [-cx, -cy, -cz]);
-        vec3.transformMat4(newPosition, position, transform);
-        vec3.transformMat4(newFocalPoint, focalPoint, transform);
-        mat4.identity(transform);
-        mat4.rotate(transform, transform, angle, [ax, ay, az]);
-        vec3.transformMat4(newViewUp, viewUp, transform);
-        viewport.setCamera({
-            position: newPosition,
-            viewUp: newViewUp,
-            focalPoint: newFocalPoint,
-        });
-        viewport.render();
-    }
     _scroll(evt) {
         const { wheel, element } = evt.detail;
         const { direction } = wheel;

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

@@ -0,0 +1,10 @@
+import { BaseTool } from './base';
+import type { PublicToolProps, ToolProps } from '../types';
+import type { MouseWheelEventType } from '../types/EventTypes';
+declare class VolumeRotateMouseWheelTool extends BaseTool {
+    static toolName: any;
+    _configuration: any;
+    constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
+    mouseWheelCallback(evt: MouseWheelEventType): void;
+}
+export default VolumeRotateMouseWheelTool;

package/dist/esm/tools/VolumeRotateMouseWheelTool.js

@@ -0,0 +1,52 @@
+import { BaseTool } from './base';
+import { getEnabledElement } from '@cornerstonejs/core';
+import { mat4, vec3 } from 'gl-matrix';
+const DIRECTIONS = {
+    X: [1, 0, 0],
+    Y: [0, 1, 0],
+    Z: [0, 0, 1],
+    CUSTOM: [],
+};
+class VolumeRotateMouseWheelTool extends BaseTool {
+    constructor(toolProps = {}, defaultToolProps = {
+        supportedInteractionTypes: ['Mouse', 'Touch'],
+        configuration: {
+            direction: DIRECTIONS.Z,
+            rotateIncrementDegrees: 30,
+        },
+    }) {
+        super(toolProps, defaultToolProps);
+    }
+    mouseWheelCallback(evt) {
+        const { element, wheel } = evt.detail;
+        const enabledElement = getEnabledElement(element);
+        const { viewport } = enabledElement;
+        const { direction, rotateIncrementDegrees } = this.configuration;
+        const camera = viewport.getCamera();
+        const { viewUp, position, focalPoint } = camera;
+        const { direction: deltaY } = wheel;
+        const [cx, cy, cz] = focalPoint;
+        const [ax, ay, az] = direction;
+        const angle = (deltaY * (rotateIncrementDegrees * Math.PI)) / 180;
+        const newPosition = [0, 0, 0];
+        const newFocalPoint = [0, 0, 0];
+        const newViewUp = [0, 0, 0];
+        const transform = mat4.identity(new Float32Array(16));
+        mat4.translate(transform, transform, [cx, cy, cz]);
+        mat4.rotate(transform, transform, angle, [ax, ay, az]);
+        mat4.translate(transform, transform, [-cx, -cy, -cz]);
+        vec3.transformMat4(newPosition, position, transform);
+        vec3.transformMat4(newFocalPoint, focalPoint, transform);
+        mat4.identity(transform);
+        mat4.rotate(transform, transform, angle, [ax, ay, az]);
+        vec3.transformMat4(newViewUp, viewUp, transform);
+        viewport.setCamera({
+            position: newPosition,
+            viewUp: newViewUp,
+            focalPoint: newFocalPoint,
+        });
+        viewport.render();
+    }
+}
+VolumeRotateMouseWheelTool.toolName = 'VolumeRotateMouseWheel';
+export default VolumeRotateMouseWheelTool;

package/dist/esm/tools/displayTools/Contour/contourHandler/utils.js

@@ -7,7 +7,7 @@ export function validateGeometry(geometry) {
         throw new Error(`No contours found for geometryId ${geometry.id}`);
     }
     const geometryId = geometry.id;
-    if (geometry.type !== Enums.GeometryType.Contour) {
+    if (geometry.type !== Enums.GeometryType.CONTOUR) {
         throw new Error(`Geometry type ${geometry.type} not supported for rendering.`);
     }
     if (!geometry.data) {

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

@@ -16,6 +16,7 @@ import SegmentationIntersectionTool from './SegmentationIntersectionTool';
 import ReferenceCursors from './ReferenceCursors';
 import ScaleOverlayTool from './ScaleOverlayTool';
 import SculptorTool from './SculptorTool';
+import VolumeRotateMouseWheelTool from './VolumeRotateMouseWheelTool';
 import BidirectionalTool from './annotation/BidirectionalTool';
 import LengthTool from './annotation/LengthTool';
 import HeightTool from './annotation/HeightTool';
@@ -46,4 +47,4 @@ import BrushTool from './segmentation/BrushTool';
 import PaintFillTool from './segmentation/PaintFillTool';
 import OrientationMarkerTool from './OrientationMarkerTool';
 import SegmentSelectTool from './segmentation/SegmentSelectTool';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, VolumeRotateMouseWheelTool, };

package/dist/esm/tools/index.js

@@ -16,6 +16,7 @@ import SegmentationIntersectionTool from './SegmentationIntersectionTool';
 import ReferenceCursors from './ReferenceCursors';
 import ScaleOverlayTool from './ScaleOverlayTool';
 import SculptorTool from './SculptorTool';
+import VolumeRotateMouseWheelTool from './VolumeRotateMouseWheelTool';
 import BidirectionalTool from './annotation/BidirectionalTool';
 import LengthTool from './annotation/LengthTool';
 import HeightTool from './annotation/HeightTool';
@@ -46,4 +47,4 @@ import BrushTool from './segmentation/BrushTool';
 import PaintFillTool from './segmentation/PaintFillTool';
 import OrientationMarkerTool from './OrientationMarkerTool';
 import SegmentSelectTool from './segmentation/SegmentSelectTool';
-export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, WindowLevelRegionTool, StackScrollTool, PlanarRotateTool, ZoomTool, MIPJumpToClickTool, ReferenceCursors, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, BidirectionalTool, LengthTool, HeightTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, SplineROITool, PlanarFreehandROITool, PlanarFreehandContourSegmentationTool, LivewireContourTool, LivewireContourSegmentationTool, ArrowAnnotateTool, AngleTool, CobbAngleTool, UltrasoundDirectionalTool, KeyImageTool, AnnotationEraserTool as EraserTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, CircleROIStartEndThresholdTool, SplineContourSegmentationTool, BrushTool, MagnifyTool, AdvancedMagnifyTool, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, SculptorTool, SegmentSelectTool, VolumeRotateMouseWheelTool, };

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

@@ -224,7 +224,7 @@ class BrushTool extends BaseTool {
                 eventTarget.dispatchEvent(event);
                 return null;
             }
-            const volumes = actors.map((actorEntry) => cache.getVolume(actorEntry.referencedId ?? actorEntry.uid));
+            const volumes = actors.map((actorEntry) => cache.getVolume(actorEntry.referencedId));
             const segmentationVolume = cache.getVolume(volumeId);
             const referencedVolumeIdToThreshold = volumes.find((volume) => csUtils.isEqual(volume.dimensions, segmentationVolume.dimensions))?.volumeId || volumes[0]?.volumeId;
             return {

package/dist/esm/utilities/planarFreehandROITool/smoothAnnotation.d.ts

@@ -1,3 +1,6 @@
-import type { Types } from '@cornerstonejs/core';
 import type { PlanarFreehandROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
-export default function smoothAnnotation(enabledElement: Types.IEnabledElement, annotation: PlanarFreehandROIAnnotation, knotsRatioPercentage: number): boolean;
+export type SmoothOptions = {
+    knotsRatioPercentage: number;
+    loop: number;
+};
+export default function smoothAnnotation(annotation: PlanarFreehandROIAnnotation, options?: SmoothOptions): boolean;

package/dist/esm/utilities/planarFreehandROITool/smoothAnnotation.js

@@ -1,39 +1,56 @@
-import PlanarFreehandROITool from '../../tools/annotation/PlanarFreehandROITool';
+import { mat4, vec3 } from 'gl-matrix';
 import interpolateSegmentPoints from './interpolation/interpolateSegmentPoints';
-import { getToolGroupForViewport } from '../../store/ToolGroupManager';
-function shouldPreventInterpolation(enabledElement, annotation, knotsRatioPercentage) {
-    if (!annotation?.data?.polyline || knotsRatioPercentage <= 0) {
+function shouldPreventInterpolation(annotation, options) {
+    const knotsRatioPercentage = options?.knotsRatioPercentage || 30;
+    if (!annotation?.data?.contour?.polyline?.length ||
+        knotsRatioPercentage <= 0) {
         return true;
     }
-    if (!enabledElement.viewport) {
-        return true;
-    }
-    const { renderingEngineId, viewportId, FrameOfReferenceUID } = enabledElement;
-    const toolGroup = getToolGroupForViewport(viewportId, renderingEngineId);
-    if (annotation.metadata.FrameOfReferenceUID !== FrameOfReferenceUID) {
-        return true;
-    }
-    if (!toolGroup) {
-        return true;
+    return false;
+}
+function rotateMatrix(normal, focal) {
+    const mat = mat4.create();
+    const eye = vec3.add(vec3.create(), focal, normal);
+    const up = Math.abs(normal[0]) > 0.1
+        ? vec3.fromValues(-normal[1], normal[0], 0)
+        : vec3.fromValues(0, -normal[2], normal[1]);
+    mat4.lookAt(mat, focal, eye, up);
+    return mat;
+}
+function rotate(list, count = Math.floor(Math.random() * (list.length - 1))) {
+    if (count === 0) {
+        return 0;
     }
-    const toolInstance = toolGroup.getToolInstance(annotation.metadata.toolName);
-    if (!(toolInstance instanceof PlanarFreehandROITool)) {
-        return true;
+    const srcList = [...list];
+    const { length } = list;
+    for (let i = 0; i < length; i++) {
+        list[i] = srcList[(i + count + length) % length];
     }
-    return (toolInstance.isDrawing ||
-        toolInstance.isEditingOpen ||
-        toolInstance.isEditingClosed);
+    return count;
 }
-export default function smoothAnnotation(enabledElement, annotation, knotsRatioPercentage) {
-    if (shouldPreventInterpolation(enabledElement, annotation, knotsRatioPercentage)) {
+export default function smoothAnnotation(annotation, options) {
+    if (shouldPreventInterpolation(annotation, options)) {
         return false;
     }
-    const { viewport } = enabledElement;
-    const canvasPoints = annotation.data.contour.polyline.map(viewport.worldToCanvas);
-    const interpolatedCanvasPoints = (interpolateSegmentPoints(canvasPoints, 0, canvasPoints.length, knotsRatioPercentage));
+    const { viewPlaneNormal } = annotation.metadata;
+    const { closed, polyline } = annotation.data.contour;
+    const rotateMat = rotateMatrix(viewPlaneNormal, annotation.data.contour.polyline[0]);
+    const canvasPoints = annotation.data.contour.polyline.map((p) => {
+        const planeP = vec3.transformMat4(vec3.create(), p, rotateMat);
+        return [planeP[0], planeP[1]];
+    });
+    let rotation = closed ? rotate(canvasPoints) : 0;
+    let interpolatedCanvasPoints = (interpolateSegmentPoints(canvasPoints, 0, canvasPoints.length, options?.knotsRatioPercentage || 30));
     if (interpolatedCanvasPoints === canvasPoints) {
         return false;
     }
-    annotation.data.contour.polyline = interpolatedCanvasPoints.map(viewport.canvasToWorld);
+    rotate(interpolatedCanvasPoints, -rotation);
+    for (let i = 1; i < options?.loop; i++) {
+        rotation = closed ? rotate(interpolatedCanvasPoints) : 0;
+        interpolatedCanvasPoints = (interpolateSegmentPoints(interpolatedCanvasPoints, 0, canvasPoints.length, options?.knotsRatioPercentage || 30));
+        rotate(interpolatedCanvasPoints, -rotation);
+    }
+    const unRotate = mat4.invert(mat4.create(), rotateMat);
+    annotation.data.contour.polyline = (interpolatedCanvasPoints.map((p) => vec3.transformMat4([0, 0, 0], [...p, 0], unRotate)));
     return true;
 }

package/dist/esm/utilities/scroll.js

@@ -13,6 +13,16 @@ export default function scroll(viewport, options) {
         scrollVolume(viewport, volumeId, delta, scrollSlabs);
     }
     else {
+        const imageIdIndex = viewport.getCurrentImageIdIndex();
+        if (imageIdIndex + delta >
+            viewport.getImageIds().length - 1 ||
+            imageIdIndex + delta < 0) {
+            const eventData = {
+                imageIdIndex,
+                direction: delta,
+            };
+            csUtils.triggerEvent(eventTarget, EVENTS.STACK_SCROLL_OUT_OF_BOUNDS, eventData);
+        }
         viewport.scroll(delta, options.debounceLoading, options.loop);
     }
 }

package/dist/esm/utilities/stackPrefetch/stackPrefetchUtils.d.ts

@@ -1,5 +1,5 @@
 import { Enums } from '@cornerstonejs/core';
-export declare const requestType = Enums.RequestType.Prefetch;
+export declare const requestType = Enums.RequestType.PREFETCH;
 export declare const priority = 0;
 export declare function range(lowEnd: any, highEnd: any): any[];
 export declare function nearestIndex(arr: any, x: any): {

package/dist/esm/utilities/stackPrefetch/stackPrefetchUtils.js

@@ -1,6 +1,6 @@
 import { getEnabledElement, StackViewport, Enums } from '@cornerstonejs/core';
 import { getToolState } from './state';
-export const requestType = Enums.RequestType.Prefetch;
+export const requestType = Enums.RequestType.PREFETCH;
 export const priority = 0;
 export function range(lowEnd, highEnd) {
     lowEnd = Math.round(lowEnd) || 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.30",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -97,7 +97,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^2.0.0-beta.29",
+    "@cornerstonejs/core": "^2.0.0-beta.30",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
     "lodash.get": "^4.4.2"
@@ -124,5 +124,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "fd9316cac241522bc5c43d267e41c7a4e36bec96"
+  "gitHead": "e56a9df570b820968e23b35f0526700989ae1e3c"
 }