@cornerstonejs/tools 5.4.13 → 5.4.14

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

@@ -1,4 +1,4 @@
-import { triggerSegmentationRenderBySegmentationId } from '../../stateManagement/segmentation/SegmentationRenderingEngine.js';
+import { triggerSegmentationRenderForModified } from '../../stateManagement/segmentation/SegmentationRenderingEngine.js';
 import onLabelmapSegmentationDataModified from './labelmap/onLabelmapSegmentationDataModified.js';
 import { getSegmentation } from '../../stateManagement/segmentation/getSegmentation.js';
 const onSegmentationDataModified = function (evt) {
@@ -7,6 +7,6 @@ const onSegmentationDataModified = function (evt) {
     if (representationData.Labelmap) {
         onLabelmapSegmentationDataModified(evt);
     }
-    triggerSegmentationRenderBySegmentationId(segmentationId);
+    triggerSegmentationRenderForModified(segmentationId);
 };
 export default onSegmentationDataModified;

package/dist/esm/stateManagement/segmentation/SegmentationRenderingEngine.d.ts

@@ -17,5 +17,6 @@ declare class SegmentationRenderingEngine {
 }
 declare function triggerSegmentationRender(viewportId?: string): void;
 declare function triggerSegmentationRenderBySegmentationId(segmentationId?: string): void;
+declare function triggerSegmentationRenderForModified(segmentationId?: string): void;
 declare const segmentationRenderingEngine: SegmentationRenderingEngine;
-export { triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, segmentationRenderingEngine, };
+export { triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, triggerSegmentationRenderForModified, segmentationRenderingEngine, };

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

@@ -169,5 +169,49 @@ function triggerSegmentationRender(viewportId) {
 function triggerSegmentationRenderBySegmentationId(segmentationId) {
     segmentationRenderingEngine.renderSegmentation(segmentationId);
 }
+const DEFERRED_SEGMENTATION_RENDER_DELAY_MS = 240;
+const deferredSegmentationRenderTimers = new Map();
+function isProjectionHeavySegmentationViewport(viewport) {
+    const blendMode = viewport.getBlendMode?.();
+    if (blendMode === Enums.BlendModes.LABELMAP_EDGE_PROJECTION_BLEND) {
+        return true;
+    }
+    const planarViewport = viewport;
+    if (typeof planarViewport.getDisplaySetPresentation !== 'function') {
+        return false;
+    }
+    const dataIds = [];
+    const sourceDataId = planarViewport.getSourceDataId?.();
+    if (sourceDataId) {
+        dataIds.push(sourceDataId);
+    }
+    planarViewport.getActors?.().forEach((actorEntry) => {
+        if (actorEntry.representationUID) {
+            dataIds.push(String(actorEntry.representationUID));
+        }
+    });
+    return dataIds.some((dataId) => (planarViewport.getDisplaySetPresentation(dataId)?.slabThickness ?? 0) > 0);
+}
+function triggerSegmentationRenderForModified(segmentationId) {
+    const viewportIds = segmentationRenderingEngine._getViewportIdsForSegmentation(segmentationId);
+    viewportIds.forEach((viewportId) => {
+        const { viewport } = getEnabledElementByViewportId(viewportId) || {};
+        if (!viewport) {
+            return;
+        }
+        if (!isProjectionHeavySegmentationViewport(viewport)) {
+            segmentationRenderingEngine.renderSegmentationsForViewport(viewportId);
+            return;
+        }
+        const existingTimer = deferredSegmentationRenderTimers.get(viewportId);
+        if (existingTimer !== undefined) {
+            clearTimeout(existingTimer);
+        }
+        deferredSegmentationRenderTimers.set(viewportId, setTimeout(() => {
+            deferredSegmentationRenderTimers.delete(viewportId);
+            segmentationRenderingEngine.renderSegmentationsForViewport(viewportId);
+        }, DEFERRED_SEGMENTATION_RENDER_DELAY_MS));
+    });
+}
 const segmentationRenderingEngine = new SegmentationRenderingEngine();
-export { triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, segmentationRenderingEngine, };
+export { triggerSegmentationRender, triggerSegmentationRenderBySegmentationId, triggerSegmentationRenderForModified, segmentationRenderingEngine, };

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

@@ -1,4 +1,4 @@
-import { cache, Enums, convertMapperToNotSharedMapper, volumeLoader, eventTarget, createVolumeActor, } from '@cornerstonejs/core';
+import { cache, Enums, convertMapperToNotSharedMapper, volumeLoader, eventTarget, } from '@cornerstonejs/core';
 import { Events, SegmentationRepresentations } from '../../../enums/index.js';
 import { getSegmentation } from '../../../stateManagement/segmentation/getSegmentation.js';
 const internalCache = new Map();
@@ -52,6 +52,8 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
     }
     viewport.removeActors([uid]);
     const oldMapper = actor.getMapper();
+    const sharedImageData = oldMapper.getInputData();
+    const originalScalars = sharedImageData.getPointData().getScalars() ?? null;
     const mapper = convertMapperToNotSharedMapper(oldMapper);
     actor.setMapper(mapper);
     mapper.setBlendMode(Enums.BlendModes.LABELMAP_EDGE_PROJECTION_BLEND);
@@ -68,9 +70,16 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         .getProperty()
         .getIndependentComponents();
     actor.getProperty().setIndependentComponents(true);
+    const oldUseLabelOutline = actor.getProperty().getUseLabelOutline();
+    const oldLabelOutlineOpacity = actor.getProperty().getLabelOutlineOpacity();
+    const oldLabelOutlineThickness = actor
+        .getProperty()
+        .getLabelOutlineThickness();
+    const representationUID = volumeInputArray[0].representationUID ??
+        `${segmentationId}-${SegmentationRepresentations.Labelmap}`;
     viewport.addActor({
         ...defaultActor,
-        representationUID: `${segmentationId}-${SegmentationRepresentations.Labelmap}`,
+        representationUID,
     });
     internalCache.set(uid, {
         added: true,
@@ -82,7 +91,7 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         preLoad: load,
     });
     function onSegmentationDataModified(evt) {
-        const { segmentationId } = evt.detail;
+        const { segmentationId, modifiedSlicesToUse } = evt.detail;
         const { representationData } = getSegmentation(segmentationId);
         const { volumeId: segVolumeId } = representationData.Labelmap;
         if (segVolumeId !== segImageVolume.volumeId) {
@@ -92,19 +101,30 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         const segVoxelManager = segmentationVolume.voxelManager;
         const imageData = mapper.getInputData();
         const array = imageData.getPointData().getArray(0);
-        const baseData = array.getData();
+        const combinedData = array.getData();
         const newComp = 2;
         const dims = segImageData.getDimensions();
-        const slices = Array.from({ length: dims[2] }, (_, i) => i);
+        const sliceSize = dims[0] * dims[1];
+        const slices = modifiedSlicesToUse?.length
+            ? modifiedSlicesToUse
+            : Array.from({ length: dims[2] }, (_, i) => i);
         for (const z of slices) {
-            for (let y = 0; y < dims[1]; ++y) {
-                for (let x = 0; x < dims[0]; ++x) {
-                    const iTuple = x + dims[0] * (y + dims[1] * z);
-                    baseData[iTuple * newComp + 1] = segVoxelManager.getAtIndex(iTuple);
+            const sliceStart = z * sliceSize;
+            const sliceImage = cache.getImage(segmentationVolume.imageIds?.[z]);
+            const sliceData = sliceImage?.voxelManager?.getScalarData?.();
+            if (sliceData?.length === sliceSize) {
+                for (let i = 0; i < sliceSize; ++i) {
+                    combinedData[(sliceStart + i) * newComp + 1] = sliceData[i];
+                }
+            }
+            else {
+                for (let i = 0; i < sliceSize; ++i) {
+                    const iTuple = sliceStart + i;
+                    combinedData[iTuple * newComp + 1] = segVoxelManager.getAtIndex(iTuple);
                 }
             }
         }
-        array.setData(baseData);
+        array.setData(combinedData);
         imageData.modified();
         viewport.render();
     }
@@ -113,7 +133,7 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         if (evt.detail.viewportId !== viewport.id) {
             return;
         }
-        eventTarget.removeEventListener(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
+        eventTarget.removeEventListenerDebounced(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
         eventTarget.removeEventListener(Events.SEGMENTATION_REPRESENTATION_REMOVED, onSegmentationRepresentationRemoved);
         const actorEntry = viewport.getActor(uid);
         if (actorEntry) {
@@ -124,11 +144,22 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
             return;
         }
         actor.setMapper(oldMapper);
+        const pointData = sharedImageData.getPointData();
+        if (originalScalars) {
+            pointData.setScalars(originalScalars);
+        }
+        else {
+            pointData.removeArray('Pixels');
+        }
+        sharedImageData.modified();
         actor.getProperty().setColorMixPreset(oldColorMixPreset);
         actor
             .getProperty()
             .setForceNearestInterpolation(1, oldForceNearestInterpolation);
         actor.getProperty().setIndependentComponents(oldIndependentComponents);
+        actor.getProperty().setUseLabelOutline(oldUseLabelOutline);
+        actor.getProperty().setLabelOutlineOpacity(oldLabelOutlineOpacity);
+        actor.getProperty().setLabelOutlineThickness(oldLabelOutlineThickness);
         viewport.addActor({
             ...defaultActor,
         });

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.4.13";
+export declare const version = "5.4.14";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.4.13';
+export const version = '5.4.14';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.4.13",
+  "version": "5.4.14",
   "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.4.13",
+    "@cornerstonejs/core": "5.4.14",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.4.13",
+    "@cornerstonejs/core": "5.4.14",
     "@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": "9f0b0f4813368e68bc0c04f02132e06f15b6a0f8"
+  "gitHead": "44424ece1744c4ee1fdd4c6304abc9005bf3bd39"
 }