@cornerstonejs/tools 1.44.2 → 1.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.44.2",
+  "version": "1.45.0",
   "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.44.2",
+    "@cornerstonejs/core": "^1.45.0",
     "comlink": "^4.4.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
@@ -53,5 +53,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "61b88d31b0043ad6cad97a0de209e7663db11172"
+  "gitHead": "87999af23a3e0f399c2c3df80587b662ab079b93"
 }

package/src/eventListeners/mouse/mouseDownListener.ts

@@ -2,6 +2,7 @@ import { getEnabledElement, triggerEvent } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 
 import Events from '../../enums/Events';
+import { MouseBindings } from '../../enums/ToolBindings';
 import mouseMoveListener from './mouseMoveListener';
 import { EventTypes, IPoints } from '../../types';
 import getMouseEventPoints from './getMouseEventPoints';
@@ -314,6 +315,7 @@ function _onMouseUp(evt: MouseEvent): void {
 
     const currentPoints = getMouseEventPoints(evt, state.element);
     const deltaPoints = _getDeltaPoints(currentPoints, state.lastPoints);
+
     const eventDetail:
       | EventTypes.MouseUpEventDetail
       | EventTypes.MouseClickEventType = {

package/src/store/filterToolsWithAnnotationsForElement.ts

@@ -2,7 +2,6 @@ import { getAnnotations } from '../stateManagement/annotation/annotationState';
 import { ToolAnnotationsPair } from '../types/InternalToolTypes';
 import type AnnotationTool from '../tools/base/AnnotationTool';
 import BaseTool from '../tools/base/BaseTool';
-import { getEnabledElement } from '@cornerstonejs/core';
 
 /**
  * Filters an array of tools, returning only tools which have annotation.

package/src/tools/annotation/LivewireContourTool.ts

@@ -5,7 +5,6 @@ import {
   eventTarget,
   triggerEvent,
   utilities as csUtils,
-  StackViewport,
   VolumeViewport,
 } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
@@ -92,20 +91,19 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
 
     const defaultActor = viewport.getDefaultActor();
 
-    if (!defaultActor || !csUtils.isImageActor(defaultActor)) {
-      throw new Error('Default actor must be an image actor');
-    }
+    // if (!defaultActor || !csUtils.isImageActor(defaultActor)) {
+    //   throw new Error('Default actor must be an image actor');
+    // }
 
     const viewportImageData = viewport.getImageData();
     const { imageData: vtkImageData } = viewportImageData;
     let worldToSlice: (point: Types.Point3) => Types.Point2;
     let sliceToWorld: (point: Types.Point2) => Types.Point3;
-    let scalarData;
+    let { scalarData } = viewportImageData;
     let width;
     let height;
 
-    if (viewport instanceof StackViewport) {
-      scalarData = viewportImageData.scalarData;
+    if (!(viewport instanceof VolumeViewport) && scalarData) {
       width = viewportImageData.dimensions[0];
       height = viewportImageData.dimensions[1];
 
@@ -155,12 +153,12 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
     } else {
       throw new Error('Viewport not supported');
     }
-
+    scalarData = csUtils.convertToGrayscale(scalarData, width, height);
     const { voiRange } = viewport.getProperties();
     const startPos = worldToSlice(worldPos);
 
     this.scissors = LivewireScissors.createInstanceFromRawPixelData(
-      scalarData,
+      scalarData as Float32Array,
       width,
       height,
       voiRange

package/src/utilities/index.ts

@@ -25,6 +25,7 @@ import { getSphereBoundsInfo } from './getSphereBoundsInfo';
 import scroll from './scroll';
 import { pointToString } from './pointToString';
 import annotationFrameRange from './annotationFrameRange';
+import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
 
 // name spaces
 import * as contours from './contours';
@@ -75,6 +76,7 @@ export {
   getAnnotationNearPoint,
   getAnnotationNearPointOnEnabledElement,
   jumpToSlice,
+  pointInSurroundingSphereCallback,
   viewport,
   cine,
   clip,

package/src/utilities/livewire/LivewireScissors.ts

@@ -1,4 +1,4 @@
-import { Types } from '@cornerstonejs/core';
+import type { Types } from '@cornerstonejs/core';
 import { BucketQueue } from '../BucketQueue';
 
 const MAX_UINT32 = 4294967295;
@@ -28,7 +28,7 @@ export class LivewireScissors {
   public readonly height: number;
 
   /** Grayscale image */
-  private grayscalePixelData: Float32Array;
+  private grayscalePixelData: Types.PixelDataTypedArray;
 
   // Laplace zero-crossings (either 0 or 1).
   private laplace: Float32Array;
@@ -57,7 +57,11 @@ export class LivewireScissors {
   /** Dijkstra - BucketQueue to sort items by priority */
   private priorityQueueNew: BucketQueue<number>;
 
-  constructor(grayscalePixelData: Float32Array, width: number, height: number) {
+  constructor(
+    grayscalePixelData: Types.PixelDataTypedArray,
+    width: number,
+    height: number
+  ) {
     const numPixels = grayscalePixelData.length;
 
     this.searchGranularityBits = 8; // Bits of resolution for BucketQueue.
@@ -549,34 +553,4 @@ export class LivewireScissors {
 
     return new LivewireScissors(grayscalePixelData, width, height);
   }
-
-  /**
-   * Create a livewire scissor instance from a RGBA image
-   * @param rgbaPixelData - RGBA pixel data
-   * @param width - Width of the image
-   * @param height - Height of the image
-   * @returns A LivewireScissors instance
-   */
-  public static createInstanceFromRGBAPixelData(
-    rgbaPixelData: Uint8ClampedArray,
-    width: number,
-    height: number
-  ): LivewireScissors {
-    const numPixels = rgbaPixelData.length / 4;
-    const grayscalePixelData = new Float32Array(numPixels);
-
-    // Multiplier to average an RGB sum and convert it to 0-1 range.
-    // 1/x because multiplication is faster than division.
-    const avgMultiplier = 1 / (3 * 255);
-
-    for (let i = 0, offset = 0; i < numPixels; i++, offset += 4) {
-      const red = rgbaPixelData[offset];
-      const green = rgbaPixelData[offset];
-      const blue = rgbaPixelData[offset];
-
-      grayscalePixelData[i] = (red + green + blue) * avgMultiplier;
-    }
-
-    return new LivewireScissors(grayscalePixelData, width, height);
-  }
 }

package/src/utilities/planar/filterAnnotationsForDisplay.ts

@@ -77,11 +77,7 @@ export default function filterAnnotationsForDisplay(
       if (Array.isArray(range)) {
         return frameNumber >= range[0] && frameNumber <= range[1];
       }
-      // Arbitrary 5 frames of slop on the video for matching single frame
-      // number to position - this allows the annotation to display  when
-      // the video element is not exactly the same timing as expected or when
-      // playing video back.
-      return Math.abs(frameNumber - range) <= 5;
+      return Math.abs(frameNumber - range) < 1;
     });
   } else if (viewport instanceof VolumeViewport) {
     const camera = viewport.getCamera();