@cornerstonejs/tools 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/esm/tools/OrientationMarkerTool.js

@@ -0,0 +1,278 @@
+import vtkOrientationMarkerWidget from '@kitware/vtk.js/Interaction/Widgets/OrientationMarkerWidget';
+import vtkAnnotatedCubeActor from '@kitware/vtk.js/Rendering/Core/AnnotatedCubeActor';
+import vtkAxesActor from '@kitware/vtk.js/Rendering/Core/AxesActor';
+import vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
+import vtkMapper from '@kitware/vtk.js/Rendering/Core/Mapper';
+import vtkXMLPolyDataReader from '@kitware/vtk.js/IO/XML/XMLPolyDataReader';
+import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
+import { BaseTool } from './base';
+import { Enums, eventTarget, getEnabledElementByIds, getRenderingEngines, } from '@cornerstonejs/core';
+import { filterViewportsWithToolEnabled } from '../utilities/viewportFilters';
+import { getToolGroup } from '../store/ToolGroupManager';
+import { Events } from '../enums';
+const OverlayMarkerType = {
+    ANNOTATED_CUBE: 1,
+    AXES: 2,
+    CUSTOM: 3,
+};
+class OrientationMarkerTool extends BaseTool {
+    static { this.CUBE = 1; }
+    static { this.AXIS = 2; }
+    static { this.VTPFILE = 3; }
+    static { this.OVERLAY_MARKER_TYPES = OverlayMarkerType; }
+    constructor(toolProps = {}, defaultToolProps = {
+        configuration: {
+            orientationWidget: {
+                enabled: true,
+                viewportCorner: vtkOrientationMarkerWidget.Corners.BOTTOM_RIGHT,
+                viewportSize: 0.15,
+                minPixelSize: 100,
+                maxPixelSize: 300,
+            },
+            overlayMarkerType: OrientationMarkerTool.OVERLAY_MARKER_TYPES.ANNOTATED_CUBE,
+            overlayConfiguration: {
+                [OrientationMarkerTool.OVERLAY_MARKER_TYPES.ANNOTATED_CUBE]: {
+                    faceProperties: {
+                        xPlus: { text: 'R', faceColor: '#ffff00', faceRotation: 90 },
+                        xMinus: { text: 'L', faceColor: '#ffff00', faceRotation: 270 },
+                        yPlus: {
+                            text: 'P',
+                            faceColor: '#00ffff',
+                            fontColor: 'white',
+                            faceRotation: 180,
+                        },
+                        yMinus: { text: 'A', faceColor: '#00ffff', fontColor: 'white' },
+                        zPlus: { text: 'S' },
+                        zMinus: { text: 'I' },
+                    },
+                    defaultStyle: {
+                        fontStyle: 'bold',
+                        fontFamily: 'Arial',
+                        fontColor: 'black',
+                        fontSizeScale: (res) => res / 2,
+                        faceColor: '#0000ff',
+                        edgeThickness: 0.1,
+                        edgeColor: 'black',
+                        resolution: 400,
+                    },
+                },
+                [OrientationMarkerTool.OVERLAY_MARKER_TYPES.AXES]: {},
+                [OrientationMarkerTool.OVERLAY_MARKER_TYPES.CUSTOM]: {
+                    polyDataURL: 'https://raw.githubusercontent.com/Slicer/Slicer/80ad0a04dacf134754459557bf2638c63f3d1d1b/Base/Logic/Resources/OrientationMarkers/Human.vtp',
+                },
+            },
+        },
+    }) {
+        super(toolProps, defaultToolProps);
+        this._resizeObservers = new Map();
+        this.onSetToolEnabled = () => {
+            this.initViewports();
+            this._subscribeToViewportEvents();
+        };
+        this.onSetToolActive = () => {
+            this.initViewports();
+            this._subscribeToViewportEvents();
+        };
+        this.onSetToolDisabled = () => {
+            this.cleanUpData();
+            this._unsubscribeToViewportNewVolumeSet();
+        };
+        this._getViewportsInfo = () => {
+            const viewports = getToolGroup(this.toolGroupId).viewportsInfo;
+            return viewports;
+        };
+        this.resize = (viewportId) => {
+            const orientationMarker = this.orientationMarkers[viewportId];
+            if (!orientationMarker) {
+                return;
+            }
+            const { orientationWidget } = orientationMarker;
+            orientationWidget.updateViewport();
+        };
+        this.orientationMarkers = {};
+    }
+    _unsubscribeToViewportNewVolumeSet() {
+        const unsubscribe = () => {
+            const viewportsInfo = this._getViewportsInfo();
+            viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
+                const { viewport } = getEnabledElementByIds(viewportId, renderingEngineId);
+                const { element } = viewport;
+                element.removeEventListener(Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, this.initViewports.bind(this));
+                const resizeObserver = this._resizeObservers.get(viewportId);
+                resizeObserver.unobserve(element);
+            });
+        };
+        eventTarget.removeEventListener(Events.TOOLGROUP_VIEWPORT_ADDED, (evt) => {
+            if (evt.detail.toolGroupId !== this.toolGroupId) {
+                return;
+            }
+            unsubscribe();
+            this.initViewports();
+        });
+    }
+    _subscribeToViewportEvents() {
+        const subscribeToElementResize = () => {
+            const viewportsInfo = this._getViewportsInfo();
+            viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
+                const { viewport } = getEnabledElementByIds(viewportId, renderingEngineId);
+                const { element } = viewport;
+                this.initViewports();
+                element.addEventListener(Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, this.initViewports.bind(this));
+                const resizeObserver = new ResizeObserver(() => {
+                    setTimeout(() => {
+                        const element = getEnabledElementByIds(viewportId, renderingEngineId);
+                        if (!element) {
+                            return;
+                        }
+                        const { viewport } = element;
+                        this.resize(viewportId);
+                        viewport.render();
+                    }, 100);
+                });
+                resizeObserver.observe(element);
+                this._resizeObservers.set(viewportId, resizeObserver);
+            });
+        };
+        subscribeToElementResize();
+        eventTarget.addEventListener(Events.TOOLGROUP_VIEWPORT_ADDED, (evt) => {
+            if (evt.detail.toolGroupId !== this.toolGroupId) {
+                return;
+            }
+            subscribeToElementResize();
+            this.initViewports();
+        });
+    }
+    cleanUpData() {
+        const renderingEngines = getRenderingEngines();
+        const renderingEngine = renderingEngines[0];
+        const viewports = renderingEngine.getViewports();
+        viewports.forEach((viewport) => {
+            const orientationMarker = this.orientationMarkers[viewport.id];
+            if (!orientationMarker) {
+                return;
+            }
+            const { actor, orientationWidget } = orientationMarker;
+            orientationWidget?.setEnabled(false);
+            orientationWidget?.delete();
+            actor?.delete();
+            const renderWindow = viewport
+                .getRenderingEngine()
+                .offscreenMultiRenderWindow.getRenderWindow();
+            renderWindow.render();
+            viewport.getRenderingEngine().render();
+            delete this.orientationMarkers[viewport.id];
+        });
+    }
+    initViewports() {
+        const renderingEngines = getRenderingEngines();
+        const renderingEngine = renderingEngines[0];
+        if (!renderingEngine) {
+            return;
+        }
+        let viewports = renderingEngine.getViewports();
+        viewports = filterViewportsWithToolEnabled(viewports, this.getToolName());
+        viewports.forEach((viewport) => {
+            if (!viewport.getWidget(this.getToolName())) {
+                this.addAxisActorInViewport(viewport);
+            }
+        });
+    }
+    async addAxisActorInViewport(viewport) {
+        const viewportId = viewport.id;
+        const type = this.configuration.overlayMarkerType;
+        const overlayConfiguration = this.configuration.overlayConfiguration[type];
+        if (this.orientationMarkers[viewportId]) {
+            const { actor, orientationWidget } = this.orientationMarkers[viewportId];
+            viewport.getRenderer().removeActor(actor);
+            orientationWidget.setEnabled(false);
+        }
+        let actor;
+        if (type === 1) {
+            actor = this.createAnnotationCube(overlayConfiguration);
+        }
+        else if (type === 2) {
+            actor = vtkAxesActor.newInstance();
+        }
+        else if (type === 3) {
+            actor = await this.createCustomActor();
+        }
+        const renderer = viewport.getRenderer();
+        const renderWindow = viewport
+            .getRenderingEngine()
+            .offscreenMultiRenderWindow.getRenderWindow();
+        const { enabled, viewportCorner, viewportSize, minPixelSize, maxPixelSize, } = this.configuration.orientationWidget;
+        const orientationWidget = vtkOrientationMarkerWidget.newInstance({
+            actor,
+            interactor: renderWindow.getInteractor(),
+            parentRenderer: renderer,
+        });
+        orientationWidget.setEnabled(enabled);
+        orientationWidget.setViewportCorner(viewportCorner);
+        orientationWidget.setViewportSize(viewportSize);
+        orientationWidget.setMinPixelSize(minPixelSize);
+        orientationWidget.setMaxPixelSize(maxPixelSize);
+        orientationWidget.updateMarkerOrientation();
+        this.orientationMarkers[viewportId] = {
+            orientationWidget,
+            actor,
+        };
+        viewport.addWidget(this.getToolName(), orientationWidget);
+        renderWindow.render();
+        viewport.getRenderingEngine().render();
+    }
+    async createCustomActor() {
+        const url = this.configuration.overlayConfiguration[OverlayMarkerType.CUSTOM]
+            .polyDataURL;
+        const response = await fetch(url);
+        const arrayBuffer = await response.arrayBuffer();
+        const vtpReader = vtkXMLPolyDataReader.newInstance();
+        vtpReader.parseAsArrayBuffer(arrayBuffer);
+        vtpReader.update();
+        const polyData = vtkPolyData.newInstance();
+        polyData.shallowCopy(vtpReader.getOutputData());
+        polyData.getPointData().setActiveScalars('Color');
+        const mapper = vtkMapper.newInstance();
+        mapper.setInputData(polyData);
+        mapper.setColorModeToDirectScalars();
+        const actor = vtkActor.newInstance();
+        actor.setMapper(mapper);
+        actor.rotateZ(180);
+        return actor;
+    }
+    createAnnotationCube(overlayConfiguration) {
+        const actor = vtkAnnotatedCubeActor.newInstance();
+        actor.setDefaultStyle({ ...overlayConfiguration.defaultStyle });
+        actor.setXPlusFaceProperty({
+            ...overlayConfiguration.faceProperties.xPlus,
+        });
+        actor.setXMinusFaceProperty({
+            ...overlayConfiguration.faceProperties.xMinus,
+        });
+        actor.setYPlusFaceProperty({
+            ...overlayConfiguration.faceProperties.yPlus,
+        });
+        actor.setYMinusFaceProperty({
+            ...overlayConfiguration.faceProperties.yMinus,
+        });
+        actor.setZPlusFaceProperty({
+            ...overlayConfiguration.faceProperties.zPlus,
+        });
+        actor.setZMinusFaceProperty({
+            ...overlayConfiguration.faceProperties.zMinus,
+        });
+        return actor;
+    }
+    async createAnnotatedCubeActor() {
+        const axes = vtkAnnotatedCubeActor.newInstance();
+        const { faceProperties, defaultStyle } = this.configuration.annotatedCube;
+        axes.setDefaultStyle(defaultStyle);
+        Object.keys(faceProperties).forEach((key) => {
+            const methodName = `set${key.charAt(0).toUpperCase() + key.slice(1)}FaceProperty`;
+            axes[methodName](faceProperties[key]);
+        });
+        return axes;
+    }
+}
+OrientationMarkerTool.toolName = 'OrientationMarker';
+export default OrientationMarkerTool;
+//# sourceMappingURL=OrientationMarkerTool.js.map

package/dist/esm/tools/OrientationMarkerTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OrientationMarkerTool.js","sourceRoot":"","sources":["../../../src/tools/OrientationMarkerTool.ts"],"names":[],"mappings":"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"}

package/dist/esm/tools/OverlayGridTool.js

@@ -0,0 +1,165 @@
+import { vec3 } from 'gl-matrix';
+import { metaData, CONSTANTS, utilities as csUtils, } from '@cornerstonejs/core';
+import { addAnnotation, getAnnotations, } from '../stateManagement/annotation/annotationState';
+import { getToolGroup } from '../store/ToolGroupManager';
+import { drawLine as drawLineSvg } from '../drawingSvg';
+import triggerAnnotationRenderForViewportIds from '../utilities/triggerAnnotationRenderForViewportIds';
+import AnnotationDisplayTool from './base/AnnotationDisplayTool';
+const { EPSILON } = CONSTANTS;
+class OverlayGridTool extends AnnotationDisplayTool {
+    constructor(toolProps = {}, defaultToolProps = {
+        supportedInteractionTypes: ['Mouse', 'Touch'],
+        configuration: {
+            sourceImageIds: [],
+        },
+    }) {
+        super(toolProps, defaultToolProps);
+        this.onSetToolEnabled = () => {
+            this._init();
+        };
+        this.onSetToolActive = () => {
+            this._init();
+        };
+        this._init = () => {
+            const sourceImageIds = this.configuration.sourceImageIds;
+            if (!sourceImageIds?.length) {
+                console.warn('OverlayGridTool: No sourceImageIds provided in configuration');
+                return;
+            }
+            const imagePlaneModule = metaData.get('imagePlaneModule', sourceImageIds[0]);
+            if (!imagePlaneModule) {
+                console.warn('OverlayGridTool: No imagePlaneModule found for sourceImageIds');
+                return;
+            }
+            const { frameOfReferenceUID } = imagePlaneModule;
+            const viewportsInfo = getToolGroup(this.toolGroupId).viewportsInfo;
+            if (!viewportsInfo?.length) {
+                console.warn('OverlayGridTool: No viewports found');
+                return;
+            }
+            const annotations = getAnnotations(this.getToolName(), frameOfReferenceUID);
+            if (!annotations?.length) {
+                const pointSets = sourceImageIds.map((id) => {
+                    return this.calculateImageIdPointSets(id);
+                });
+                const newAnnotation = {
+                    highlighted: true,
+                    invalidated: true,
+                    metadata: {
+                        toolName: this.getToolName(),
+                        FrameOfReferenceUID: frameOfReferenceUID,
+                        referencedImageId: null,
+                    },
+                    data: {
+                        viewportData: new Map(),
+                        pointSets,
+                    },
+                };
+                addAnnotation(newAnnotation, frameOfReferenceUID);
+            }
+            triggerAnnotationRenderForViewportIds(viewportsInfo.map(({ viewportId }) => viewportId));
+        };
+        this.calculateImageIdPointSets = (imageId) => {
+            const { imagePositionPatient, rows, columns, rowCosines, columnCosines, rowPixelSpacing, columnPixelSpacing, } = metaData.get('imagePlaneModule', imageId);
+            const topLeft = [...imagePositionPatient];
+            const topRight = [...imagePositionPatient];
+            const bottomLeft = [...imagePositionPatient];
+            const bottomRight = [...imagePositionPatient];
+            vec3.scaleAndAdd(topRight, imagePositionPatient, columnCosines, columns * columnPixelSpacing);
+            vec3.scaleAndAdd(bottomLeft, imagePositionPatient, rowCosines, rows * rowPixelSpacing);
+            vec3.scaleAndAdd(bottomRight, bottomLeft, columnCosines, columns * columnPixelSpacing);
+            const pointSet1 = [topLeft, bottomLeft, topRight, bottomRight];
+            const pointSet2 = [topLeft, topRight, bottomLeft, bottomRight];
+            return { pointSet1, pointSet2 };
+        };
+        this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
+            const sourceImageIds = this.configuration.sourceImageIds;
+            let renderStatus = false;
+            if (!sourceImageIds?.length) {
+                return renderStatus;
+            }
+            const { viewport: targetViewport, FrameOfReferenceUID } = enabledElement;
+            const targetImageIds = targetViewport.getImageIds();
+            if (targetImageIds.length < 2) {
+                return renderStatus;
+            }
+            const annotations = getAnnotations(this.getToolName(), FrameOfReferenceUID);
+            if (!annotations?.length) {
+                return renderStatus;
+            }
+            const annotation = annotations[0];
+            const { annotationUID } = annotation;
+            const { focalPoint, viewPlaneNormal } = targetViewport.getCamera();
+            const styleSpecifier = {
+                toolGroupId: this.toolGroupId,
+                toolName: this.getToolName(),
+                viewportId: enabledElement.viewport.id,
+            };
+            const imageIdNormal = (this.getImageIdNormal(sourceImageIds[0]));
+            if (this.isParallel(viewPlaneNormal, imageIdNormal)) {
+                return renderStatus;
+            }
+            const targetViewportPlane = csUtils.planar.planeEquation(viewPlaneNormal, focalPoint);
+            const pointSets = annotation.data.pointSets;
+            const viewportData = annotation.data.viewportData;
+            for (let i = 0; i < sourceImageIds.length; i++) {
+                const { pointSet1, pointSet2 } = pointSets[i];
+                const targetData = viewportData.get(targetViewport.id) ||
+                    this.initializeViewportData(viewportData, targetViewport.id);
+                if (!targetData.pointSetsToUse[i]) {
+                    let pointSetToUse = pointSet1;
+                    let topBottomVec = vec3.subtract(vec3.create(), pointSet1[0], pointSet1[1]);
+                    topBottomVec = vec3.normalize(vec3.create(), topBottomVec);
+                    if (this.isPerpendicular(topBottomVec, viewPlaneNormal)) {
+                        pointSetToUse = pointSet2;
+                    }
+                    targetData.pointSetsToUse[i] = pointSetToUse;
+                    targetData.lineStartsWorld[i] = csUtils.planar.linePlaneIntersection(pointSetToUse[0], pointSetToUse[1], targetViewportPlane);
+                    targetData.lineEndsWorld[i] = csUtils.planar.linePlaneIntersection(pointSetToUse[2], pointSetToUse[3], targetViewportPlane);
+                }
+                const lineStartWorld = targetData.lineStartsWorld[i];
+                const lineEndWorld = targetData.lineEndsWorld[i];
+                styleSpecifier.annotationUID = annotationUID;
+                const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
+                const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
+                const color = this.getStyle('color', styleSpecifier, annotation);
+                const shadow = this.getStyle('shadow', styleSpecifier, annotation);
+                const canvasCoordinates = [lineStartWorld, lineEndWorld].map((world) => targetViewport.worldToCanvas(world));
+                const dataId = `${annotationUID}-line`;
+                const lineUID = `${i}`;
+                drawLineSvg(svgDrawingHelper, annotationUID, lineUID, canvasCoordinates[0], canvasCoordinates[1], {
+                    color,
+                    width: lineWidth,
+                    lineDash,
+                    shadow,
+                }, dataId);
+            }
+            renderStatus = true;
+            return renderStatus;
+        };
+        this.initializeViewportData = (viewportData, id) => {
+            viewportData.set(id, {
+                pointSetsToUse: [],
+                lineStartsWorld: [],
+                lineEndsWorld: [],
+            });
+            return viewportData.get(id);
+        };
+        this.isPerpendicular = (vec1, vec2) => {
+            const dot = vec3.dot(vec1, vec2);
+            return Math.abs(dot) < EPSILON;
+        };
+    }
+    isParallel(vec1, vec2) {
+        return Math.abs(vec3.dot(vec1, vec2)) > 1 - EPSILON;
+    }
+    getImageIdNormal(imageId) {
+        const { imageOrientationPatient } = metaData.get('imagePlaneModule', imageId);
+        const rowCosineVec = vec3.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
+        const colCosineVec = vec3.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);
+        return vec3.cross(vec3.create(), rowCosineVec, colCosineVec);
+    }
+}
+OverlayGridTool.toolName = 'OverlayGrid';
+export default OverlayGridTool;
+//# sourceMappingURL=OverlayGridTool.js.map

package/dist/esm/tools/OverlayGridTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OverlayGridTool.js","sourceRoot":"","sources":["../../../src/tools/OverlayGridTool.ts"],"names":[],"mappings":"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"}

package/dist/esm/tools/PlanarRotateTool.js

@@ -29,8 +29,9 @@ class PlanarRotateTool extends BaseTool {
         if (vec3.dot(viewPlaneNormal, cross) > 0) {
             angle = -angle;
         }
-        if (Number.isNaN(angle))
+        if (Number.isNaN(angle)) {
             return;
+        }
         if (viewport instanceof BaseVolumeViewport) {
             const rotAngle = (angle * Math.PI) / 180;
             const rotMat = mat4.identity(new Float32Array(16));
@@ -39,8 +40,8 @@ class PlanarRotateTool extends BaseTool {
             viewport.setCamera({ viewUp: rotatedViewUp });
         }
         else {
-            const { rotation } = viewport.getProperties();
-            viewport.setProperties({ rotation: rotation + angle });
+            const { rotation } = viewport.getViewPresentation();
+            viewport.setViewPresentation({ rotation: rotation + angle });
         }
         viewport.render();
     }

package/dist/esm/tools/PlanarRotateTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlanarRotateTool.js","sourceRoot":"","sources":["../../../src/tools/PlanarRotateTool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PlanarRotateTool.js","sourceRoot":"","sources":["../../../src/tools/PlanarRotateTool.ts"],"names":[],"mappings":"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"}