@cornerstonejs/tools 1.77.12 → 1.78.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.77.12",
+  "version": "1.78.1",
   "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.77.12",
+    "@cornerstonejs/core": "^1.78.1",
     "@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": "21f9869a43912ca4a1eb70391d439e9e11252f07"
+  "gitHead": "a3f12ef5eecb12158a9067945c7dc779f6feb3ea"
 }

package/src/tools/PanTool.ts

@@ -31,6 +31,14 @@ class PanTool extends BaseTool {
     const enabledElement = getEnabledElement(element);
 
     const deltaPointsWorld = deltaPoints.world;
+    // This occurs when the mouse event is fired but the mouse hasn't moved a full pixel yet (high resolution mice)
+    if (
+      deltaPointsWorld[0] === 0 &&
+      deltaPointsWorld[1] === 0 &&
+      deltaPointsWorld[2] === 0
+    ) {
+      return;
+    }
     const camera = enabledElement.viewport.getCamera();
     const { focalPoint, position } = camera;
 

package/src/tools/annotation/PlanarFreehandROITool.ts

@@ -1030,7 +1030,7 @@ function defaultGetTextLines(data, targetId): string[] {
     textLines.push(`Mean: ${roundNumber(mean)} ${modalityUnit}`);
   }
 
-  if (max) {
+  if (Number.isFinite(max)) {
     textLines.push(`Max: ${roundNumber(max)} ${modalityUnit}`);
   }
 

package/src/tools/base/AnnotationDisplayTool.ts

@@ -4,6 +4,7 @@ import {
   StackViewport,
   cache,
   VideoViewport,
+  BaseVolumeViewport,
 } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 
@@ -130,13 +131,9 @@ abstract class AnnotationDisplayTool extends BaseTool {
   ): string {
     const targetId = this.getTargetId(viewport);
 
-    let referencedImageId;
+    let referencedImageId = targetId.split(/^[a-zA-Z]+:/)[1];
 
-    if (viewport instanceof StackViewport) {
-      referencedImageId = targetId.split('imageId:')[1];
-    } else if (viewport instanceof VideoViewport) {
-      referencedImageId = targetId.split('videoId:')[1];
-    } else {
+    if (viewport instanceof BaseVolumeViewport) {
       const volumeId = utilities.getVolumeId(targetId);
       const imageVolume = cache.getVolume(volumeId);
 

package/src/tools/base/BaseTool.ts

@@ -257,7 +257,7 @@ abstract class BaseTool implements IBaseTool {
     if (viewport instanceof BaseVolumeViewport) {
       return `volumeId:${this.getTargetVolumeId(viewport)}`;
     }
-    throw new Error('getTargetId: viewport must have a getTargetId method');
+    throw new Error('getTargetId: viewport must have a getReferenceId method');
   }
 }
 

package/src/utilities/pointInShapeCallback.ts

@@ -59,6 +59,11 @@ export default function pointInShapeCallback(
       .getData();
   }
 
+  if (!scalarData) {
+    console.warn('No scalar data found for imageData', imageData);
+    return;
+  }
+
   const dimensions = imageData.getDimensions();
 
   if (!boundsIJK) {

package/src/utilities/scroll.ts

@@ -6,7 +6,6 @@ import {
   EVENTS,
   utilities as csUtils,
   getEnabledElement,
-  VideoViewport,
 } from '@cornerstonejs/core';
 import { ScrollOptions, EventTypes } from '../types';
 
@@ -37,17 +36,16 @@ export default function scroll(
     throw new Error('Scroll::Stack Viewport has no images');
   }
 
-  const { type: viewportType } = viewport;
   const { volumeId, delta, scrollSlabs } = options;
 
-  if (viewport instanceof StackViewport) {
-    viewport.scroll(delta, options.debounceLoading, options.loop);
-  } else if (viewport instanceof VolumeViewport) {
+  if (viewport instanceof VolumeViewport) {
     scrollVolume(viewport, volumeId, delta, scrollSlabs);
-  } else if (viewport instanceof VideoViewport) {
-    viewport.scroll(delta);
   } else {
-    throw new Error(`Not implemented for Viewport Type: ${viewportType}`);
+    (viewport as Types.IStackViewport).scroll(
+      delta,
+      options.debounceLoading,
+      options.loop
+    );
   }
 }