@cornerstonejs/tools 1.77.7 → 1.77.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.77.7",
+  "version": "1.77.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.77.7",
+    "@cornerstonejs/core": "^1.77.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": "05eaed35fefe2417a1428b36730d338d029563c6"
+  "gitHead": "5e851b48111469c3669a0240a44f6980ec2860e8"
 }

package/src/tools/TrackballRotateTool.ts

@@ -1,6 +1,5 @@
 import vtkMath from '@kitware/vtk.js/Common/Core/Math';
 import { Events } from '../enums';
-
 import {
   eventTarget,
   getEnabledElement,
@@ -12,9 +11,6 @@ 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.
- */
 class TrackballRotateTool extends BaseTool {
   static toolName;
   touchDragCallback: (evt: EventTypes.InteractionEventType) => void;
@@ -22,6 +18,7 @@ class TrackballRotateTool extends BaseTool {
   cleanUp: () => void;
   _resizeObservers = new Map();
   _viewportAddedListener: (evt: any) => void;
+  _hasResolutionChanged = false;
 
   constructor(
     toolProps: PublicToolProps = {},
@@ -33,7 +30,6 @@ class TrackballRotateTool extends BaseTool {
     }
   ) {
     super(toolProps, defaultToolProps);
-
     this.touchDragCallback = this._dragCallback.bind(this);
     this.mouseDragCallback = this._dragCallback.bind(this);
   }
@@ -43,31 +39,33 @@ class TrackballRotateTool extends BaseTool {
     const { element } = eventDetail;
     const enabledElement = getEnabledElement(element);
     const { viewport } = enabledElement;
-
     const actorEntry = viewport.getDefaultActor();
     const actor = actorEntry.actor as Types.VolumeActor;
     const mapper = actor.getMapper();
     const originalSampleDistance = mapper.getSampleDistance();
 
-    mapper.setSampleDistance(originalSampleDistance * 2);
+    if (!this._hasResolutionChanged) {
+      mapper.setSampleDistance(originalSampleDistance * 2);
+      this._hasResolutionChanged = true;
 
-    if (this.cleanUp !== null) {
-      // Clean up previous event listener
-      document.removeEventListener('mouseup', this.cleanUp);
-    }
+      if (this.cleanUp !== null) {
+        // Clean up previous event listener
+        document.removeEventListener('mouseup', this.cleanUp);
+      }
 
-    this.cleanUp = () => {
-      mapper.setSampleDistance(originalSampleDistance);
-      viewport.render();
-    };
+      this.cleanUp = () => {
+        mapper.setSampleDistance(originalSampleDistance);
+        viewport.render();
+        this._hasResolutionChanged = false;
+      };
 
-    document.addEventListener('mouseup', this.cleanUp, { once: true });
+      document.addEventListener('mouseup', this.cleanUp, { once: true });
+    }
     return true;
   };
 
   _getViewportsInfo = () => {
     const viewports = getToolGroup(this.toolGroupId).viewportsInfo;
-
     return viewports;
   };
 
@@ -168,8 +166,6 @@ class TrackballRotateTool extends BaseTool {
     });
   };
 
-  // pseudocode inspired from
-  // https://github.com/kitware/vtk-js/blob/HEAD/Sources/Interaction/Manipulators/MouseCameraUnicamRotateManipulator/index.js
   _dragCallback(evt: EventTypes.InteractionEventType): void {
     const { element, currentPoints, lastPoints } = evt.detail;
     const currentPointsCanvas = currentPoints.canvas;

package/src/tools/annotation/EllipticalROITool.ts

@@ -770,7 +770,6 @@ class EllipticalROITool extends AnnotationTool {
       );
 
       const { centerPointRadius } = this.configuration;
-
       // If cachedStats does not exist, or the unit is missing (as part of import/hydration etc.),
       // force to recalculate the stats from the points
       if (
@@ -1012,99 +1011,95 @@ class EllipticalROITool extends AnnotationTool {
       // Check if one of the indexes are inside the volume, this then gives us
       // Some area to do stats over.
 
-      if (this._isInsideVolume(pos1Index, post2Index, dimensions)) {
-        this.isHandleOutsideImage = false;
+      this.isHandleOutsideImage = !this._isInsideVolume(
+        pos1Index,
+        post2Index,
+        dimensions
+      );
 
-        const iMin = Math.min(pos1Index[0], post2Index[0]);
-        const iMax = Math.max(pos1Index[0], post2Index[0]);
+      const iMin = Math.min(pos1Index[0], post2Index[0]);
+      const iMax = Math.max(pos1Index[0], post2Index[0]);
 
-        const jMin = Math.min(pos1Index[1], post2Index[1]);
-        const jMax = Math.max(pos1Index[1], post2Index[1]);
+      const jMin = Math.min(pos1Index[1], post2Index[1]);
+      const jMax = Math.max(pos1Index[1], post2Index[1]);
 
-        const kMin = Math.min(pos1Index[2], post2Index[2]);
-        const kMax = Math.max(pos1Index[2], post2Index[2]);
+      const kMin = Math.min(pos1Index[2], post2Index[2]);
+      const kMax = Math.max(pos1Index[2], post2Index[2]);
 
-        const boundsIJK = [
-          [iMin, iMax],
-          [jMin, jMax],
-          [kMin, kMax],
-        ] as [Types.Point2, Types.Point2, Types.Point2];
+      const boundsIJK = [
+        [iMin, iMax],
+        [jMin, jMax],
+        [kMin, kMax],
+      ] as [Types.Point2, Types.Point2, Types.Point2];
 
-        const center = [
-          (topLeftWorld[0] + bottomRightWorld[0]) / 2,
-          (topLeftWorld[1] + bottomRightWorld[1]) / 2,
-          (topLeftWorld[2] + bottomRightWorld[2]) / 2,
-        ] as Types.Point3;
+      const center = [
+        (topLeftWorld[0] + bottomRightWorld[0]) / 2,
+        (topLeftWorld[1] + bottomRightWorld[1]) / 2,
+        (topLeftWorld[2] + bottomRightWorld[2]) / 2,
+      ] as Types.Point3;
 
-        const ellipseObj = {
-          center,
-          xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
-          yRadius: Math.abs(topLeftWorld[1] - bottomRightWorld[1]) / 2,
-          zRadius: Math.abs(topLeftWorld[2] - bottomRightWorld[2]) / 2,
-        };
-
-        const { worldWidth, worldHeight } = getWorldWidthAndHeightFromTwoPoints(
-          viewPlaneNormal,
-          viewUp,
-          worldPos1,
-          worldPos2
-        );
-        const isEmptyArea = worldWidth === 0 && worldHeight === 0;
+      const ellipseObj = {
+        center,
+        xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
+        yRadius: Math.abs(topLeftWorld[1] - bottomRightWorld[1]) / 2,
+        zRadius: Math.abs(topLeftWorld[2] - bottomRightWorld[2]) / 2,
+      };
 
-        const handles = [pos1Index, post2Index];
-        const { scale, areaUnits } = getCalibratedLengthUnitsAndScale(
-          image,
-          handles
-        );
+      const { worldWidth, worldHeight } = getWorldWidthAndHeightFromTwoPoints(
+        viewPlaneNormal,
+        viewUp,
+        worldPos1,
+        worldPos2
+      );
+      const isEmptyArea = worldWidth === 0 && worldHeight === 0;
 
-        const area =
-          Math.abs(Math.PI * (worldWidth / 2) * (worldHeight / 2)) /
-          scale /
-          scale;
+      const handles = [pos1Index, post2Index];
+      const { scale, areaUnits } = getCalibratedLengthUnitsAndScale(
+        image,
+        handles
+      );
 
-        const modalityUnitOptions = {
-          isPreScaled: isViewportPreScaled(viewport, targetId),
+      const area =
+        Math.abs(Math.PI * (worldWidth / 2) * (worldHeight / 2)) /
+        scale /
+        scale;
 
-          isSuvScaled: this.isSuvScaled(
-            viewport,
-            targetId,
-            annotation.metadata.referencedImageId
-          ),
-        };
+      const modalityUnitOptions = {
+        isPreScaled: isViewportPreScaled(viewport, targetId),
 
-        const modalityUnit = getModalityUnit(
-          metadata.Modality,
-          annotation.metadata.referencedImageId,
-          modalityUnitOptions
-        );
+        isSuvScaled: this.isSuvScaled(
+          viewport,
+          targetId,
+          annotation.metadata.referencedImageId
+        ),
+      };
 
-        const pointsInShape = pointInShapeCallback(
-          imageData,
-          (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
-          this.configuration.statsCalculator.statsCallback,
-          boundsIJK
-        );
+      const modalityUnit = getModalityUnit(
+        metadata.Modality,
+        annotation.metadata.referencedImageId,
+        modalityUnitOptions
+      );
 
-        const stats = this.configuration.statsCalculator.getStatistics();
-        cachedStats[targetId] = {
-          Modality: metadata.Modality,
-          area,
-          mean: stats.mean?.value,
-          max: stats.max?.value,
-          stdDev: stats.stdDev?.value,
-          statsArray: stats.array,
-          pointsInShape,
-          isEmptyArea,
-          areaUnit: areaUnits,
-          modalityUnit,
-        };
-      } else {
-        this.isHandleOutsideImage = true;
+      const pointsInShape = pointInShapeCallback(
+        imageData,
+        (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
+        this.configuration.statsCalculator.statsCallback,
+        boundsIJK
+      );
 
-        cachedStats[targetId] = {
-          Modality: metadata.Modality,
-        };
-      }
+      const stats = this.configuration.statsCalculator.getStatistics();
+      cachedStats[targetId] = {
+        Modality: metadata.Modality,
+        area,
+        mean: stats.mean?.value,
+        max: stats.max?.value,
+        stdDev: stats.stdDev?.value,
+        statsArray: stats.array,
+        pointsInShape,
+        isEmptyArea,
+        areaUnit: areaUnits,
+        modalityUnit,
+      };
     }
 
     annotation.invalidated = false;

package/src/tools/annotation/planarFreehandROITool/closedContourEditLoop.ts

@@ -452,6 +452,8 @@ function completeClosedContourEdit(element: HTMLDivElement) {
         )
       : fusedCanvasPoints;
 
+    const decimateConfig = this.configuration?.decimate || {};
+
     updateContourPolyline(
       annotation,
       {
@@ -459,7 +461,13 @@ function completeClosedContourEdit(element: HTMLDivElement) {
         closed: true,
         targetWindingDirection: ContourWindingDirection.Clockwise,
       },
-      viewport
+      viewport,
+      {
+        decimate: {
+          enabled: !!decimateConfig.enabled,
+          epsilon: decimateConfig.epsilon,
+        },
+      }
     );
 
     // If any manual update, triggered on an annotation, then it will be treated as non-autogenerated.

package/src/tools/annotation/planarFreehandROITool/openContourEditLoop.ts

@@ -562,13 +562,21 @@ function completeOpenContourEdit(element: HTMLDivElement) {
         )
       : fusedCanvasPoints;
 
+    const decimateConfig = this.configuration?.decimate || {};
+
     updateContourPolyline(
       annotation,
       {
         points: updatedPoints,
         closed: false,
       },
-      viewport
+      viewport,
+      {
+        decimate: {
+          enabled: !!decimateConfig.enabled,
+          epsilon: decimateConfig.epsilon,
+        },
+      }
     );
 
     const worldPoints = annotation.data.contour.polyline;