@cornerstonejs/tools 3.7.4 → 3.7.5

package/dist/esm/eventListeners/segmentation/labelmap/onLabelmapSegmentationDataModified.js

@@ -1,11 +1,13 @@
-import { cache, utilities as csUtils, VolumeViewport, getEnabledElementByViewportId, StackViewport, } from '@cornerstonejs/core';
-import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
+import { VolumeViewport, getEnabledElementByViewportId, StackViewport, } from '@cornerstonejs/core';
 import { SegmentationRepresentations } from '../../../enums';
-import { getLabelmapActorEntries } from '../../../stateManagement/segmentation/helpers/getSegmentationActor';
+import { performVolumeLabelmapUpdate } from './performVolumeLabelmapUpdate';
+import { performStackLabelmapUpdate } from './performStackLabelmapUpdate';
+import { getSegmentation } from '../../../stateManagement/segmentation/getSegmentation';
+import { getViewportIdsWithSegmentation } from '../../../stateManagement/segmentation/getViewportIdsWithSegmentation';
 const onLabelmapSegmentationDataModified = function (evt) {
     const { segmentationId, modifiedSlicesToUse } = evt.detail;
-    const { representationData } = SegmentationState.getSegmentation(segmentationId);
-    const viewportIds = SegmentationState.getViewportIdsWithSegmentation(segmentationId);
+    const { representationData } = getSegmentation(segmentationId);
+    const viewportIds = getViewportIdsWithSegmentation(segmentationId);
     const hasVolumeViewport = viewportIds.some((viewportId) => {
         const { viewport } = getEnabledElementByViewportId(viewportId);
         return viewport instanceof VolumeViewport;
@@ -32,54 +34,4 @@ const onLabelmapSegmentationDataModified = function (evt) {
         }
     });
 };
-function performVolumeLabelmapUpdate({ modifiedSlicesToUse, representationData, type, }) {
-    const segmentationVolume = cache.getVolume(representationData[type].volumeId);
-    if (!segmentationVolume) {
-        console.warn('segmentation not found in cache');
-        return;
-    }
-    const { imageData, vtkOpenGLTexture } = segmentationVolume;
-    let slicesToUpdate;
-    if (modifiedSlicesToUse?.length > 0) {
-        slicesToUpdate = modifiedSlicesToUse;
-    }
-    else {
-        const numSlices = imageData.getDimensions()[2];
-        slicesToUpdate = [...Array(numSlices).keys()];
-    }
-    slicesToUpdate.forEach((i) => {
-        vtkOpenGLTexture.setUpdatedFrame(i);
-    });
-    imageData.modified();
-}
-function performStackLabelmapUpdate({ viewportIds, segmentationId }) {
-    viewportIds.forEach((viewportId) => {
-        let representations = SegmentationState.getSegmentationRepresentations(viewportId, { segmentationId });
-        representations = representations.filter((representation) => representation.type === SegmentationRepresentations.Labelmap);
-        representations.forEach((representation) => {
-            if (representation.segmentationId !== segmentationId) {
-                return;
-            }
-            const enabledElement = getEnabledElementByViewportId(viewportId);
-            if (!enabledElement) {
-                return;
-            }
-            const { viewport } = enabledElement;
-            if (viewport instanceof VolumeViewport) {
-                return;
-            }
-            const actorEntries = getLabelmapActorEntries(viewportId, segmentationId);
-            if (!actorEntries?.length) {
-                return;
-            }
-            actorEntries.forEach((actorEntry, i) => {
-                const segImageData = actorEntry.actor.getMapper().getInputData();
-                const currentSegmentationImageIds = SegmentationState.getCurrentLabelmapImageIdsForViewport(viewportId, segmentationId);
-                const segmentationImage = cache.getImage(currentSegmentationImageIds[i]);
-                segImageData.modified();
-                csUtils.updateVTKImageDataWithCornerstoneImage(segImageData, segmentationImage);
-            });
-        });
-    });
-}
 export default onLabelmapSegmentationDataModified;

package/dist/esm/eventListeners/segmentation/labelmap/performStackLabelmapUpdate.d.ts

@@ -0,0 +1,4 @@
+export declare function performStackLabelmapUpdate({ viewportIds, segmentationId, }: {
+    viewportIds: string[];
+    segmentationId: string;
+}): void;

package/dist/esm/eventListeners/segmentation/labelmap/performStackLabelmapUpdate.js

@@ -0,0 +1,37 @@
+import { cache, utilities as csUtils, VolumeViewport, getEnabledElementByViewportId, } from '@cornerstonejs/core';
+import { SegmentationRepresentations } from '../../../enums';
+import { getLabelmapActorEntries } from '../../../stateManagement/segmentation/helpers/getSegmentationActor';
+import { getSegmentationRepresentations } from '../../../stateManagement/segmentation/getSegmentationRepresentation';
+import { getCurrentLabelmapImageIdsForViewport } from '../../../stateManagement/segmentation/getCurrentLabelmapImageIdForViewport';
+export function performStackLabelmapUpdate({ viewportIds, segmentationId, }) {
+    viewportIds.forEach((viewportId) => {
+        let representations = getSegmentationRepresentations(viewportId, {
+            segmentationId,
+        });
+        representations = representations.filter((representation) => representation.type === SegmentationRepresentations.Labelmap);
+        representations.forEach((representation) => {
+            if (representation.segmentationId !== segmentationId) {
+                return;
+            }
+            const enabledElement = getEnabledElementByViewportId(viewportId);
+            if (!enabledElement) {
+                return;
+            }
+            const { viewport } = enabledElement;
+            if (viewport instanceof VolumeViewport) {
+                return;
+            }
+            const actorEntries = getLabelmapActorEntries(viewportId, segmentationId);
+            if (!actorEntries?.length) {
+                return;
+            }
+            actorEntries.forEach((actorEntry, i) => {
+                const segImageData = actorEntry.actor.getMapper().getInputData();
+                const currentSegmentationImageIds = getCurrentLabelmapImageIdsForViewport(viewportId, segmentationId);
+                const segmentationImage = cache.getImage(currentSegmentationImageIds[i]);
+                segImageData.modified();
+                csUtils.updateVTKImageDataWithCornerstoneImage(segImageData, segmentationImage);
+            });
+        });
+    });
+}

package/dist/esm/eventListeners/segmentation/labelmap/performVolumeLabelmapUpdate.d.ts

@@ -0,0 +1,6 @@
+import type { SegmentationRepresentations } from '../../../enums';
+export declare function performVolumeLabelmapUpdate({ modifiedSlicesToUse, representationData, type, }: {
+    modifiedSlicesToUse: number[];
+    representationData: Record<string, unknown>;
+    type: SegmentationRepresentations;
+}): void;

package/dist/esm/eventListeners/segmentation/labelmap/performVolumeLabelmapUpdate.js

@@ -0,0 +1,21 @@
+import { cache } from '@cornerstonejs/core';
+export function performVolumeLabelmapUpdate({ modifiedSlicesToUse, representationData, type, }) {
+    const segmentationVolume = cache.getVolume(representationData[type].volumeId);
+    if (!segmentationVolume) {
+        console.warn('segmentation not found in cache');
+        return;
+    }
+    const { imageData, vtkOpenGLTexture } = segmentationVolume;
+    let slicesToUpdate;
+    if (modifiedSlicesToUse?.length > 0) {
+        slicesToUpdate = modifiedSlicesToUse;
+    }
+    else {
+        const numSlices = imageData.getDimensions()[2];
+        slicesToUpdate = [...Array(numSlices).keys()];
+    }
+    slicesToUpdate.forEach((i) => {
+        vtkOpenGLTexture.setUpdatedFrame(i);
+    });
+    imageData.modified();
+}

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

@@ -28,9 +28,11 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         throw new Error(`segImageVolume with id: ${segImageVolume.volumeId} does not exist`);
     }
     const segVoxelManager = segImageVolume.voxelManager;
+    const segData = segVoxelManager.getCompleteScalarDataArray();
     const { imageData: segImageData } = segImageVolume;
     const baseVolume = cache.getVolume(referenceVolumeId);
     const baseVoxelManager = baseVolume.voxelManager;
+    const baseData = baseVoxelManager.getCompleteScalarDataArray();
     const newComp = 2;
     const cubeData = new Float32Array(newComp * baseVolume.voxelManager.getScalarDataLength());
     const dims = segImageData.getDimensions();
@@ -38,8 +40,8 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         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);
-                cubeData[iTuple * newComp + 0] = baseVoxelManager.getAtIndex(iTuple);
-                cubeData[iTuple * newComp + 1] = segVoxelManager.getAtIndex(iTuple);
+                cubeData[iTuple * newComp + 0] = baseData[iTuple];
+                cubeData[iTuple * newComp + 1] = segData[iTuple];
             }
         }
     }
@@ -70,7 +72,7 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         preLoad: load,
     });
     function onSegmentationDataModified(evt) {
-        const { segmentationId, modifiedSlicesToUse } = evt.detail;
+        const { segmentationId } = evt.detail;
         const { representationData } = getSegmentation(segmentationId);
         const { volumeId: segVolumeId } = representationData.Labelmap;
         if (segVolumeId !== segImageVolume.volumeId) {
@@ -78,13 +80,12 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         }
         const segmentationVolume = cache.getVolume(segVolumeId);
         const segVoxelManager = segmentationVolume.voxelManager;
-        const array = mapper.getInputData().getPointData().getArray(0);
+        const imageData = mapper.getInputData();
+        const array = imageData.getPointData().getArray(0);
         const baseData = array.getData();
         const newComp = 2;
         const dims = segImageData.getDimensions();
-        const slices = modifiedSlicesToUse?.length
-            ? modifiedSlicesToUse
-            : Array.from({ length: dims[2] }, (_, i) => i);
+        const slices = 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) {
@@ -94,8 +95,10 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
             }
         }
         array.setData(baseData);
+        imageData.modified();
+        viewport.render();
     }
-    eventTarget.addEventListener(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
+    eventTarget.addEventListenerDebounced(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified, 200);
     eventTarget.addEventListener(Events.SEGMENTATION_REPRESENTATION_REMOVED, async (evt) => {
         eventTarget.removeEventListener(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
         const actorEntry = viewport.getActor(uid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.7.4",
+  "version": "3.7.5",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.7.4",
+    "@cornerstonejs/core": "^3.7.5",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "802bfe6cacda032302a635632c076725afc514e0"
+  "gitHead": "81632a9aae1c17f5de5d3a6c59d448960c4f7804"
 }