@cornerstonejs/tools 1.71.3 → 1.71.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.71.3",
+  "version": "1.71.5",
   "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.71.3",
+    "@cornerstonejs/core": "^1.71.5",
     "@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": "1f8cced111f519d18a4f832acf9204c8b160d0ab"
+  "gitHead": "589239e007a87fa5316efa222054c518e6f00098"
 }

package/src/eventDispatchers/cameraResetEventDispatcher.ts

@@ -0,0 +1,41 @@
+import { Enums, Types } from '@cornerstonejs/core';
+import { ToolModes } from '../enums';
+import getToolsWithModesForMouseEvent from './shared/getToolsWithModesForMouseEvent';
+
+const { Active, Passive, Enabled } = ToolModes;
+
+/**
+ * When the camera is reset, check what tools need to react to this.
+ *
+ * - First we get all tools which are active, passive or enabled on the element.
+ * - If any of these tools have a `onCameraReset` method, we call it.
+ *
+ * @param evt - The normalized camera reset event.
+ */
+const onCameraReset = function (evt: Types.EventTypes.CameraResetEvent) {
+  // @ts-ignore
+  const enabledTools = getToolsWithModesForMouseEvent(evt, [
+    Active,
+    Passive,
+    Enabled,
+  ]);
+
+  enabledTools.forEach((tool) => {
+    if (tool.onResetCamera) {
+      tool.onResetCamera(evt);
+    }
+  });
+};
+
+const enable = function (element) {
+  element.addEventListener(Enums.Events.CAMERA_RESET, onCameraReset);
+};
+
+const disable = function (element) {
+  element.removeEventListener(Enums.Events.CAMERA_RESET, onCameraReset);
+};
+
+export default {
+  enable,
+  disable,
+};

package/src/eventDispatchers/index.js

@@ -5,6 +5,7 @@ import cameraModifiedEventDispatcher from './cameraModifiedEventDispatcher';
 import imageSpacingCalibratedEventDispatcher from './imageSpacingCalibratedEventDispatcher';
 import touchToolEventDispatcher from './touchToolEventDispatcher';
 import annotationInterpolationEventDispatcher from './annotationInterpolationEventDispatcher';
+import cameraResetEventDispatcher from './cameraResetEventDispatcher';
 
 export {
   imageRenderedEventDispatcher,
@@ -14,4 +15,5 @@ export {
   imageSpacingCalibratedEventDispatcher,
   touchToolEventDispatcher,
   annotationInterpolationEventDispatcher,
+  cameraResetEventDispatcher,
 };

package/src/store/addEnabledElement.ts

@@ -13,6 +13,7 @@ import {
   touchToolEventDispatcher,
   keyboardToolEventDispatcher,
   imageSpacingCalibratedEventDispatcher,
+  cameraResetEventDispatcher,
 } from '../eventDispatchers';
 import { state } from './state';
 
@@ -48,6 +49,7 @@ export default function addEnabledElement(
   imageRenderedEventDispatcher.enable(element);
   cameraModifiedEventDispatcher.enable(element);
   imageSpacingCalibratedEventDispatcher.enable(element);
+  cameraResetEventDispatcher.enable(element);
   // Dispatchers: interaction
   mouseToolEventDispatcher.enable(element);
   keyboardToolEventDispatcher.enable(element);

package/src/store/removeEnabledElement.ts

@@ -13,6 +13,7 @@ import {
   keyboardToolEventDispatcher,
   imageSpacingCalibratedEventDispatcher,
   touchToolEventDispatcher,
+  cameraResetEventDispatcher,
 } from '../eventDispatchers';
 // ~~
 
@@ -52,6 +53,7 @@ function removeEnabledElement(
   imageRenderedEventDispatcher.disable(element);
   cameraModifiedEventDispatcher.disable(element);
   imageSpacingCalibratedEventDispatcher.disable(element);
+  cameraResetEventDispatcher.disable(element);
 
   // Dispatchers: interaction
   mouseToolEventDispatcher.disable(element);

package/src/synchronizers/callbacks/presentationViewSyncCallback.ts

@@ -30,7 +30,7 @@ export default function presentationViewSyncCallback(
 
   const presentationView = sViewport.getViewPresentation(options);
 
-  tViewport.setView(null, presentationView);
+  tViewport.setViewPresentation(presentationView);
 
   tViewport.render();
 }

package/src/tools/CrosshairsTool.ts

@@ -319,6 +319,19 @@ class CrosshairsTool extends AnnotationTool {
         renderingEngineId
       );
       const { viewport } = enabledElement;
+      const resetPan = true;
+      const resetZoom = true;
+      const resetToCenter = true;
+      const resetRotation = true;
+      const supressEvents = true;
+      viewport.resetCamera(
+        resetPan,
+        resetZoom,
+        resetToCenter,
+        resetRotation,
+        supressEvents
+      );
+      (viewport as Types.IVolumeViewport).resetSlabThickness();
       const { element } = viewport;
       let annotations = this._getAnnotations(enabledElement);
       annotations = this.filterInteractableAnnotationsForElement(
@@ -328,6 +341,7 @@ class CrosshairsTool extends AnnotationTool {
       if (annotations.length) {
         removeAnnotation(annotations[0].annotationUID);
       }
+      viewport.render();
     });
 
     this.computeToolCenter(viewportsInfo);
@@ -684,6 +698,10 @@ class CrosshairsTool extends AnnotationTool {
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
   };
 
+  onResetCamera = (evt) => {
+    this.resetCrosshairs();
+  };
+
   mouseMoveCallback = (
     evt: EventTypes.MouseMoveEventType,
     filteredToolAnnotations: Annotations

package/src/tools/segmentation/strategies/BrushStrategy.ts

@@ -1,15 +1,11 @@
 import type { Types } from '@cornerstonejs/core';
-import { cache, utilities as csUtils } from '@cornerstonejs/core';
+import { utilities as csUtils } from '@cornerstonejs/core';
 
 import { triggerSegmentationDataModified } from '../../../stateManagement/segmentation/triggerSegmentationEvents';
 import compositions from './compositions';
 import { getStrategyData } from './utils/getStrategyData';
-import { isVolumeSegmentation } from './utils/stackVolumeCheck';
 import { StrategyCallbacks } from '../../../enums';
-import type {
-  LabelmapToolOperationDataAny,
-  LabelmapToolOperationDataVolume,
-} from '../../../types/LabelmapToolOperationData';
+import type { LabelmapToolOperationDataAny } from '../../../types/LabelmapToolOperationData';
 import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
 
 const { VoxelManager } = csUtils;

package/src/utilities/contours/interpolation/interpolate.ts

@@ -248,9 +248,11 @@ function _addInterpolatedContour(
     referencedToolData
   );
 
-  const targetId = viewport.getReferenceId({ sliceIndex });
-  interpolatedAnnotation.metadata.referencedImageId = targetId;
-  interpolatedAnnotation.metadata.sliceIndex = sliceIndex;
+  const viewRef = viewport.getViewReference({ sliceIndex });
+  if (!viewRef) {
+    throw new Error(`Can't find slice ${sliceIndex}`);
+  }
+  Object.assign(interpolatedAnnotation.metadata, viewRef);
   annotationState.state.addAnnotation(interpolatedAnnotation, viewport.element);
   referencedToolData.onInterpolationComplete?.(
     interpolatedAnnotation,