@cornerstonejs/tools 4.5.15 → 4.5.16

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

@@ -1,5 +1,5 @@
 import { AnnotationTool } from './base';
-import type { Types } from '@cornerstonejs/core';
+import { type Types } from '@cornerstonejs/core';
 import type { Annotation, AnnotationData, Annotations, EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes, SVGDrawingHelper } from '../types';
 export type CrosshairsAnnotationData = AnnotationData & {
     handles: {

package/dist/esm/tools/CrosshairsTool.js

@@ -2,6 +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 { getRenderingEngine } from '@cornerstonejs/core';
 import { getEnabledElementByIds, getEnabledElement, utilities as csUtils, Enums, CONSTANTS, triggerEvent, eventTarget, } from '@cornerstonejs/core';
 import { getToolGroup, getToolGroupForViewport, } from '../store/ToolGroupManager';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../stateManagement/annotation/annotationState';
@@ -1183,9 +1184,42 @@ class CrosshairsTool extends AnnotationTool {
         });
     }
     setToolCenter(toolCenter, suppressEvents = false) {
-        this.toolCenter = toolCenter;
         const viewportsInfo = this._getViewportsInfo();
-        triggerAnnotationRenderForViewportIds(viewportsInfo.map(({ viewportId }) => viewportId));
+        viewportsInfo.map(({ renderingEngineId, viewportId }) => {
+            const renderingEngine = getRenderingEngine(renderingEngineId);
+            const viewport = renderingEngine.getViewport(viewportId);
+            const camera = viewport.getCamera();
+            const { focalPoint, position, viewPlaneNormal } = camera;
+            const delta = [
+                toolCenter[0] - focalPoint[0],
+                toolCenter[1] - focalPoint[1],
+                toolCenter[2] - focalPoint[2],
+            ];
+            const scroll = delta[0] * viewPlaneNormal[0] +
+                delta[1] * viewPlaneNormal[1] +
+                delta[2] * viewPlaneNormal[2];
+            const scrollDelta = [
+                scroll * viewPlaneNormal[0],
+                scroll * viewPlaneNormal[1],
+                scroll * viewPlaneNormal[2],
+            ];
+            const newFocalPoint = [
+                focalPoint[0] + scrollDelta[0],
+                focalPoint[1] + scrollDelta[1],
+                focalPoint[2] + scrollDelta[2],
+            ];
+            const newPosition = [
+                position[0] + scrollDelta[0],
+                position[1] + scrollDelta[1],
+                position[2] + scrollDelta[2],
+            ];
+            viewport.setCamera({
+                focalPoint: newFocalPoint,
+                position: newPosition,
+            });
+            viewport.render();
+        });
+        this.toolCenter = toolCenter;
         if (!suppressEvents) {
             triggerEvent(eventTarget, Events.CROSSHAIR_TOOL_CENTER_CHANGED, {
                 toolGroupId: this.toolGroupId,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.5.15";
+export declare const version = "4.5.16";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.5.15';
+export const version = '4.5.16';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.5.15",
+  "version": "4.5.16",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.5.15",
+    "@cornerstonejs/core": "4.5.16",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "881c6bcd44c444448be2b82177d0884b4880540e"
+  "gitHead": "77c3c6596746762086a9de26bf28fdde305b84b2"
 }