@cornerstonejs/tools 5.4.10 → 5.4.12

package/dist/esm/stateManagement/segmentation/helpers/isSegmentationOverlayCompatible.d.ts

@@ -0,0 +1,3 @@
+import { type Types } from '@cornerstonejs/core';
+import { SegmentationRepresentations } from '../../../enums/index.js';
+export declare function isSegmentationOverlayCompatible(viewport: Types.IViewport | undefined, segmentationId: string, representationType: SegmentationRepresentations | undefined): boolean;

package/dist/esm/stateManagement/segmentation/helpers/isSegmentationOverlayCompatible.js

@@ -0,0 +1,87 @@
+import { cache, metaData } from '@cornerstonejs/core';
+import { SegmentationRepresentations } from '../../../enums/index.js';
+import { getSegmentation } from '../getSegmentation.js';
+import { getLabelmaps } from '../labelmapModel/index.js';
+function getLayerReferencedImageIds(layer) {
+    if (layer.referencedImageIds?.length) {
+        return layer.referencedImageIds;
+    }
+    const labelmapImageIds = layer.imageIds ??
+        (layer.volumeId
+            ? cache.getVolume(layer.volumeId)?.imageIds
+            : undefined) ??
+        [];
+    return labelmapImageIds
+        .map((labelmapImageId) => cache.getImage(labelmapImageId)?.referencedImageId)
+        .filter(Boolean);
+}
+function getLayerFrameOfReferenceUIDs(layer) {
+    const frameOfReferenceUIDs = new Set();
+    if (layer.volumeId) {
+        const volumeFrameOfReference = cache.getVolume(layer.volumeId)?.metadata?.FrameOfReferenceUID;
+        if (volumeFrameOfReference) {
+            frameOfReferenceUIDs.add(volumeFrameOfReference);
+        }
+    }
+    for (const referencedImageId of getLayerReferencedImageIds(layer)) {
+        const imageFrameOfReference = metaData.get('imagePlaneModule', referencedImageId)?.frameOfReferenceUID;
+        if (imageFrameOfReference) {
+            frameOfReferenceUIDs.add(imageFrameOfReference);
+        }
+    }
+    return [...frameOfReferenceUIDs];
+}
+function volumeViewportSharesFrameOfReference(viewport, layers) {
+    let viewportFrameOfReference;
+    try {
+        viewportFrameOfReference = viewport.getFrameOfReferenceUID?.();
+    }
+    catch (error) {
+        return true;
+    }
+    if (!viewportFrameOfReference) {
+        return true;
+    }
+    const labelmapFrameOfReferenceUIDs = layers.flatMap((layer) => getLayerFrameOfReferenceUIDs(layer));
+    if (!labelmapFrameOfReferenceUIDs.length) {
+        return true;
+    }
+    return labelmapFrameOfReferenceUIDs.includes(viewportFrameOfReference);
+}
+function stackViewportReferencesImages(viewport, layers) {
+    const referencedImageIds = layers.flatMap((layer) => getLayerReferencedImageIds(layer));
+    if (!referencedImageIds.length) {
+        return true;
+    }
+    let viewportImageIds;
+    try {
+        viewportImageIds =
+            viewport.getImageIds?.() ?? [];
+    }
+    catch (error) {
+        return true;
+    }
+    if (!viewportImageIds.length) {
+        return true;
+    }
+    const referencedImageIdSet = new Set(referencedImageIds);
+    return viewportImageIds.some((imageId) => referencedImageIdSet.has(imageId));
+}
+export function isSegmentationOverlayCompatible(viewport, segmentationId, representationType) {
+    if (representationType !== SegmentationRepresentations.Labelmap) {
+        return true;
+    }
+    if (!viewport) {
+        return true;
+    }
+    const segmentation = getSegmentation(segmentationId);
+    if (!segmentation) {
+        return true;
+    }
+    const layers = getLabelmaps(segmentation);
+    const isVolumeViewport = typeof viewport
+        .getAllVolumeIds === 'function';
+    return isVolumeViewport
+        ? volumeViewportSharesFrameOfReference(viewport, layers)
+        : stackViewportReferencesImages(viewport, layers);
+}

package/dist/esm/stateManagement/segmentation/internalAddSegmentationRepresentation.js

@@ -5,10 +5,15 @@ import { SegmentationRepresentations } from '../../enums/index.js';
 import { triggerSegmentationModified, triggerSegmentationDataModified, } from './triggerSegmentationEvents.js';
 import { addColorLUT } from './addColorLUT.js';
 import { defaultSegmentationStateManager } from './SegmentationStateManager.js';
+import { isSegmentationOverlayCompatible } from './helpers/isSegmentationOverlayCompatible.js';
 import { addDefaultSegmentationListener } from './segmentationEventManager.js';
 import { getActiveSegmentIndex, setActiveSegmentIndex } from './segmentIndex.js';
 function internalAddSegmentationRepresentation(viewportId, representationInput) {
     const { segmentationId, config } = representationInput;
+    if (!isSegmentationOverlayCompatible(getEnabledElementByViewportId(viewportId)?.viewport, segmentationId, representationInput.type)) {
+        console.warn(`Skipping ${representationInput.type} representation of segmentation "${segmentationId}" on viewport "${viewportId}": the viewport is not a compatible destination for it.`);
+        return;
+    }
     const renderingConfig = {
         colorLUTIndex: getColorLUTIndex(config),
         ...config,

package/dist/esm/tools/displayTools/Labelmap/syncStackLabelmapActors.js

@@ -3,6 +3,8 @@ import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData.js';
 import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction.js';
 import { ActorRenderMode, cache, utilities, } from '@cornerstonejs/core';
 import { triggerSegmentationRender } from '../../../stateManagement/segmentation/SegmentationRenderingEngine.js';
+import { isSegmentationOverlayCompatible } from '../../../stateManagement/segmentation/helpers/isSegmentationOverlayCompatible.js';
+import { SegmentationRepresentations } from '../../../enums/index.js';
 import { updateLabelmapSegmentationImageReferences } from '../../../stateManagement/segmentation/updateLabelmapSegmentationImageReferences.js';
 import { getCurrentLabelmapImageIdsForViewport } from '../../../stateManagement/segmentation/getCurrentLabelmapImageIdForViewport.js';
 import { getLabelmapActorEntries } from '../../../stateManagement/segmentation/helpers/getSegmentationActor.js';
@@ -18,6 +20,9 @@ export function syncStackLabelmapActors(viewport, segmentationId) {
     if (!currentImageId) {
         return;
     }
+    if (!isSegmentationOverlayCompatible(viewport, segmentationId, SegmentationRepresentations.Labelmap)) {
+        return;
+    }
     updateLabelmapSegmentationImageReferences(viewport.id, segmentationId);
     const derivedImageIds = getCurrentLabelmapImageIdsForViewport(viewport.id, segmentationId) ?? [];
     const derivedImageIdSet = new Set(derivedImageIds);

package/dist/esm/tools/segmentation/BrushTool.js

@@ -111,9 +111,6 @@ class BrushTool extends LabelmapBaseTool {
                 return false;
             }
             this._editData = this.createEditData(element);
-            this._activateDraw(element);
-            hideElementCursor(element);
-            evt.preventDefault();
             this._previewData.isDrag = false;
             this._previewData.timerStart = Date.now();
             const canvasPoint = vec2.clone(currentPoints.canvas);
@@ -126,6 +123,9 @@ class BrushTool extends LabelmapBaseTool {
                 world: vec3.clone(worldPoint),
             };
             this._hoverData = this.createHoverData(element, canvasPoint);
+            if (!this._hoverData) {
+                return false;
+            }
             this._calculateCursor(element, canvasPoint);
             this._resetLazyEditState();
             if (this._isLazyLabelmapEditingEnabled(this._hoverData.viewport)) {
@@ -137,6 +137,9 @@ class BrushTool extends LabelmapBaseTool {
             if (!operationData) {
                 return false;
             }
+            this._activateDraw(element);
+            hideElementCursor(element);
+            evt.preventDefault();
             this.applyActiveStrategyCallback(enabledElement, operationData, StrategyCallbacks.OnInteractionStart);
             return true;
         };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.4.10";
+export declare const version = "5.4.12";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.4.10';
+export const version = '5.4.12';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.4.10",
+  "version": "5.4.12",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -113,7 +113,7 @@
     "build": "pnpm run build:esm",
     "clean": "rm -rf node_modules/.cache/storybook && shx rm -rf dist",
     "clean:deep": "pnpm run clean && shx rm -rf node_modules",
-    "dev": "tsc --project ./tsconfig.json --watch",
+    "dev": "tsc --project ./tsconfig.json --watch --sourceMap --inlineSources",
     "lint": "oxlint .",
     "api-check": "api-extractor --debug run ",
     "prepublishOnly": "pnpm run build",
@@ -126,11 +126,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.4.10",
+    "@cornerstonejs/core": "5.4.12",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.4.10",
+    "@cornerstonejs/core": "5.4.12",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -149,5 +149,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "523becb5856f2b6bb5f58c08eb2b5c66bd0b17e1"
+  "gitHead": "0b67d01ebc033cc338c3612c1237b5d94025cac2"
 }