@cornerstonejs/tools 1.70.7 → 1.70.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.70.7",
+  "version": "1.70.9",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.70.7",
+    "@cornerstonejs/core": "^1.70.9",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "4b6774d20ea66e2fa2815edc042b57565b816959"
+  "gitHead": "4f49d65aab6456412e49d88c99ab6d4d3f760e8f"
 }

package/src/tools/TrackballRotateTool.ts

@@ -1,11 +1,16 @@
 import vtkMath from '@kitware/vtk.js/Common/Core/Math';
 import { Events } from '../enums';
 
-import { getEnabledElement } from '@cornerstonejs/core';
+import {
+  eventTarget,
+  getEnabledElement,
+  getEnabledElementByIds,
+} from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import { mat4, vec3 } from 'gl-matrix';
 import { EventTypes, PublicToolProps, ToolProps } from '../types';
 import { BaseTool } from './base';
+import { getToolGroup } from '../store/ToolGroupManager';
 
 /**
  * Tool that rotates the camera in the plane defined by the viewPlaneNormal and the viewUp.
@@ -15,6 +20,8 @@ class TrackballRotateTool extends BaseTool {
   touchDragCallback: (evt: EventTypes.InteractionEventType) => void;
   mouseDragCallback: (evt: EventTypes.InteractionEventType) => void;
   cleanUp: () => void;
+  _resizeObservers = new Map();
+  _viewportAddedListener: (evt: any) => void;
 
   constructor(
     toolProps: PublicToolProps = {},
@@ -58,6 +65,68 @@ class TrackballRotateTool extends BaseTool {
     return true;
   };
 
+  _getViewportsInfo = () => {
+    const viewports = getToolGroup(this.toolGroupId).viewportsInfo;
+
+    return viewports;
+  };
+
+  onSetToolActive = () => {
+    const subscribeToElementResize = () => {
+      const viewportsInfo = this._getViewportsInfo();
+      viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
+        if (!this._resizeObservers.has(viewportId)) {
+          const { viewport } = getEnabledElementByIds(
+            viewportId,
+            renderingEngineId
+          );
+          const { element } = viewport;
+
+          const resizeObserver = new ResizeObserver(() => {
+            const { viewport } = getEnabledElementByIds(
+              viewportId,
+              renderingEngineId
+            );
+            viewport.resetCamera();
+            viewport.render();
+          });
+
+          resizeObserver.observe(element);
+          this._resizeObservers.set(viewportId, resizeObserver);
+        }
+      });
+    };
+
+    subscribeToElementResize();
+
+    this._viewportAddedListener = (evt) => {
+      if (evt.detail.toolGroupId === this.toolGroupId) {
+        subscribeToElementResize();
+      }
+    };
+
+    eventTarget.addEventListener(
+      Events.TOOLGROUP_VIEWPORT_ADDED,
+      this._viewportAddedListener
+    );
+  };
+
+  onSetToolDisabled = () => {
+    // Disconnect all resize observers
+    this._resizeObservers.forEach((resizeObserver, viewportId) => {
+      resizeObserver.disconnect();
+      this._resizeObservers.delete(viewportId);
+    });
+
+    if (this._viewportAddedListener) {
+      eventTarget.removeEventListener(
+        Events.TOOLGROUP_VIEWPORT_ADDED,
+        this._viewportAddedListener
+      );
+      this._viewportAddedListener = null; // Clear the reference to the listener
+    }
+  };
+
   rotateCamera = (viewport, centerWorld, axis, angle) => {
     const vtkCamera = viewport.getVtkActiveCamera();
     const viewUp = vtkCamera.getViewUp();

package/src/utilities/stackPrefetch/stackContextPrefetch.ts

@@ -217,7 +217,10 @@ function prefetch(element) {
       .loadAndCacheImage(imageId, options)
       .then(() => doneCallback(imageId));
 
-  const { useNorm16Texture } = getCoreConfiguration().rendering;
+  const { useNorm16Texture, preferSizeOverAccuracy } =
+    getCoreConfiguration().rendering;
+
+  const useNativeDataType = useNorm16Texture || preferSizeOverAccuracy;
 
   indicesToRequestCopy.forEach((imageIdIndex) => {
     const imageId = stack.imageIds[imageIdIndex];
@@ -225,11 +228,12 @@ function prefetch(element) {
     // highest priority will be used for the request type in the imageRetrievalPool
     const options = {
       targetBuffer: {
-        type: useNorm16Texture ? undefined : 'Float32Array',
+        type: useNativeDataType ? undefined : 'Float32Array',
       },
       preScale: {
         enabled: true,
       },
+      useNativeDataType,
       requestType,
     };
 

package/src/utilities/stackPrefetch/stackPrefetch.ts

@@ -166,18 +166,22 @@ function prefetch(element) {
   const requestFn = (imageId, options) =>
     imageLoader.loadAndCacheImage(imageId, options);
 
-  const { useNorm16Texture } = getCoreConfiguration().rendering;
+  const { useNorm16Texture, preferSizeOverAccuracy } =
+    getCoreConfiguration().rendering;
+
+  const useNativeDataType = useNorm16Texture || preferSizeOverAccuracy;
 
   imageIdsToPrefetch.forEach((imageId) => {
     // IMPORTANT: Request type should be passed if not the 'interaction'
     // highest priority will be used for the request type in the imageRetrievalPool
     const options = {
       targetBuffer: {
-        type: useNorm16Texture ? undefined : 'Float32Array',
+        type: useNativeDataType ? undefined : 'Float32Array',
       },
       preScale: {
         enabled: true,
       },
+      useNativeDataType,
       requestType,
     };