@cornerstonejs/tools 4.15.15 → 4.15.16

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

@@ -9,7 +9,7 @@ const load = ({ cfun, ofun, actor }) => {
 export async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segmentationId, }) {
     const defaultActor = viewport.getDefaultActor();
     const { actor } = defaultActor;
-    const { uid, callback } = defaultActor;
+    const { uid } = defaultActor;
     const referenceVolumeId = viewport.getVolumeId();
     if (internalCache.get(uid)?.added) {
         return {
@@ -31,6 +31,11 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
     const segData = segVoxelManager.getCompleteScalarDataArray();
     const { imageData: segImageData } = segImageVolume;
     const baseVolume = cache.getVolume(referenceVolumeId);
+    const volumeTexture = baseVolume.vtkOpenGLTexture;
+    const hasPendingFrames = volumeTexture.hasUpdatedFrames();
+    if (hasPendingFrames) {
+        return;
+    }
     const baseVoxelManager = baseVolume.voxelManager;
     const baseData = baseVoxelManager.getCompleteScalarDataArray();
     const newComp = 2;
@@ -53,14 +58,18 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
     const arrayAgain = mapper.getInputData().getPointData().getArray(0);
     arrayAgain.setData(cubeData);
     arrayAgain.setNumberOfComponents(2);
+    const oldColorMixPreset = actor.getProperty().getColorMixPreset();
     actor.getProperty().setColorMixPreset(1);
+    const oldForceNearestInterpolation = actor
+        .getProperty()
+        .getForceNearestInterpolation(1);
     actor.getProperty().setForceNearestInterpolation(1, true);
+    const oldIndependentComponents = actor
+        .getProperty()
+        .getIndependentComponents();
     actor.getProperty().setIndependentComponents(true);
     viewport.addActor({
-        actor,
-        uid,
-        callback,
-        referencedId: referenceVolumeId,
+        ...defaultActor,
         representationUID: `${segmentationId}-${SegmentationRepresentations.Labelmap}`,
     });
     internalCache.set(uid, {
@@ -68,6 +77,7 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         segmentationRepresentationUID: `${segmentationId}`,
         originalBlendMode: viewport.getBlendMode(),
     });
+    const oldPreLoad = actor.get('preLoad');
     actor.set({
         preLoad: load,
     });
@@ -99,26 +109,33 @@ export async function addVolumesAsIndependentComponents({ viewport, volumeInputs
         viewport.render();
     }
     eventTarget.addEventListenerDebounced(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified, 200);
-    eventTarget.addEventListener(Events.SEGMENTATION_REPRESENTATION_REMOVED, async (evt) => {
+    function onSegmentationRepresentationRemoved(evt) {
+        if (evt.detail.viewportId !== viewport.id) {
+            return;
+        }
         eventTarget.removeEventListener(Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
+        eventTarget.removeEventListener(Events.SEGMENTATION_REPRESENTATION_REMOVED, onSegmentationRepresentationRemoved);
         const actorEntry = viewport.getActor(uid);
-        const { element, id } = viewport;
-        viewport.removeActors([uid]);
-        const actor = await createVolumeActor({
-            volumeId: uid,
-            blendMode: Enums.BlendModes.MAXIMUM_INTENSITY_BLEND,
-            callback: ({ volumeActor }) => {
-                if (actorEntry.callback) {
-                    actorEntry.callback({
-                        volumeActor,
-                        volumeId,
-                    });
-                }
-            },
-        }, element, id);
-        viewport.addActor({ actor, uid });
+        if (actorEntry) {
+            viewport.removeActors([uid]);
+        }
+        internalCache.delete(uid);
+        if (viewport.isDisabled) {
+            return;
+        }
+        actor.setMapper(oldMapper);
+        actor.getProperty().setColorMixPreset(oldColorMixPreset);
+        actor
+            .getProperty()
+            .setForceNearestInterpolation(1, oldForceNearestInterpolation);
+        actor.getProperty().setIndependentComponents(oldIndependentComponents);
+        viewport.addActor({
+            ...defaultActor,
+        });
+        actor.set(oldPreLoad);
         viewport.render();
-    });
+    }
+    eventTarget.addEventListener(Events.SEGMENTATION_REPRESENTATION_REMOVED, onSegmentationRepresentationRemoved);
     return {
         uid,
         actor,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.15";
+export declare const version = "4.15.16";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.15.15';
+export const version = '4.15.16';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.15.15",
+  "version": "4.15.16",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.15.15",
+    "@cornerstonejs/core": "4.15.16",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "d04af0b138a41d22bd74647a30447f13a8b258ea"
+  "gitHead": "734dd7f5fd416c386d08d6ab2d17f44226add8e2"
 }