@cornerstonejs/tools 2.0.0-beta.27 → 2.0.0-beta.28

package/dist/esm/synchronizers/synchronizers/index.js

@@ -5,4 +5,3 @@ import createZoomPanSynchronizer from './createZoomPanSynchronizer';
 import createImageSliceSynchronizer from './createImageSliceSynchronizer';
 const createStackImageSynchronizer = createImageSliceSynchronizer;
 export { createCameraPositionSynchronizer, createPresentationViewSynchronizer, createVOISynchronizer, createZoomPanSynchronizer, createImageSliceSynchronizer, createStackImageSynchronizer, };
-//# sourceMappingURL=index.js.map

package/dist/esm/tools/AdvancedMagnifyTool.js

@@ -15,7 +15,7 @@ import { vec2, vec3 } from 'gl-matrix';
 import { getToolGroupForViewport } from '../store/ToolGroupManager';
 import debounce from '../utilities/debounce';
 import { distanceToPoint } from '../utilities/math/point';
-import { addSegmentationRepresentations } from '../stateManagement';
+import { addSegmentationRepresentations } from '../stateManagement/segmentation';
 const MAGNIFY_CLASSNAME = 'advancedMagnifyTool';
 const MAGNIFY_VIEWPORT_INITIAL_RADIUS = 125;
 const { Events: csEvents } = Enums;
@@ -925,4 +925,3 @@ class AdvancedMagnifyViewport {
 }
 AdvancedMagnifyTool.toolName = 'AdvancedMagnify';
 export { AdvancedMagnifyTool as default };
-//# sourceMappingURL=AdvancedMagnifyTool.js.map

package/dist/esm/tools/AnnotationEraserTool.js

@@ -50,4 +50,3 @@ class AnnotationEraserTool extends BaseTool {
 }
 AnnotationEraserTool.toolName = 'Eraser';
 export default AnnotationEraserTool;
-//# sourceMappingURL=AnnotationEraserTool.js.map

package/dist/esm/tools/CrosshairsTool.js

@@ -2,7 +2,7 @@ import { vec2, vec3 } from 'gl-matrix';
 import vtkMath from '@kitware/vtk.js/Common/Core/Math';
 import vtkMatrixBuilder from '@kitware/vtk.js/Common/Core/MatrixBuilder';
 import { AnnotationTool } from './base';
-import { getEnabledElementByIds, getEnabledElement, utilities as csUtils, Enums, } from '@cornerstonejs/core';
+import { getEnabledElementByIds, getEnabledElement, utilities as csUtils, Enums, CONSTANTS, } from '@cornerstonejs/core';
 import { getToolGroup, getToolGroupForViewport, } from '../store/ToolGroupManager';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../stateManagement/annotation/annotationState';
 import { drawCircle as drawCircleSvg, drawHandles as drawHandlesSvg, drawLine as drawLineSvg, } from '../drawingSvg';
@@ -14,7 +14,6 @@ import liangBarksyClip from '../utilities/math/vec2/liangBarksyClip';
 import * as lineSegment from '../utilities/math/line';
 import { isAnnotationLocked } from '../stateManagement/annotation/annotationLocking';
 import triggerAnnotationRenderForViewportIds from '../utilities/triggerAnnotationRenderForViewportIds';
-import { CONSTANTS } from '@cornerstonejs/core';
 const { RENDERING_DEFAULTS } = CONSTANTS;
 function defaultReferenceLineColor() {
     return 'rgb(0, 200, 0)';
@@ -1446,4 +1445,3 @@ class CrosshairsTool extends AnnotationTool {
 }
 CrosshairsTool.toolName = 'Crosshairs';
 export default CrosshairsTool;
-//# sourceMappingURL=CrosshairsTool.js.map

package/dist/esm/tools/MIPJumpToClickTool.js

@@ -17,7 +17,7 @@ class MIPJumpToClickTool extends BaseTool {
         const { element, currentPoints } = evt.detail;
         const enabledElement = getEnabledElement(element);
         const { viewport, renderingEngine } = enabledElement;
-        const volumeId = this.getTargetVolumeId(viewport);
+        const volumeId = viewport.getVolumeId();
         if (!volumeId) {
             throw new Error(`MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`);
         }
@@ -55,4 +55,3 @@ class MIPJumpToClickTool extends BaseTool {
 }
 MIPJumpToClickTool.toolName = 'MIPJumpToClickTool';
 export default MIPJumpToClickTool;
-//# sourceMappingURL=MIPJumpToClickTool.js.map

package/dist/esm/tools/MagnifyTool.js

@@ -178,4 +178,3 @@ class MagnifyTool extends BaseTool {
 }
 MagnifyTool.toolName = 'Magnify';
 export default MagnifyTool;
-//# sourceMappingURL=MagnifyTool.js.map

package/dist/esm/tools/OrientationMarkerTool.js

@@ -276,4 +276,3 @@ class OrientationMarkerTool extends BaseTool {
 }
 OrientationMarkerTool.toolName = 'OrientationMarker';
 export default OrientationMarkerTool;
-//# sourceMappingURL=OrientationMarkerTool.js.map

package/dist/esm/tools/OverlayGridTool.js

@@ -162,4 +162,3 @@ class OverlayGridTool extends AnnotationDisplayTool {
 }
 OverlayGridTool.toolName = 'OverlayGrid';
 export default OverlayGridTool;
-//# sourceMappingURL=OverlayGridTool.js.map

package/dist/esm/tools/PanTool.js

@@ -42,4 +42,3 @@ class PanTool extends BaseTool {
 }
 PanTool.toolName = 'Pan';
 export default PanTool;
-//# sourceMappingURL=PanTool.js.map

package/dist/esm/tools/PlanarRotateTool.js

@@ -62,4 +62,3 @@ class PlanarRotateTool extends BaseTool {
 }
 PlanarRotateTool.toolName = 'PlanarRotate';
 export default PlanarRotateTool;
-//# sourceMappingURL=PlanarRotateTool.js.map

package/dist/esm/tools/ReferenceCursors.js

@@ -306,4 +306,3 @@ class ReferenceCursors extends AnnotationDisplayTool {
 }
 ReferenceCursors.toolName = 'ReferenceCursors';
 export default ReferenceCursors;
-//# sourceMappingURL=ReferenceCursors.js.map

package/dist/esm/tools/ReferenceLinesTool.js

@@ -32,7 +32,7 @@ class ReferenceLines extends AnnotationDisplayTool {
             const { element } = sourceViewport;
             const { viewUp, viewPlaneNormal } = sourceViewport.getCamera();
             const sourceViewportCanvasCornersInWorld = csUtils.getViewportImageCornersInWorld(sourceViewport);
-            let annotation = this.editData.annotation;
+            let annotation = this.editData?.annotation;
             const FrameOfReferenceUID = sourceViewport.getFrameOfReferenceUID();
             if (!annotation) {
                 const newAnnotation = {
@@ -78,6 +78,9 @@ class ReferenceLines extends AnnotationDisplayTool {
         };
         this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
             const { viewport: targetViewport } = enabledElement;
+            if (!this.editData) {
+                return false;
+            }
             const { annotation, sourceViewportId } = this.editData;
             let renderStatus = false;
             const { viewport: sourceViewport } = getEnabledElementByViewportId(sourceViewportId) || {};
@@ -153,7 +156,7 @@ class ReferenceLines extends AnnotationDisplayTool {
     handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates) {
         const renderingEngine = targetViewport.getRenderingEngine();
         const targetId = this.getTargetId(targetViewport);
-        const targetImage = this.getTargetIdImage(targetId, renderingEngine);
+        const targetImage = this.getTargetImageData(targetId);
         const referencedImageId = this.getReferencedImageId(targetViewport, lineStartWorld, viewPlaneNormal, viewUp);
         if (referencedImageId && targetImage) {
             try {
@@ -221,4 +224,3 @@ class ReferenceLines extends AnnotationDisplayTool {
 }
 ReferenceLines.toolName = 'ReferenceLines';
 export default ReferenceLines;
-//# sourceMappingURL=ReferenceLinesTool.js.map

package/dist/esm/tools/ScaleOverlayTool.js

@@ -395,4 +395,3 @@ class ScaleOverlayTool extends AnnotationDisplayTool {
 }
 ScaleOverlayTool.toolName = 'ScaleOverlay';
 export default ScaleOverlayTool;
-//# sourceMappingURL=ScaleOverlayTool.js.map

package/dist/esm/tools/SculptorTool/CircleSculptCursor.js

@@ -105,4 +105,3 @@ class CircleSculptCursor {
     }
 }
 export default CircleSculptCursor;
-//# sourceMappingURL=CircleSculptCursor.js.map

package/dist/esm/tools/SculptorTool.js

@@ -287,4 +287,3 @@ export const contourIndex = (i, length) => {
 };
 SculptorTool.toolName = 'SculptorTool';
 export default SculptorTool;
-//# sourceMappingURL=SculptorTool.js.map

package/dist/esm/tools/SegmentationIntersectionTool.js

@@ -175,4 +175,3 @@ function removeExtraPoints(viewport, worldPointsSet) {
 }
 SegmentationIntersectionTool.toolName = 'SegmentationIntersection';
 export default SegmentationIntersectionTool;
-//# sourceMappingURL=SegmentationIntersectionTool.js.map

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

@@ -8,6 +8,10 @@ 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;
 }
 export default StackScrollTool;

package/dist/esm/tools/StackScrollTool.js

@@ -1,6 +1,13 @@
-import { getEnabledElementByIds, getEnabledElement, VolumeViewport, } from '@cornerstonejs/core';
+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'],
@@ -8,25 +15,23 @@ 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) {
-        const { wheel, element } = evt.detail;
-        const { direction } = wheel;
-        const { invert } = this.configuration;
-        const { viewport } = getEnabledElement(element);
-        const delta = direction * (invert ? -1 : 1);
-        const volumeId = this.getTargetVolumeId(viewport);
-        scroll(viewport, {
-            delta,
-            debounceLoading: this.configuration.debounceIfNotLoaded,
-            loop: this.configuration.loop,
-            volumeId,
-            scrollSlabs: this.configuration.scrollSlabs,
-        });
+        if (this.configuration.rotate.enabled) {
+            this._rotate(evt);
+        }
+        else {
+            this._scroll(evt);
+        }
     }
     mouseDragCallback(evt) {
         this._dragCallback(evt);
@@ -35,13 +40,51 @@ 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();
+    }
+    _scrollDrag(evt) {
         const { deltaPoints, viewportId, renderingEngineId } = evt.detail;
         const { viewport } = getEnabledElementByIds(viewportId, renderingEngineId);
         const { debounceIfNotLoaded, invert, loop } = this.configuration;
         const deltaPointY = deltaPoints.canvas[1];
         let volumeId;
         if (viewport instanceof VolumeViewport) {
-            volumeId = this.getTargetVolumeId(viewport);
+            volumeId = viewport.getVolumeId();
         }
         const pixelsPerImage = this._getPixelPerImage(viewport);
         const deltaY = deltaPointY + this.deltaY;
@@ -62,6 +105,52 @@ 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;
+        const { invert } = this.configuration;
+        const { viewport } = getEnabledElement(element);
+        const delta = direction * (invert ? -1 : 1);
+        scroll(viewport, {
+            delta,
+            debounceLoading: this.configuration.debounceIfNotLoaded,
+            loop: this.configuration.loop,
+            volumeId: viewport instanceof BaseVolumeViewport
+                ? viewport.getVolumeId()
+                : undefined,
+            scrollSlabs: this.configuration.scrollSlabs,
+        });
+    }
     _getPixelPerImage(viewport) {
         const { element } = viewport;
         const numberOfSlices = viewport.getNumberOfSlices();
@@ -70,4 +159,3 @@ class StackScrollTool extends BaseTool {
 }
 StackScrollTool.toolName = 'StackScroll';
 export default StackScrollTool;
-//# sourceMappingURL=StackScrollTool.js.map

package/dist/esm/tools/TrackballRotateTool.js

@@ -175,4 +175,3 @@ class TrackballRotateTool extends BaseTool {
 }
 TrackballRotateTool.toolName = 'TrackballRotate';
 export default TrackballRotateTool;
-//# sourceMappingURL=TrackballRotateTool.js.map

package/dist/esm/tools/WindowLevelRegionTool.js

@@ -218,4 +218,3 @@ class WindowLevelRegionTool extends AnnotationTool {
 }
 WindowLevelRegionTool.toolName = 'WindowLevelRegion';
 export default WindowLevelRegionTool;
-//# sourceMappingURL=WindowLevelRegionTool.js.map

package/dist/esm/tools/WindowLevelTool.js

@@ -47,8 +47,9 @@ class WindowLevelTool extends BaseTool {
         let isPreScaled = false;
         const properties = viewport.getProperties();
         if (viewport instanceof VolumeViewport) {
-            volumeId = this.getTargetVolumeId(viewport);
-            viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
+            volumeId = viewport.getVolumeId();
+            viewportsContainingVolumeUID =
+                utilities.getViewportsWithVolumeId(volumeId);
             ({ lower, upper } = properties.voiRange);
             const volume = cache.getVolume(volumeId);
             if (!volume) {
@@ -197,4 +198,3 @@ class WindowLevelTool extends BaseTool {
 }
 WindowLevelTool.toolName = 'WindowLevel';
 export default WindowLevelTool;
-//# sourceMappingURL=WindowLevelTool.js.map

package/dist/esm/tools/ZoomTool.js

@@ -178,4 +178,3 @@ class ZoomTool extends BaseTool {
 }
 ZoomTool.toolName = 'Zoom';
 export default ZoomTool;
-//# sourceMappingURL=ZoomTool.js.map

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

@@ -418,7 +418,7 @@ class AngleTool extends AnnotationTool {
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
             const angle = angleBetweenLines([worldPos1, worldPos2], [worldPos2, worldPos3]);
-            const { dimensions, imageData } = this.getTargetIdImage(targetId, renderingEngine);
+            const { dimensions, imageData } = this.getTargetImageData(targetId);
             this.isHandleOutsideImage = [worldPos1, worldPos2, worldPos3]
                 .map((worldPos) => csUtils.transformWorldToIndex(imageData, worldPos))
                 .some((index) => !csUtils.indexWithinDimensions(index, dimensions));
@@ -447,4 +447,3 @@ function defaultGetTextLines(data, targetId) {
 }
 AngleTool.toolName = 'Angle';
 export default AngleTool;
-//# sourceMappingURL=AngleTool.js.map

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

@@ -420,4 +420,3 @@ function changeTextCallback(data, eventData, doneChangingTextCallback) {
 }
 ArrowAnnotateTool.toolName = 'ArrowAnnotate';
 export default ArrowAnnotateTool;
-//# sourceMappingURL=ArrowAnnotateTool.js.map

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

@@ -597,7 +597,7 @@ class BidirectionalTool extends AnnotationTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -725,4 +725,3 @@ function defaultGetTextLines(data, targetId) {
 }
 BidirectionalTool.toolName = 'Bidirectional';
 export default BidirectionalTool;
-//# sourceMappingURL=BidirectionalTool.js.map

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

@@ -468,7 +468,7 @@ class CircleROITool extends AnnotationTool {
             const worldPos2 = bottomRightWorld;
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -587,4 +587,3 @@ function defaultGetTextLines(data, targetId) {
 }
 CircleROITool.toolName = 'CircleROI';
 export default CircleROITool;
-//# sourceMappingURL=CircleROITool.js.map

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

@@ -682,4 +682,3 @@ function defaultGetTextLines(data, targetId) {
 }
 CobbAngleTool.toolName = 'CobbAngle';
 export default CobbAngleTool;
-//# sourceMappingURL=CobbAngleTool.js.map

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

@@ -128,4 +128,3 @@ function defaultGetTextLines(data, targetId) {
 }
 DragProbeTool.toolName = 'DragProbe';
 export default DragProbeTool;
-//# sourceMappingURL=DragProbeTool.js.map

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

@@ -548,7 +548,7 @@ class EllipticalROITool extends AnnotationTool {
             const worldPos2 = bottomRightWorld;
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -672,4 +672,3 @@ function defaultGetTextLines(data, targetId) {
 }
 EllipticalROITool.toolName = 'EllipticalROI';
 export default EllipticalROITool;
-//# sourceMappingURL=EllipticalROITool.js.map

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

@@ -395,7 +395,7 @@ class HeightTool extends AnnotationTool {
         const targetIds = Object.keys(cachedStats);
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
-            const image = this.getTargetIdImage(targetId, renderingEngine);
+            const image = this.getTargetImageData(targetId);
             if (!image) {
                 continue;
             }
@@ -432,4 +432,3 @@ function defaultGetTextLines(data, targetId) {
 }
 HeightTool.toolName = 'Height';
 export default HeightTool;
-//# sourceMappingURL=HeightTool.js.map

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

@@ -173,4 +173,3 @@ function changeTextCallback(data, eventData, doneChangingTextCallback) {
 }
 KeyImageTool.toolName = 'KeyImage';
 export default KeyImageTool;
-//# sourceMappingURL=KeyImageTool.js.map

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

@@ -386,7 +386,7 @@ class LengthTool extends AnnotationTool {
         const targetIds = Object.keys(cachedStats);
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
-            const image = this.getTargetIdImage(targetId, renderingEngine);
+            const image = this.getTargetImageData(targetId);
             if (!image) {
                 continue;
             }
@@ -424,4 +424,3 @@ function defaultGetTextLines(data, targetId) {
 }
 LengthTool.toolName = 'Length';
 export default LengthTool;
-//# sourceMappingURL=LengthTool.js.map

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

@@ -87,4 +87,3 @@ class LivewireContourSegmentationTool extends LivewireContourTool {
 }
 LivewireContourSegmentationTool.toolName = 'LivewireContourSegmentationTool';
 export default LivewireContourSegmentationTool;
-//# sourceMappingURL=LivewireContourSegmentationTool.js.map

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

@@ -319,7 +319,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -414,8 +414,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
         let width;
         let height;
         let scalarData;
-        if (!(viewport instanceof VolumeViewport) && scalarData) {
-            ({ scalarData } = viewportImageData);
+        if (!(viewport instanceof VolumeViewport)) {
             width = viewportImageData.dimensions[0];
             height = viewportImageData.dimensions[1];
             worldToSlice = (point) => {
@@ -423,6 +422,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 return [ijkPoint[0], ijkPoint[1]];
             };
             sliceToWorld = (point) => csUtils.transformIndexToWorld(vtkImageData, [point[0], point[1], 0]);
+            scalarData = viewportImageData.scalarData;
         }
         else if (viewport instanceof VolumeViewport) {
             const sliceImageData = csUtils.getCurrentVolumeViewportSlice(viewport);
@@ -650,4 +650,3 @@ function defaultGetTextLines(data, targetId) {
     }
     return textLines;
 }
-//# sourceMappingURL=LivewireContourTool.js.map

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

@@ -28,4 +28,3 @@ class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
 PlanarFreehandContourSegmentationTool.toolName =
     'PlanarFreehandContourSegmentationTool';
 export default PlanarFreehandContourSegmentationTool;
-//# sourceMappingURL=PlanarFreehandContourSegmentationTool.js.map

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

@@ -138,7 +138,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -528,4 +528,3 @@ function defaultGetTextLines(data, targetId) {
 }
 PlanarFreehandROITool.toolName = 'PlanarFreehandROI';
 export default PlanarFreehandROITool;
-//# sourceMappingURL=PlanarFreehandROITool.js.map

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

@@ -260,7 +260,7 @@ class ProbeTool extends AnnotationTool {
                 isPreScaled: isViewportPreScaled(viewport, targetId),
                 isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
             };
-            const image = this.getTargetIdImage(targetId, renderingEngine);
+            const image = this.getTargetImageData(targetId);
             if (!image) {
                 continue;
             }
@@ -274,7 +274,7 @@ class ProbeTool extends AnnotationTool {
                 if (targetId.startsWith('imageId:')) {
                     const imageId = targetId.split('imageId:')[1];
                     const imageURI = csUtils.imageIdToURI(imageId);
-                    const viewports = csUtils.getViewportsWithImageURI(imageURI, renderingEngineId);
+                    const viewports = csUtils.getViewportsWithImageURI(imageURI);
                     const viewport = viewports[0];
                     ijk[2] = viewport.getCurrentImageIdIndex();
                 }
@@ -332,4 +332,3 @@ function defaultGetTextLines(data, targetId) {
 }
 ProbeTool.toolName = 'Probe';
 export default ProbeTool;
-//# sourceMappingURL=ProbeTool.js.map

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

@@ -459,7 +459,7 @@ class RectangleROITool extends AnnotationTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -545,4 +545,3 @@ function defaultGetTextLines(data, targetId) {
 }
 RectangleROITool.toolName = 'RectangleROI';
 export default RectangleROITool;
-//# sourceMappingURL=RectangleROITool.js.map

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

@@ -15,4 +15,3 @@ class SplineContourSegmentationTool extends SplineROITool {
 }
 SplineContourSegmentationTool.toolName = 'SplineContourSegmentationTool';
 export default SplineContourSegmentationTool;
-//# sourceMappingURL=SplineContourSegmentationTool.js.map

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

@@ -160,8 +160,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
             this._deactivateDraw(element);
             resetElementCursor(element);
             const enabledElement = getEnabledElement(element);
-            const { renderingEngine } = enabledElement;
-            const image = this.getTargetIdImage(this.getTargetId(enabledElement.viewport), enabledElement.renderingEngine);
+            const image = this.getTargetImageData(this.getTargetId(enabledElement.viewport));
             const { imageData, dimensions } = image;
             this.isHandleOutsideImage = data.handles.points
                 .map((p) => utilities.transformWorldToIndex(imageData, p))
@@ -433,7 +432,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
             const targetIds = Object.keys(cachedStats);
             for (let i = 0; i < targetIds.length; i++) {
                 const targetId = targetIds[i];
-                const image = this.getTargetIdImage(targetId, renderingEngine);
+                const image = this.getTargetImageData(targetId);
                 if (!image) {
                     continue;
                 }
@@ -727,4 +726,3 @@ function defaultGetTextLines(data, targetId) {
 }
 SplineROITool.toolName = 'SplineROI';
 export default SplineROITool;
-//# sourceMappingURL=SplineROITool.js.map

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

@@ -389,7 +389,7 @@ class UltrasoundDirectionalTool extends AnnotationTool {
         const targetIds = Object.keys(cachedStats);
         for (let i = 0; i < targetIds.length; i++) {
             const targetId = targetIds[i];
-            const image = this.getTargetIdImage(targetId, renderingEngine);
+            const image = this.getTargetImageData(targetId);
             if (!image) {
                 continue;
             }
@@ -459,4 +459,3 @@ function defaultGetTextLines(data, targetId, configuration) {
 }
 UltrasoundDirectionalTool.toolName = 'UltrasoundDirectionalTool';
 export default UltrasoundDirectionalTool;
-//# sourceMappingURL=UltrasoundDirectionalTool.js.map

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

@@ -456,4 +456,3 @@ class VideoRedactionTool extends AnnotationTool {
 }
 VideoRedactionTool.toolName = 'VideoRedaction';
 export default VideoRedactionTool;
-//# sourceMappingURL=VideoRedactionTool.js.map

package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js

@@ -254,4 +254,3 @@ function registerClosedContourEditLoop(toolInstance) {
         completeClosedContourEdit.bind(toolInstance);
 }
 export default registerClosedContourEditLoop;
-//# sourceMappingURL=closedContourEditLoop.js.map