@cornerstonejs/tools 5.2.2 → 5.4.0

package/dist/esm/eventListeners/segmentation/renderingPipelineChangedListener.d.ts

@@ -0,0 +1,2 @@
+declare const renderingPipelineChangedListener: (evt: CustomEvent) => void;
+export default renderingPipelineChangedListener;

package/dist/esm/eventListeners/segmentation/renderingPipelineChangedListener.js

@@ -0,0 +1,14 @@
+import { triggerSegmentationRender } from '../../stateManagement/segmentation/SegmentationRenderingEngine.js';
+import { getSegmentationRepresentations } from '../../stateManagement/segmentation/getSegmentationRepresentation.js';
+const renderingPipelineChangedListener = function (evt) {
+    const viewportId = evt.detail?.viewportId;
+    if (!viewportId) {
+        return;
+    }
+    const representations = getSegmentationRepresentations(viewportId);
+    if (!representations?.length) {
+        return;
+    }
+    triggerSegmentationRender(viewportId);
+};
+export default renderingPipelineChangedListener;

package/dist/esm/init.js

@@ -10,6 +10,7 @@ import { defaultSegmentationStateManager } from './stateManagement/segmentation/
 import segmentationRepresentationModifiedListener from './eventListeners/segmentation/segmentationRepresentationModifiedListener.js';
 import { setConfig } from './config.js';
 import segmentationRemovedListener from './eventListeners/segmentation/segmentationRemovedEventListener.js';
+import renderingPipelineChangedListener from './eventListeners/segmentation/renderingPipelineChangedListener.js';
 import { registerBuiltInSegmentationRepresentationDisplays } from './tools/displayTools/registerBuiltInSegmentationRepresentationDisplays.js';
 let csToolsInitialized = false;
 export function init(defaultConfiguration = {}) {
@@ -39,6 +40,7 @@ function _addCornerstoneEventListeners() {
     const elementDisabledEvent = Enums.Events.ELEMENT_DISABLED;
     eventTarget.addEventListener(elementEnabledEvent, addEnabledElement);
     eventTarget.addEventListener(elementDisabledEvent, removeEnabledElement);
+    eventTarget.addEventListener(Enums.Events.RENDERING_PIPELINE_CHANGED, renderingPipelineChangedListener);
     annotationInterpolationEventDispatcher.enable();
 }
 function _removeCornerstoneEventListeners() {
@@ -46,6 +48,7 @@ function _removeCornerstoneEventListeners() {
     const elementDisabledEvent = Enums.Events.ELEMENT_DISABLED;
     eventTarget.removeEventListener(elementEnabledEvent, addEnabledElement);
     eventTarget.removeEventListener(elementDisabledEvent, removeEnabledElement);
+    eventTarget.removeEventListener(Enums.Events.RENDERING_PIPELINE_CHANGED, renderingPipelineChangedListener);
     annotationInterpolationEventDispatcher.disable();
 }
 function _addCornerstoneToolsEventListeners() {

package/dist/esm/tools/annotation/SplineROITool.js

@@ -52,6 +52,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
         configuration: {
             preventHandleOutsideImage: false,
             calculateStats: true,
+            allowOpenSplines: false,
             simplifiedSpline: false,
             getTextLines: defaultGetTextLines,
             contourHoleAdditionModifierKey: KeyboardBindings.Shift,
@@ -242,7 +243,9 @@ class SplineROITool extends ContourSegmentationBaseTool {
             const eventDetail = evt.detail;
             const { currentPoints, element } = eventDetail;
             const { canvas: canvasPoint, world: worldPoint } = currentPoints;
-            let closeContour = data.handles.points.length >= 2 && doubleClick;
+            let closeContour = data.handles.points.length >= 2 &&
+                doubleClick &&
+                !this.configuration.allowOpenSplines;
             let addNewPoint = true;
             if (data.handles.points.length) {
                 this.createMemo(element, annotation, {
@@ -255,7 +258,7 @@ class SplineROITool extends ContourSegmentationBaseTool {
                 const closestControlPoint = spline.getClosestControlPointWithinDistance(canvasPoint, SPLINE_CLICK_CLOSE_CURVE_DIST);
                 if (closestControlPoint?.index === 0) {
                     addNewPoint = false;
-                    closeContour = true;
+                    closeContour = !this.configuration.allowOpenSplines;
                 }
             }
             if (addNewPoint) {
@@ -264,7 +267,10 @@ class SplineROITool extends ContourSegmentationBaseTool {
             data.contour.closed = data.contour.closed || closeContour;
             annotation.invalidated = true;
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
-            if (data.contour.closed) {
+            const allowOpenSplines = doubleClick &&
+                this.configuration.allowOpenSplines &&
+                data.handles.points.length >= 3;
+            if (data.contour.closed || allowOpenSplines) {
                 this._endCallback(evt);
             }
             evt.preventDefault();

package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/createLabelmapRenderPlan.d.ts

@@ -1,3 +1,5 @@
+import type { Types } from '@cornerstonejs/core';
 import type { CreateLabelmapRenderPlanArgs, LabelmapRenderPlan } from './types.js';
-declare function createLabelmapRenderPlan({ isVolumeImageMapper, kind, renderMode, segmentationId, unsupportedStateKey, updateAfterMount, useSliceRendering, viewport, canRenderCurrentViewport, getExpectedRepresentationUIDs, mount, update, }: CreateLabelmapRenderPlanArgs): LabelmapRenderPlan;
-export { createLabelmapRenderPlan };
+declare function createLabelmapRenderPlan({ isVolumeImageMapper, kind, renderMode, segmentationId, unsupportedStateKey, updateAfterMount, useSliceRendering, viewport, canRenderCurrentViewport, getExpectedRepresentationUIDs, isActorEntryCompatible, mount, update, }: CreateLabelmapRenderPlanArgs): LabelmapRenderPlan;
+declare function getActorEntryRenderMode(actorEntry: Types.ActorEntry): Types.ActorRenderMode | undefined;
+export { createLabelmapRenderPlan, getActorEntryRenderMode };

package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/createLabelmapRenderPlan.js

@@ -1,8 +1,9 @@
 import { getLabelmapActorEntries } from '../../../../stateManagement/segmentation/helpers/getSegmentationActor.js';
 import { removeLabelmapRepresentationFromViewport } from './removeLabelmapRepresentationFromViewport.js';
-function createLabelmapRenderPlan({ isVolumeImageMapper, kind, renderMode, segmentationId, unsupportedStateKey, updateAfterMount = true, useSliceRendering, viewport, canRenderCurrentViewport = () => kind !== 'unsupported', getExpectedRepresentationUIDs = () => [], mount = async () => undefined, update = () => undefined, }) {
+function createLabelmapRenderPlan({ isVolumeImageMapper, kind, renderMode, segmentationId, unsupportedStateKey, updateAfterMount = true, useSliceRendering, viewport, canRenderCurrentViewport = () => kind !== 'unsupported', getExpectedRepresentationUIDs = () => [], isActorEntryCompatible = () => true, mount = async () => undefined, update = () => undefined, }) {
     const remove = () => removeLabelmapRepresentationFromViewport(viewport, segmentationId);
-    const needsRemount = (actorEntries) => haveActorUIDsChanged(actorEntries, getExpectedRepresentationUIDs());
+    const needsRemount = (actorEntries) => haveActorUIDsChanged(actorEntries, getExpectedRepresentationUIDs()) ||
+        (actorEntries ?? []).some((actorEntry) => !isActorEntryCompatible(actorEntry));
     return {
         kind,
         renderMode,
@@ -35,6 +36,9 @@ function createLabelmapRenderPlan({ isVolumeImageMapper, kind, renderMode, segme
         },
     };
 }
+function getActorEntryRenderMode(actorEntry) {
+    return actorEntry.actorMapper?.renderMode;
+}
 function haveActorUIDsChanged(actorEntries, expectedRepresentationUIDs) {
     const actualUIDs = new Set((actorEntries ?? []).map((entry) => entry.representationUID));
     const expectedUIDs = new Set(expectedRepresentationUIDs);
@@ -48,4 +52,4 @@ function haveActorUIDsChanged(actorEntries, expectedRepresentationUIDs) {
     }
     return false;
 }
-export { createLabelmapRenderPlan };
+export { createLabelmapRenderPlan, getActorEntryRenderMode };

package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/legacyVolumePlan.js

@@ -1,9 +1,9 @@
-import { addVolumesToViewports, Enums, cache, volumeLoader, utilities, } from '@cornerstonejs/core';
+import { ActorRenderMode, addVolumesToViewports, Enums, cache, volumeLoader, utilities, } from '@cornerstonejs/core';
 import { triggerSegmentationDataModified, triggerSegmentationModified, } from '../../../../stateManagement/segmentation/triggerSegmentationEvents.js';
 import { getLabelmaps, getOrCreateLabelmapVolume, } from '../../../../stateManagement/segmentation/helpers/labelmapSegmentationState.js';
 import { addVolumesAsIndependentComponents } from '../addVolumesAsIndependentComponents.js';
 import { createLabelmapRepresentationUID } from '../labelmapRepresentationUID.js';
-import { createLabelmapRenderPlan } from './createLabelmapRenderPlan.js';
+import { createLabelmapRenderPlan, getActorEntryRenderMode, } from './createLabelmapRenderPlan.js';
 import { addLabelmapToPlanarGenericViewport, isPlanarNextVolumeViewport, } from './planarGenericVolumeLabelmap.js';
 const { uuidv4 } = utilities;
 function createLegacyVolumeLabelmapPlan({ config, isVolumeImageMapper, renderMode, segmentation, segmentationId, useSliceRendering, viewport, }) {
@@ -15,6 +15,7 @@ function createLegacyVolumeLabelmapPlan({ config, isVolumeImageMapper, renderMod
         useSliceRendering,
         viewport,
         getExpectedRepresentationUIDs: () => getExpectedVolumeLabelmapRepresentationUIDs(segmentation, segmentationId),
+        isActorEntryCompatible: (actorEntry) => !isImageMountedActorEntry(actorEntry),
         mount: ({ labelMapData }) => mountLegacyVolumeLabelmap({
             config,
             labelMapData,
@@ -24,6 +25,11 @@ function createLegacyVolumeLabelmapPlan({ config, isVolumeImageMapper, renderMod
         }),
     });
 }
+function isImageMountedActorEntry(actorEntry) {
+    const renderMode = getActorEntryRenderMode(actorEntry);
+    return (renderMode === ActorRenderMode.VTK_IMAGE ||
+        renderMode === ActorRenderMode.CPU_IMAGE);
+}
 function getExpectedVolumeLabelmapRepresentationUIDs(segmentation, segmentationId) {
     return getLabelmaps(segmentation)
         .filter(canResolveLayerAsVolume)

package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/types.d.ts

@@ -42,6 +42,7 @@ type CreateLabelmapRenderPlanArgs = {
     viewport: Types.IViewport;
     canRenderCurrentViewport?: () => boolean;
     getExpectedRepresentationUIDs?: () => string[];
+    isActorEntryCompatible?: (actorEntry: Types.ActorEntry) => boolean;
     mount?: (args: LabelmapRenderPlanMountArgs) => Promise<LabelmapRenderPlanMountResult>;
     update?: (args: LabelmapRenderPlanUpdateArgs) => void;
 };

package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/volumeSliceImageMapperPlan.d.ts

@@ -1,4 +1,4 @@
-import type { Types } from '@cornerstonejs/core';
+import { type Types } from '@cornerstonejs/core';
 import type { ViewportLabelmapRenderMode } from '../../../../stateManagement/segmentation/helpers/getViewportLabelmapRenderMode.js';
 import type { Segmentation } from '../../../../types/SegmentationStateTypes.js';
 import type { LabelmapRenderPlan } from './types.js';

package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/volumeSliceImageMapperPlan.js

@@ -1,6 +1,7 @@
+import { ActorRenderMode } from '@cornerstonejs/core';
 import { triggerSegmentationDataModified } from '../../../../stateManagement/segmentation/triggerSegmentationEvents.js';
 import { addVolumeLabelmapImageMapperActors, getVolumeLabelmapImageMapperRepresentationUIDs, updateVolumeLabelmapImageMapperActors, } from '../volumeLabelmapImageMapper.js';
-import { createLabelmapRenderPlan } from './createLabelmapRenderPlan.js';
+import { createLabelmapRenderPlan, getActorEntryRenderMode, } from './createLabelmapRenderPlan.js';
 function createVolumeSliceImageMapperPlan({ isVolumeImageMapper, renderMode, segmentation, segmentationId, useSliceRendering, viewport, }) {
     return createLabelmapRenderPlan({
         isVolumeImageMapper,
@@ -10,6 +11,7 @@ function createVolumeSliceImageMapperPlan({ isVolumeImageMapper, renderMode, seg
         useSliceRendering,
         viewport,
         getExpectedRepresentationUIDs: () => getVolumeLabelmapImageMapperRepresentationUIDs(viewport, segmentationId, segmentation),
+        isActorEntryCompatible: (actorEntry) => !isVolumeMountedActorEntry(actorEntry),
         mount: () => mountVolumeLabelmapImageMapper({
             viewport,
             segmentation,
@@ -23,6 +25,12 @@ function createVolumeSliceImageMapperPlan({ isVolumeImageMapper, renderMode, seg
         }),
     });
 }
+function isVolumeMountedActorEntry(actorEntry) {
+    const renderMode = getActorEntryRenderMode(actorEntry);
+    return (renderMode === ActorRenderMode.VTK_VOLUME ||
+        renderMode === ActorRenderMode.VTK_VOLUME_SLICE ||
+        renderMode === ActorRenderMode.CPU_VOLUME);
+}
 async function mountVolumeLabelmapImageMapper({ viewport, segmentation, segmentationId, }) {
     await addVolumeLabelmapImageMapperActors({
         viewport,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.2.2";
+export declare const version = "5.4.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.2.2';
+export const version = '5.4.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.2.2",
+  "version": "5.4.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -126,11 +126,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.2.2",
+    "@cornerstonejs/core": "5.4.0",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.2.2",
+    "@cornerstonejs/core": "5.4.0",
     "@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": "16455de96d51253a436e44cfec9971d7bbc1b2e4"
+  "gitHead": "66acfc1d1cacf70845a9eb52a7b7a770a6b1fd3d"
 }