@cornerstonejs/tools 0.1.2 → 0.1.3

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

@@ -2,7 +2,7 @@ import { AnnotationTool } from './base';
 import type { Types } from '@cornerstonejs/core';
 import { Annotation, Annotations, EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes } from '../types';
 import { MouseDragEventType } from '../types/EventTypes';
-declare type ViewportInputs = Array<Types.IViewportUID>;
+declare type ViewportInputs = Array<Types.IViewportId>;
 interface CrosshairsAnnotation extends Annotation {
     data: {
         handles: {
@@ -11,22 +11,22 @@ interface CrosshairsAnnotation extends Annotation {
             activeOperation: number | null;
             toolCenter: Types.Point3;
         };
-        activeViewportUIDs: string[];
-        viewportUID: string;
+        activeViewportIds: string[];
+        viewportId: string;
     };
 }
 export default class CrosshairsTool extends AnnotationTool {
     static toolName: string;
     toolCenter: Types.Point3;
-    _getReferenceLineColor?: (viewportUID: string) => string;
-    _getReferenceLineControllable?: (viewportUID: string) => boolean;
-    _getReferenceLineDraggableRotatable?: (viewportUID: string) => boolean;
-    _getReferenceLineSlabThicknessControlsOn?: (viewportUID: string) => boolean;
+    _getReferenceLineColor?: (viewportId: string) => string;
+    _getReferenceLineControllable?: (viewportId: string) => boolean;
+    _getReferenceLineDraggableRotatable?: (viewportId: string) => boolean;
+    _getReferenceLineSlabThicknessControlsOn?: (viewportId: string) => boolean;
     editData: {
         annotation: any;
     } | null;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
-    initializeViewport: ({ renderingEngineUID, viewportUID, }: Types.IViewportUID) => {
+    initializeViewport: ({ renderingEngineId, viewportId, }: Types.IViewportId) => {
         normal: Types.Point3;
         point: Types.Point3;
     };
@@ -41,8 +41,8 @@ export default class CrosshairsTool extends AnnotationTool {
     mouseMoveCallback: (evt: EventTypes.MouseMoveEventType, filteredToolAnnotations: Annotations) => boolean;
     filterInteractableAnnotationsForElement: (element: any, annotations: any) => any;
     renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: any) => void;
-    _autoPanViewportIfNecessary(viewportUID: string, renderingEngine: Types.IRenderingEngine): void;
-    _areViewportUIDArraysEqual: (viewportUIDArrayOne: any, viewportUIDArrayTwo: any) => boolean;
+    _autoPanViewportIfNecessary(viewportId: string, renderingEngine: Types.IRenderingEngine): void;
+    _areViewportIdArraysEqual: (viewportIdArrayOne: any, viewportIdArrayTwo: any) => boolean;
     _getAnnotationsForViewportsWithDifferentCameras: (enabledElement: any, annotations: any) => any;
     _filterLinkedViewportWithSameOrientationAndScene: (enabledElement: any, annotations: any) => any;
     _filterAnnotationsByUniqueViewportOrientations: (enabledElement: any, annotations: any) => any[];

package/dist/cjs/tools/CrosshairsTool.js

@@ -17,7 +17,7 @@ const Math_1 = __importDefault(require("vtk.js/Sources/Common/Core/Math"));
 const MatrixBuilder_1 = __importDefault(require("vtk.js/Sources/Common/Core/MatrixBuilder"));
 const math_1 = require("../utilities/math");
 const annotationLocking_1 = require("../stateManagement/annotation/annotationLocking");
-const triggerAnnotationRenderForViewportUIDs_1 = __importDefault(require("../utilities/triggerAnnotationRenderForViewportUIDs"));
+const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../utilities/triggerAnnotationRenderForViewportIds"));
 const { liangBarksyClip } = utilities_1.math.vec2;
 function defaultReferenceLineColor() {
     return 'rgb(200, 200, 200)';
@@ -51,8 +51,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
         var _a, _b, _c, _d;
         super(toolProps, defaultToolProps);
         this.toolCenter = [0, 0, 0];
-        this.initializeViewport = ({ renderingEngineUID, viewportUID, }) => {
-            const enabledElement = (0, core_1.getEnabledElementByUIDs)(viewportUID, renderingEngineUID);
+        this.initializeViewport = ({ renderingEngineId, viewportId, }) => {
+            const enabledElement = (0, core_1.getEnabledElementByIds)(viewportId, renderingEngineId);
             const { FrameOfReferenceUID, viewport } = enabledElement;
             const { element } = viewport;
             const { position, focalPoint, viewPlaneNormal } = viewport.getCamera();
@@ -76,8 +76,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                         toolCenter: this.toolCenter,
                     },
                     activeOperation: null,
-                    activeViewportUIDs: [],
-                    viewportUID,
+                    activeViewportIds: [],
+                    viewportId,
                 },
             };
             (0, elementCursor_1.resetElementCursor)(element);
@@ -126,18 +126,18 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const filteredAnnotations = this.filterInteractableAnnotationsForElement(viewport.element, annotations);
             const { data } = filteredAnnotations[0];
             const { rotationPoints } = data.handles;
-            const viewportUIDArray = [];
+            const viewportIdArray = [];
             for (let i = 0; i < rotationPoints.length - 1; ++i) {
                 const otherViewport = rotationPoints[i][1];
-                const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
-                const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
+                const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
+                const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
                 if (!viewportControllable || !viewportDraggableRotatable) {
                     continue;
                 }
-                viewportUIDArray.push(otherViewport.uid);
+                viewportIdArray.push(otherViewport.id);
                 i++;
             }
-            data.activeViewportUIDs = [...viewportUIDArray];
+            data.activeViewportIds = [...viewportIdArray];
             data.handles.activeOperation = OPERATION.DRAG;
             evt.preventDefault();
             (0, elementCursor_1.hideElementCursor)(element);
@@ -176,7 +176,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const { renderingEngine } = enabledElement;
             const viewport = enabledElement.viewport;
             const requireSameOrientation = false;
-            const viewportUIDsToRender = (0, viewportFilters_1.getViewportUIDsWithToolToRender)(element, CrosshairsTool.toolName, requireSameOrientation);
+            const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, CrosshairsTool.toolName, requireSameOrientation);
             const annotations = (0, annotationState_1.getAnnotations)(element, CrosshairsTool.toolName);
             const filteredToolAnnotations = this.filterInteractableAnnotationsForElement(element, annotations);
             const viewportAnnotation = filteredToolAnnotations[0];
@@ -192,8 +192,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
             Math_1.default.subtract(currentCamera.focalPoint, oldCameraFocalPoint, deltaCameraFocalPoint);
             viewportAnnotation.metadata.cameraPosition = [...currentCamera.position];
             viewportAnnotation.metadata.cameraFocalPoint = [...currentCamera.focalPoint];
-            const viewportControllable = this._getReferenceLineControllable(viewport.uid);
-            const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(viewport.uid);
+            const viewportControllable = this._getReferenceLineControllable(viewport.id);
+            const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(viewport.id);
             if (!core_1.utilities.isEqual(currentCamera.position, oldCameraPosition, 1e-3) &&
                 viewportControllable &&
                 viewportDraggableRotatable) {
@@ -209,14 +209,14 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 }
             }
             if (this.configuration.autoPan.enabled) {
-                const viewports = core_1.utilities.getVolumeViewportsContainingSameVolumes(viewport, renderingEngine.uid);
-                viewports.forEach(({ uid: viewportUID }) => {
-                    if (viewportUID !== viewport.uid) {
-                        this._autoPanViewportIfNecessary(viewportUID, renderingEngine);
+                const viewports = core_1.utilities.getVolumeViewportsContainingSameVolumes(viewport, renderingEngine.id);
+                viewports.forEach(({ id: viewportId }) => {
+                    if (viewportId !== viewport.id) {
+                        this._autoPanViewportIfNecessary(viewportId, renderingEngine);
                     }
                 });
             }
-            (0, triggerAnnotationRenderForViewportUIDs_1.default)(renderingEngine, viewportUIDsToRender);
+            (0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
         };
         this.mouseMoveCallback = (evt, filteredToolAnnotations) => {
             const { element, currentPoints } = evt.detail;
@@ -232,10 +232,10 @@ class CrosshairsTool extends base_1.AnnotationTool {
                     continue;
                 }
                 const previousActiveOperation = data.handles.activeOperation;
-                const previousActiveViewportUIDs = data.activeViewportUIDs && data.activeViewportUIDs.length > 0
-                    ? [...data.activeViewportUIDs]
+                const previousActiveViewportIds = data.activeViewportIds && data.activeViewportIds.length > 0
+                    ? [...data.activeViewportIds]
                     : [];
-                data.activeViewportUIDs = [];
+                data.activeViewportIds = [];
                 data.handles.activeOperation = null;
                 const handleNearImagePoint = this.getHandleNearImagePoint(element, annotation, canvasCoords, 6);
                 let near = false;
@@ -252,7 +252,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
                     imageNeedsUpdate = true;
                 }
                 else if (data.handles.activeOperation !== previousActiveOperation ||
-                    !this._areViewportUIDArraysEqual(data.activeViewportUIDs, previousActiveViewportUIDs)) {
+                    !this._areViewportIdArraysEqual(data.activeViewportIds, previousActiveViewportIds)) {
                     imageNeedsUpdate = true;
                 }
             }
@@ -263,8 +263,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 return [];
             }
             const enabledElement = (0, core_1.getEnabledElement)(element);
-            const { viewportUID } = enabledElement;
-            const viewportUIDSpecificCrosshairs = annotations.filter((annotation) => annotation.data.viewportUID === viewportUID);
+            const { viewportId } = enabledElement;
+            const viewportUIDSpecificCrosshairs = annotations.filter((annotation) => annotation.data.viewportId === viewportId);
             return viewportUIDSpecificCrosshairs;
         };
         this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
@@ -287,11 +287,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
             otherViewportAnnotations.forEach((annotation) => {
                 const { data } = annotation;
                 data.handles.toolCenter = this.toolCenter;
-                const otherViewport = renderingEngine.getViewport(data.viewportUID);
+                const otherViewport = renderingEngine.getViewport(data.viewportId);
                 const otherCamera = otherViewport.getCamera();
-                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.uid);
-                const otherViewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
-                const otherViewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.uid);
+                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
+                const otherViewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
+                const otherViewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.id);
                 const { sWidth, sHeight } = otherViewport;
                 const otherCanvasDiagonalLength = Math.sqrt(sWidth * sWidth + sHeight * sHeight);
                 const otherCanvasCenter = [sWidth * 0.5, sHeight * 0.5];
@@ -411,20 +411,20 @@ class CrosshairsTool extends base_1.AnnotationTool {
             });
             const newRtpoints = [];
             const newStpoints = [];
-            const viewportColor = this._getReferenceLineColor(viewport.uid);
+            const viewportColor = this._getReferenceLineColor(viewport.id);
             const color = viewportColor !== undefined ? viewportColor : 'rgb(200, 200, 200)';
             referenceLines.forEach((line, lineIndex) => {
                 const otherViewport = line[0];
-                const viewportColor = this._getReferenceLineColor(otherViewport.uid);
-                const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
-                const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
-                const viewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.uid);
-                const selectedViewportUID = data.activeViewportUIDs.find((uid) => uid === otherViewport.uid);
+                const viewportColor = this._getReferenceLineColor(otherViewport.id);
+                const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
+                const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
+                const viewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.id);
+                const selectedViewportId = data.activeViewportIds.find((id) => id === otherViewport.id);
                 let color = viewportColor !== undefined ? viewportColor : 'rgb(200, 200, 200)';
                 let lineWidth = 1;
                 const lineActive = data.handles.activeOperation !== null &&
                     data.handles.activeOperation === OPERATION.DRAG &&
-                    selectedViewportUID;
+                    selectedViewportId;
                 if (lineActive) {
                     lineWidth = 2.5;
                 }
@@ -521,7 +521,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
                             type: 'circle',
                         });
                     }
-                    else if (selectedViewportUID &&
+                    else if (selectedViewportId &&
                         !rotHandlesActive &&
                         !slabThicknessHandlesActive &&
                         viewportSlabThicknessControlsOn) {
@@ -542,7 +542,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
                         });
                     }
                     else if (slabThicknessHandlesActive &&
-                        selectedViewportUID &&
+                        selectedViewportId &&
                         viewportSlabThicknessControlsOn) {
                         (0, drawingSvg_1.drawHandles)(svgDrawingHelper, CrosshairsTool.toolName, annotationUID, lineUID, slabThicknessHandles, {
                             color,
@@ -578,14 +578,14 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const circleUID = '0';
             (0, drawingSvg_1.drawCircle)(svgDrawingHelper, CrosshairsTool.toolName, annotationUID, circleUID, referenceColorCoordinates, circleRadius, { color, fill: color });
         };
-        this._areViewportUIDArraysEqual = (viewportUIDArrayOne, viewportUIDArrayTwo) => {
-            if (viewportUIDArrayOne.length !== viewportUIDArrayTwo.length) {
+        this._areViewportIdArraysEqual = (viewportIdArrayOne, viewportIdArrayTwo) => {
+            if (viewportIdArrayOne.length !== viewportIdArrayTwo.length) {
                 return false;
             }
-            viewportUIDArrayOne.forEach((uid) => {
+            viewportIdArrayOne.forEach((id) => {
                 let itemFound = false;
-                for (let i = 0; i < viewportUIDArrayTwo.length; ++i) {
-                    if (uid === viewportUIDArrayTwo[i]) {
+                for (let i = 0; i < viewportIdArrayTwo.length; ++i) {
+                    if (id === viewportIdArrayTwo[i]) {
                         itemFound = true;
                         break;
                     }
@@ -597,16 +597,16 @@ class CrosshairsTool extends base_1.AnnotationTool {
             return true;
         };
         this._getAnnotationsForViewportsWithDifferentCameras = (enabledElement, annotations) => {
-            const { viewportUID, renderingEngine, viewport } = enabledElement;
-            const otherViewportAnnotations = annotations.filter((annotation) => annotation.data.viewportUID !== viewportUID);
+            const { viewportId, renderingEngine, viewport } = enabledElement;
+            const otherViewportAnnotations = annotations.filter((annotation) => annotation.data.viewportId !== viewportId);
             if (!otherViewportAnnotations || !otherViewportAnnotations.length) {
                 return [];
             }
             const camera = viewport.getCamera();
             const { viewPlaneNormal, position } = camera;
             const viewportsWithDifferentCameras = otherViewportAnnotations.filter((annotation) => {
-                const { viewportUID } = annotation.data;
-                const targetViewport = renderingEngine.getViewport(viewportUID);
+                const { viewportId } = annotation.data;
+                const targetViewport = renderingEngine.getViewport(viewportId);
                 const cameraOfTarget = targetViewport.getCamera();
                 return !(core_1.utilities.isEqual(cameraOfTarget.viewPlaneNormal, viewPlaneNormal, 1e-2) && core_1.utilities.isEqual(cameraOfTarget.position, position, 1));
             });
@@ -614,11 +614,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
         };
         this._filterLinkedViewportWithSameOrientationAndScene = (enabledElement, annotations) => {
             const { renderingEngine, viewport } = enabledElement;
-            const viewportControllable = this._getReferenceLineControllable(viewport.uid);
+            const viewportControllable = this._getReferenceLineControllable(viewport.id);
             const otherLinkedViewportAnnotationsFromSameScene = annotations.filter((annotation) => {
                 const { data } = annotation;
-                const otherViewport = renderingEngine.getViewport(data.viewportUID);
-                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.uid);
+                const otherViewport = renderingEngine.getViewport(data.viewportId);
+                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
                 return (viewport !== otherViewport &&
                     otherViewportControllable === true &&
                     viewportControllable === true);
@@ -631,8 +631,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const viewPlaneNormal = camera.viewPlaneNormal;
             Math_1.default.normalize(viewPlaneNormal);
             const otherLinkedViewportsAnnotationsWithSameCameraDirection = otherLinkedViewportAnnotationsFromSameScene.filter((annotation) => {
-                const { viewportUID } = annotation.data;
-                const otherViewport = renderingEngine.getViewport(viewportUID);
+                const { viewportId } = annotation.data;
+                const otherViewport = renderingEngine.getViewport(viewportId);
                 const otherCamera = otherViewport.getCamera();
                 const otherViewPlaneNormal = otherCamera.viewPlaneNormal;
                 Math_1.default.normalize(otherViewPlaneNormal);
@@ -648,16 +648,16 @@ class CrosshairsTool extends base_1.AnnotationTool {
             Math_1.default.normalize(viewPlaneNormal);
             const otherLinkedViewportAnnotationsFromSameScene = annotations.filter((annotation) => {
                 const { data } = annotation;
-                const otherViewport = renderingEngine.getViewport(data.viewportUID);
-                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.uid);
+                const otherViewport = renderingEngine.getViewport(data.viewportId);
+                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
                 return (viewport !== otherViewport &&
                     otherViewportControllable === true);
             });
             const otherViewportsAnnotationsWithUniqueCameras = [];
             for (let i = 0; i < otherLinkedViewportAnnotationsFromSameScene.length; ++i) {
                 const annotation = otherLinkedViewportAnnotationsFromSameScene[i];
-                const { viewportUID } = annotation.data;
-                const otherViewport = renderingEngine.getViewport(viewportUID);
+                const { viewportId } = annotation.data;
+                const otherViewport = renderingEngine.getViewport(viewportId);
                 const otherCamera = otherViewport.getCamera();
                 const otherViewPlaneNormal = otherCamera.viewPlaneNormal;
                 Math_1.default.normalize(otherViewPlaneNormal);
@@ -668,8 +668,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 let cameraFound = false;
                 for (let jj = 0; jj < otherViewportsAnnotationsWithUniqueCameras.length; ++jj) {
                     const annotation = otherViewportsAnnotationsWithUniqueCameras[jj];
-                    const { viewportUID } = annotation.data;
-                    const stockedViewport = renderingEngine.getViewport(viewportUID);
+                    const { viewportId } = annotation.data;
+                    const stockedViewport = renderingEngine.getViewport(viewportId);
                     const cameraOfStocked = stockedViewport.getCamera();
                     if (core_1.utilities.isEqual(cameraOfStocked.viewPlaneNormal, otherCamera.viewPlaneNormal, 1e-2) &&
                         core_1.utilities.isEqual(cameraOfStocked.position, otherCamera.position, 1)) {
@@ -682,15 +682,15 @@ class CrosshairsTool extends base_1.AnnotationTool {
             }
             const otherNonLinkedViewportAnnotationsFromSameScene = annotations.filter((annotation) => {
                 const { data } = annotation;
-                const otherViewport = renderingEngine.getViewport(data.viewportUID);
-                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.uid);
+                const otherViewport = renderingEngine.getViewport(data.viewportId);
+                const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
                 return (viewport !== otherViewport &&
                     otherViewportControllable !== true);
             });
             for (let i = 0; i < otherNonLinkedViewportAnnotationsFromSameScene.length; ++i) {
                 const annotation = otherNonLinkedViewportAnnotationsFromSameScene[i];
-                const { viewportUID } = annotation.data;
-                const otherViewport = renderingEngine.getViewport(viewportUID);
+                const { viewportId } = annotation.data;
+                const otherViewport = renderingEngine.getViewport(viewportId);
                 const otherCamera = otherViewport.getCamera();
                 const otherViewPlaneNormal = otherCamera.viewPlaneNormal;
                 Math_1.default.normalize(otherViewPlaneNormal);
@@ -701,8 +701,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 let cameraFound = false;
                 for (let jj = 0; jj < otherViewportsAnnotationsWithUniqueCameras.length; ++jj) {
                     const annotation = otherViewportsAnnotationsWithUniqueCameras[jj];
-                    const { viewportUID } = annotation.data;
-                    const stockedViewport = renderingEngine.getViewport(viewportUID);
+                    const { viewportId } = annotation.data;
+                    const stockedViewport = renderingEngine.getViewport(viewportId);
                     const cameraOfStocked = stockedViewport.getCamera();
                     if (core_1.utilities.isEqual(cameraOfStocked.viewPlaneNormal, otherCamera.viewPlaneNormal, 1e-2) &&
                         core_1.utilities.isEqual(cameraOfStocked.position, otherCamera.position, 1)) {
@@ -719,8 +719,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 if (otherViewportsAnnotationsWithUniqueCameras.find((element) => element === annotation) === true) {
                     continue;
                 }
-                const { viewportUID } = annotation.data;
-                const otherViewport = renderingEngine.getViewport(viewportUID);
+                const { viewportId } = annotation.data;
+                const otherViewport = renderingEngine.getViewport(viewportId);
                 const otherCamera = otherViewport.getCamera();
                 const otherViewPlaneNormal = otherCamera.viewPlaneNormal;
                 Math_1.default.normalize(otherViewPlaneNormal);
@@ -731,8 +731,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 let cameraFound = false;
                 for (let jj = 0; jj < otherViewportsAnnotationsWithUniqueCameras.length; ++jj) {
                     const annotation = otherViewportsAnnotationsWithUniqueCameras[jj];
-                    const { viewportUID } = annotation.data;
-                    const stockedViewport = renderingEngine.getViewport(viewportUID);
+                    const { viewportId } = annotation.data;
+                    const stockedViewport = renderingEngine.getViewport(viewportId);
                     const cameraOfStocked = stockedViewport.getCamera();
                     if (core_1.utilities.isEqual(cameraOfStocked.viewPlaneNormal, otherCamera.viewPlaneNormal, 1e-2) &&
                         core_1.utilities.isEqual(cameraOfStocked.position, otherCamera.position, 1)) {
@@ -766,10 +766,10 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const otherViewportAnnotations = this._getAnnotationsForViewportsWithDifferentCameras(enabledElement, annotations);
             const viewportsAnnotationsToUpdate = otherViewportAnnotations.filter((annotation) => {
                 const { data } = annotation;
-                const otherViewport = renderingEngine.getViewport(data.viewportUID);
+                const otherViewport = renderingEngine.getViewport(data.viewportId);
                 const sameScene = this._checkIfViewportsRenderingSameScene(viewport, otherViewport);
-                return (this._getReferenceLineControllable(otherViewport.uid) &&
-                    this._getReferenceLineDraggableRotatable(otherViewport.uid) &&
+                return (this._getReferenceLineControllable(otherViewport.id) &&
+                    this._getReferenceLineDraggableRotatable(otherViewport.id) &&
                     sameScene);
             });
             if (viewportsAnnotationsToUpdate.length === 0) {
@@ -797,15 +797,15 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const { element } = eventDetail;
             this.editData.annotation.highlighted = false;
             this.editData.annotation.data.handles.activeOperation = null;
-            this.editData.annotation.data.activeViewportUIDs = [];
+            this.editData.annotation.data.activeViewportIds = [];
             this._deactivateModify(element);
             (0, elementCursor_1.resetElementCursor)(element);
             this.editData = null;
             const enabledElement = (0, core_1.getEnabledElement)(element);
             const { renderingEngine } = enabledElement;
             const requireSameOrientation = false;
-            const viewportUIDsToRender = (0, viewportFilters_1.getViewportUIDsWithToolToRender)(element, CrosshairsTool.toolName, requireSameOrientation);
-            (0, triggerAnnotationRenderForViewportUIDs_1.default)(renderingEngine, viewportUIDsToRender);
+            const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, CrosshairsTool.toolName, requireSameOrientation);
+            (0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
         };
         this._mouseDragCallback = (evt) => {
             const eventDetail = evt.detail;
@@ -831,8 +831,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 const otherViewportAnnotations = this._getAnnotationsForViewportsWithDifferentCameras(enabledElement, annotations);
                 const viewportsAnnotationsToUpdate = otherViewportAnnotations.filter((annotation) => {
                     const { data } = annotation;
-                    const otherViewport = renderingEngine.getViewport(data.viewportUID);
-                    return viewportAnnotation.data.activeViewportUIDs.find((uid) => uid === otherViewport.uid);
+                    const otherViewport = renderingEngine.getViewport(data.viewportId);
+                    return viewportAnnotation.data.activeViewportIds.find((id) => id === otherViewport.id);
                 });
                 this._applyDeltaShiftToSelectedViewportCameras(renderingEngine, viewportsAnnotationsToUpdate, delta);
             }
@@ -841,9 +841,9 @@ class CrosshairsTool extends base_1.AnnotationTool {
                 const viewportsAnnotationsToUpdate = otherViewportAnnotations.filter((annotation) => {
                     const { data } = annotation;
                     data.handles.toolCenter = center;
-                    const otherViewport = renderingEngine.getViewport(data.viewportUID);
-                    const otherViewportControllable = this._getReferenceLineControllable(otherViewport.uid);
-                    const otherViewportRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
+                    const otherViewport = renderingEngine.getViewport(data.viewportId);
+                    const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
+                    const otherViewportRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
                     return (otherViewportControllable === true &&
                         otherViewportRotatable === true);
                 });
@@ -871,11 +871,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
                     .translate(center[0], center[1], center[2])
                     .rotate(angle, rotationAxis)
                     .translate(-center[0], -center[1], -center[2]);
-                const otherViewportsUIDs = [];
+                const otherViewportsIds = [];
                 viewportsAnnotationsToUpdate.forEach((annotation) => {
                     const { data } = annotation;
                     data.handles.toolCenter = center;
-                    const otherViewport = renderingEngine.getViewport(data.viewportUID);
+                    const otherViewport = renderingEngine.getViewport(data.viewportId);
                     const camera = otherViewport.getCamera();
                     const { viewUp, position, focalPoint } = camera;
                     viewUp[0] += position[0];
@@ -892,19 +892,19 @@ class CrosshairsTool extends base_1.AnnotationTool {
                         viewUp,
                         focalPoint,
                     });
-                    otherViewportsUIDs.push(otherViewport.uid);
+                    otherViewportsIds.push(otherViewport.id);
                 });
-                renderingEngine.renderViewports(otherViewportsUIDs);
+                renderingEngine.renderViewports(otherViewportsIds);
             }
             else if (handles.activeOperation === OPERATION.SLAB) {
                 const viewportsAnnotationsToUpdate = annotations.filter((annotation) => {
                     const { data } = annotation;
-                    const otherViewport = renderingEngine.getViewport(data.viewportUID);
-                    return viewportAnnotation.data.activeViewportUIDs.find((uid) => uid === otherViewport.uid);
+                    const otherViewport = renderingEngine.getViewport(data.viewportId);
+                    return viewportAnnotation.data.activeViewportIds.find((id) => id === otherViewport.id);
                 });
                 viewportsAnnotationsToUpdate.forEach((annotation) => {
                     const { data } = annotation;
-                    const otherViewport = renderingEngine.getViewport(data.viewportUID);
+                    const otherViewport = renderingEngine.getViewport(data.viewportId);
                     const camera = otherViewport.getCamera();
                     const normal = camera.viewPlaneNormal;
                     const dotProd = Math_1.default.dot(delta, normal);
@@ -923,10 +923,10 @@ class CrosshairsTool extends base_1.AnnotationTool {
                             this.toolCenter[1],
                             this.toolCenter[2],
                         ];
-                        const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
+                        const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
                         if (!viewportDraggableRotatable) {
                             const { rotationPoints } = this.editData.annotation.data.handles;
-                            const otherViewportRotationPoints = rotationPoints.filter((point) => point[1].uid === otherViewport.uid);
+                            const otherViewportRotationPoints = rotationPoints.filter((point) => point[1].uid === otherViewport.id);
                             if (otherViewportRotationPoints.length === 2) {
                                 const point1 = viewport.canvasToWorld(otherViewportRotationPoints[0][3]);
                                 const point2 = viewport.canvasToWorld(otherViewportRotationPoints[1][3]);
@@ -976,10 +976,10 @@ class CrosshairsTool extends base_1.AnnotationTool {
             const { rotationPoints } = data.handles;
             for (let i = 0; i < rotationPoints.length - 1; ++i) {
                 const otherViewport = rotationPoints[i][1];
-                if (otherViewport.uid !== lineViewport.uid) {
+                if (otherViewport.id !== lineViewport.id) {
                     continue;
                 }
-                const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
+                const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
                 if (!viewportControllable) {
                     continue;
                 }
@@ -1037,8 +1037,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
             return point;
         }
     }
-    _autoPanViewportIfNecessary(viewportUID, renderingEngine) {
-        const viewport = renderingEngine.getViewport(viewportUID);
+    _autoPanViewportIfNecessary(viewportId, renderingEngine) {
+        const viewport = renderingEngine.getViewport(viewportId);
         const { sWidth, sHeight } = viewport;
         const topLefWorld = viewport.canvasToWorld([0, 0]);
         const bottomRightWorld = viewport.canvasToWorld([sWidth, sHeight]);
@@ -1101,7 +1101,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
     }
     _applyDeltaShiftToViewportCamera(renderingEngine, annotation, delta) {
         const { data } = annotation;
-        const viewport = renderingEngine.getViewport(data.viewportUID);
+        const viewport = renderingEngine.getViewport(data.viewportId);
         const camera = viewport.getCamera();
         const normal = camera.viewPlaneNormal;
         const dotProd = Math_1.default.dot(delta, normal);
@@ -1127,11 +1127,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
         for (let i = 0; i < rotationPoints.length; i++) {
             const point = rotationPoints[i][0];
             const otherViewport = rotationPoints[i][1];
-            const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
+            const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
             if (!viewportControllable) {
                 continue;
             }
-            const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
+            const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
             if (!viewportDraggableRotatable) {
                 continue;
             }
@@ -1152,18 +1152,18 @@ class CrosshairsTool extends base_1.AnnotationTool {
         for (let i = 0; i < slabThicknessPoints.length; i++) {
             const point = slabThicknessPoints[i][0];
             const otherViewport = slabThicknessPoints[i][1];
-            const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
+            const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
             if (!viewportControllable) {
                 continue;
             }
-            const viewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.uid);
+            const viewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.id);
             if (!viewportSlabThicknessControlsOn) {
                 continue;
             }
             const annotationCanvasCoordinate = viewport.worldToCanvas(point);
             if (gl_matrix_1.vec2.distance(canvasCoords, annotationCanvasCoordinate) < proximity) {
                 data.handles.activeOperation = OPERATION.SLAB;
-                data.activeViewportUIDs = [otherViewport.uid];
+                data.activeViewportIds = [otherViewport.id];
                 this.editData = {
                     annotation,
                 };
@@ -1180,11 +1180,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
         const { data } = annotation;
         const { rotationPoints } = data.handles;
         const { slabThicknessPoints } = data.handles;
-        const viewportUIDArray = [];
+        const viewportIdArray = [];
         for (let i = 0; i < rotationPoints.length - 1; ++i) {
             const otherViewport = rotationPoints[i][1];
-            const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
-            const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.uid);
+            const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
+            const viewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
             if (!viewportControllable || !viewportDraggableRotatable) {
                 continue;
             }
@@ -1211,18 +1211,18 @@ class CrosshairsTool extends base_1.AnnotationTool {
             };
             const distanceToPoint2 = math_1.lineSegment.distanceToPoint([lineSegment2.start.x, lineSegment2.start.y], [lineSegment2.end.x, lineSegment2.end.y], [canvasCoords[0], canvasCoords[1]]);
             if (distanceToPoint1 <= proximity || distanceToPoint2 <= proximity) {
-                viewportUIDArray.push(otherViewport.uid);
+                viewportIdArray.push(otherViewport.id);
                 data.handles.activeOperation = OPERATION.DRAG;
             }
             i++;
         }
         for (let i = 0; i < slabThicknessPoints.length - 1; ++i) {
             const otherViewport = slabThicknessPoints[i][1];
-            if (viewportUIDArray.find((uid) => uid === otherViewport.uid)) {
+            if (viewportIdArray.find((id) => id === otherViewport.id)) {
                 continue;
             }
-            const viewportControllable = this._getReferenceLineControllable(otherViewport.uid);
-            const viewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.uid);
+            const viewportControllable = this._getReferenceLineControllable(otherViewport.id);
+            const viewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.id);
             if (!viewportControllable || !viewportSlabThicknessControlsOn) {
                 continue;
             }
@@ -1263,12 +1263,12 @@ class CrosshairsTool extends base_1.AnnotationTool {
             };
             const distanceToPoint2 = math_1.lineSegment.distanceToPoint([lineSegment2.start.x, lineSegment2.start.y], [lineSegment2.end.x, lineSegment2.end.y], [canvasCoords[0], canvasCoords[1]]);
             if (distanceToPoint1 <= proximity || distanceToPoint2 <= proximity) {
-                viewportUIDArray.push(otherViewport.uid);
+                viewportIdArray.push(otherViewport.id);
                 data.handles.activeOperation = null;
             }
             i++;
         }
-        data.activeViewportUIDs = [...viewportUIDArray];
+        data.activeViewportIds = [...viewportIdArray];
         this.editData = {
             annotation,
         };