@cornerstonejs/core 2.9.0 → 2.10.0

package/dist/esm/RenderingEngine/BaseVolumeViewport.js

@@ -591,7 +591,6 @@ class BaseVolumeViewport extends Viewport {
         }
         if (slabThickness !== undefined) {
             this.setSlabThickness(slabThickness);
-            this.viewportProperties.slabThickness = slabThickness;
         }
     }
     resetToDefaultProperties(volumeId) {

package/dist/esm/RenderingEngine/CanvasActor/index.d.ts

@@ -12,6 +12,7 @@ export default class CanvasActor {
     protected canvas: any;
     constructor(viewport: IViewport, derivedImage: any);
     protected renderRLE(viewport: any, context: any, voxelManager: any): void;
+    setMapper(mapper: CanvasMapper): void;
     render(viewport: IViewport, context: CanvasRenderingContext2D): void;
     getClassName(): string;
     getProperty(): CanvasProperties;

package/dist/esm/RenderingEngine/CanvasActor/index.js

@@ -62,6 +62,9 @@ export default class CanvasActor {
         localContext.putImageData(imageData, 0, 0, dirtyX - 1, dirtyY - 1, dirtyWidth + 2, dirtyHeight + 2);
         context.drawImage(canvas, dirtyX, dirtyY, dirtyWidth, dirtyHeight, dirtyX, dirtyY, dirtyWidth, dirtyHeight);
     }
+    setMapper(mapper) {
+        this.mapper = mapper;
+    }
     render(viewport, context) {
         if (!this.visibility) {
             return;

package/dist/esm/RenderingEngine/VolumeViewport.d.ts

@@ -15,6 +15,7 @@ declare class VolumeViewport extends BaseVolumeViewport {
     protected setCameraClippingRange(): void;
     private _getAcquisitionPlaneOrientation;
     private _setViewPlaneToAcquisitionPlane;
+    getBlendMode(filterActorUIDs?: string[]): BlendModes;
     setBlendMode(blendMode: BlendModes, filterActorUIDs?: any[], immediate?: boolean): void;
     resetCameraForResize: () => boolean;
     resetCamera(options?: any): boolean;

package/dist/esm/RenderingEngine/VolumeViewport.js

@@ -203,9 +203,17 @@ class VolumeViewport extends BaseVolumeViewport {
         this.initialViewUp = viewUp;
         this.resetCamera();
     }
+    getBlendMode(filterActorUIDs) {
+        const actorEntries = this.getActors();
+        const actorForBlend = filterActorUIDs?.length > 0
+            ? actorEntries.find((actorEntry) => filterActorUIDs.includes(actorEntry.uid))
+            : actorEntries[0];
+        return (actorForBlend?.blendMode ||
+            actorForBlend?.actor.getMapper().getBlendMode());
+    }
     setBlendMode(blendMode, filterActorUIDs = [], immediate = false) {
         let actorEntries = this.getActors();
-        if (filterActorUIDs && filterActorUIDs.length > 0) {
+        if (filterActorUIDs?.length > 0) {
             actorEntries = actorEntries.filter((actorEntry) => {
                 return filterActorUIDs.includes(actorEntry.uid);
             });
@@ -214,6 +222,7 @@ class VolumeViewport extends BaseVolumeViewport {
             const { actor } = actorEntry;
             const mapper = actor.getMapper();
             mapper.setBlendMode?.(blendMode);
+            actorEntry.blendMode = blendMode;
         });
         if (immediate) {
             this.render();
@@ -273,7 +282,7 @@ class VolumeViewport extends BaseVolumeViewport {
             slabThickness = 0.1;
         }
         let actorEntries = this.getActors();
-        if (filterActorUIDs && filterActorUIDs.length > 0) {
+        if (filterActorUIDs?.length > 0) {
             actorEntries = actorEntries.filter((actorEntry) => {
                 return filterActorUIDs.includes(actorEntry.uid);
             });

package/dist/esm/RenderingEngine/helpers/createVolumeMapper.d.ts

@@ -1,4 +1,5 @@
 import type vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
 import type vtkOpenGLTexture from '@kitware/vtk.js/Rendering/OpenGL/Texture';
-import type vtkVolumeMapper from '@kitware/vtk.js/Rendering/Core/VolumeMapper';
+import vtkVolumeMapper from '@kitware/vtk.js/Rendering/Core/VolumeMapper';
 export default function createVolumeMapper(imageData: vtkImageData, vtkOpenGLTexture: vtkOpenGLTexture): vtkVolumeMapper;
+export declare function convertMapperToNotSharedMapper(sharedMapper: vtkVolumeMapper): vtkVolumeMapper;

package/dist/esm/RenderingEngine/helpers/createVolumeMapper.js

@@ -1,5 +1,7 @@
 import { vtkSharedVolumeMapper } from '../vtkClasses';
 import { getConfiguration } from '../../init';
+import vtkVolumeMapper from '@kitware/vtk.js/Rendering/Core/VolumeMapper';
+import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
 export default function createVolumeMapper(imageData, vtkOpenGLTexture) {
     const volumeMapper = vtkSharedVolumeMapper.newInstance();
     if (getConfiguration().rendering.preferSizeOverAccuracy) {
@@ -13,3 +15,19 @@ export default function createVolumeMapper(imageData, vtkOpenGLTexture) {
     volumeMapper.setScalarTexture(vtkOpenGLTexture);
     return volumeMapper;
 }
+export function convertMapperToNotSharedMapper(sharedMapper) {
+    const volumeMapper = vtkVolumeMapper.newInstance();
+    volumeMapper.setBlendMode(sharedMapper.getBlendMode());
+    const imageData = sharedMapper.getInputData();
+    const { voxelManager } = imageData.get('voxelManager');
+    const values = voxelManager.getCompleteScalarDataArray();
+    const scalarArray = vtkDataArray.newInstance({
+        name: `Pixels`,
+        values,
+    });
+    imageData.getPointData().setScalars(scalarArray);
+    volumeMapper.setInputData(imageData);
+    volumeMapper.setMaximumSamplesPerRay(sharedMapper.getMaximumSamplesPerRay());
+    volumeMapper.setSampleDistance(sharedMapper.getSampleDistance());
+    return volumeMapper;
+}

package/dist/esm/enums/BlendModes.d.ts

@@ -1,7 +1,8 @@
-declare enum BlendModes {
+export declare enum BlendModes {
     COMPOSITE,
     MAXIMUM_INTENSITY_BLEND,
     MINIMUM_INTENSITY_BLEND,
-    AVERAGE_INTENSITY_BLEND
+    AVERAGE_INTENSITY_BLEND,
+    LABELMAP_EDGE_PROJECTION_BLEND
 }
 export default BlendModes;

package/dist/esm/enums/BlendModes.js

@@ -1,10 +1,11 @@
 import vtkConstants from '@kitware/vtk.js/Rendering/Core/VolumeMapper/Constants';
 const { BlendMode } = vtkConstants;
-var BlendModes;
+export var BlendModes;
 (function (BlendModes) {
     BlendModes[BlendModes["COMPOSITE"] = BlendMode.COMPOSITE_BLEND] = "COMPOSITE";
     BlendModes[BlendModes["MAXIMUM_INTENSITY_BLEND"] = BlendMode.MAXIMUM_INTENSITY_BLEND] = "MAXIMUM_INTENSITY_BLEND";
     BlendModes[BlendModes["MINIMUM_INTENSITY_BLEND"] = BlendMode.MINIMUM_INTENSITY_BLEND] = "MINIMUM_INTENSITY_BLEND";
     BlendModes[BlendModes["AVERAGE_INTENSITY_BLEND"] = BlendMode.AVERAGE_INTENSITY_BLEND] = "AVERAGE_INTENSITY_BLEND";
+    BlendModes[BlendModes["LABELMAP_EDGE_PROJECTION_BLEND"] = BlendMode.LABELMAP_EDGE_PROJECTION_BLEND] = "LABELMAP_EDGE_PROJECTION_BLEND";
 })(BlendModes || (BlendModes = {}));
 export default BlendModes;

package/dist/esm/index.d.ts

@@ -3,7 +3,7 @@ import * as CONSTANTS from './constants';
 import { Events } from './enums';
 import RenderingEngine from './RenderingEngine';
 import createVolumeActor from './RenderingEngine/helpers/createVolumeActor';
-import createVolumeMapper from './RenderingEngine/helpers/createVolumeMapper';
+import createVolumeMapper, { convertMapperToNotSharedMapper } from './RenderingEngine/helpers/createVolumeMapper';
 import getOrCreateCanvas from './RenderingEngine/helpers/getOrCreateCanvas';
 import VolumeViewport from './RenderingEngine/VolumeViewport';
 import VolumeViewport3D from './RenderingEngine/VolumeViewport3D';
@@ -35,4 +35,4 @@ import { cornerstoneStreamingImageVolumeLoader } from './loaders/cornerstoneStre
 import { cornerstoneStreamingDynamicImageVolumeLoader } from './loaders/cornerstoneStreamingDynamicImageVolumeLoader';
 import { setVolumesForViewports, addVolumesToViewports, addImageSlicesToViewports } from './RenderingEngine/helpers';
 export type { Types, IRetrieveConfiguration, RetrieveOptions, RetrieveStage, ImageLoadListener, IImagesLoader, };
-export { init, isCornerstoneInitialized, peerImport, resetInitialization, getConfiguration, setConfiguration, getWebWorkerManager, canRenderFloatTextures, Enums, CONSTANTS, Events as EVENTS, Settings, BaseVolumeViewport, VolumeViewport, VolumeViewport3D, Viewport, StackViewport, VideoViewport, WSIViewport, RenderingEngine, ImageVolume, Surface, getRenderingEngine, getRenderingEngines, getEnabledElement, getEnabledElementByIds, getEnabledElements, getEnabledElementByViewportId, createVolumeActor, getOrCreateCanvas, createVolumeMapper, cache, eventTarget, triggerEvent, imageLoader, registerImageLoader, volumeLoader, metaData, utilities, setVolumesForViewports, addVolumesToViewports, addImageSlicesToViewports, imageLoadPoolManager as requestPoolManager, imageRetrievalPoolManager, imageLoadPoolManager, getShouldUseCPURendering, setUseCPURendering, setPreferSizeOverAccuracy, resetUseCPURendering, geometryLoader, ProgressiveRetrieveImages, cornerstoneStreamingImageVolumeLoader, cornerstoneStreamingDynamicImageVolumeLoader, StreamingDynamicImageVolume, StreamingImageVolume, };
+export { init, isCornerstoneInitialized, peerImport, resetInitialization, getConfiguration, setConfiguration, getWebWorkerManager, canRenderFloatTextures, Enums, CONSTANTS, Events as EVENTS, Settings, BaseVolumeViewport, VolumeViewport, VolumeViewport3D, Viewport, StackViewport, VideoViewport, WSIViewport, RenderingEngine, ImageVolume, Surface, getRenderingEngine, getRenderingEngines, getEnabledElement, getEnabledElementByIds, getEnabledElements, getEnabledElementByViewportId, createVolumeActor, getOrCreateCanvas, createVolumeMapper, cache, eventTarget, triggerEvent, imageLoader, registerImageLoader, volumeLoader, metaData, utilities, setVolumesForViewports, addVolumesToViewports, addImageSlicesToViewports, imageLoadPoolManager as requestPoolManager, imageRetrievalPoolManager, imageLoadPoolManager, getShouldUseCPURendering, setUseCPURendering, setPreferSizeOverAccuracy, resetUseCPURendering, geometryLoader, ProgressiveRetrieveImages, cornerstoneStreamingImageVolumeLoader, cornerstoneStreamingDynamicImageVolumeLoader, StreamingDynamicImageVolume, StreamingImageVolume, convertMapperToNotSharedMapper, };

package/dist/esm/index.js

@@ -3,7 +3,7 @@ import * as CONSTANTS from './constants';
 import { Events } from './enums';
 import RenderingEngine from './RenderingEngine';
 import createVolumeActor from './RenderingEngine/helpers/createVolumeActor';
-import createVolumeMapper from './RenderingEngine/helpers/createVolumeMapper';
+import createVolumeMapper, { convertMapperToNotSharedMapper, } from './RenderingEngine/helpers/createVolumeMapper';
 import getOrCreateCanvas from './RenderingEngine/helpers/getOrCreateCanvas';
 import VolumeViewport from './RenderingEngine/VolumeViewport';
 import VolumeViewport3D from './RenderingEngine/VolumeViewport3D';
@@ -32,4 +32,4 @@ import triggerEvent from './utilities/triggerEvent';
 import { cornerstoneStreamingImageVolumeLoader } from './loaders/cornerstoneStreamingImageVolumeLoader';
 import { cornerstoneStreamingDynamicImageVolumeLoader } from './loaders/cornerstoneStreamingDynamicImageVolumeLoader';
 import { setVolumesForViewports, addVolumesToViewports, addImageSlicesToViewports, } from './RenderingEngine/helpers';
-export { init, isCornerstoneInitialized, peerImport, resetInitialization, getConfiguration, setConfiguration, getWebWorkerManager, canRenderFloatTextures, Enums, CONSTANTS, Events as EVENTS, Settings, BaseVolumeViewport, VolumeViewport, VolumeViewport3D, Viewport, StackViewport, VideoViewport, WSIViewport, RenderingEngine, ImageVolume, Surface, getRenderingEngine, getRenderingEngines, getEnabledElement, getEnabledElementByIds, getEnabledElements, getEnabledElementByViewportId, createVolumeActor, getOrCreateCanvas, createVolumeMapper, cache, eventTarget, triggerEvent, imageLoader, registerImageLoader, volumeLoader, metaData, utilities, setVolumesForViewports, addVolumesToViewports, addImageSlicesToViewports, imageLoadPoolManager as requestPoolManager, imageRetrievalPoolManager, imageLoadPoolManager, getShouldUseCPURendering, setUseCPURendering, setPreferSizeOverAccuracy, resetUseCPURendering, geometryLoader, ProgressiveRetrieveImages, cornerstoneStreamingImageVolumeLoader, cornerstoneStreamingDynamicImageVolumeLoader, StreamingDynamicImageVolume, StreamingImageVolume, };
+export { init, isCornerstoneInitialized, peerImport, resetInitialization, getConfiguration, setConfiguration, getWebWorkerManager, canRenderFloatTextures, Enums, CONSTANTS, Events as EVENTS, Settings, BaseVolumeViewport, VolumeViewport, VolumeViewport3D, Viewport, StackViewport, VideoViewport, WSIViewport, RenderingEngine, ImageVolume, Surface, getRenderingEngine, getRenderingEngines, getEnabledElement, getEnabledElementByIds, getEnabledElements, getEnabledElementByViewportId, createVolumeActor, getOrCreateCanvas, createVolumeMapper, cache, eventTarget, triggerEvent, imageLoader, registerImageLoader, volumeLoader, metaData, utilities, setVolumesForViewports, addVolumesToViewports, addImageSlicesToViewports, imageLoadPoolManager as requestPoolManager, imageRetrievalPoolManager, imageLoadPoolManager, getShouldUseCPURendering, setUseCPURendering, setPreferSizeOverAccuracy, resetUseCPURendering, geometryLoader, ProgressiveRetrieveImages, cornerstoneStreamingImageVolumeLoader, cornerstoneStreamingDynamicImageVolumeLoader, StreamingDynamicImageVolume, StreamingImageVolume, convertMapperToNotSharedMapper, };

package/dist/esm/types/IActor.d.ts

@@ -2,6 +2,7 @@ import type vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
 import type vtkImageSlice from '@kitware/vtk.js/Rendering/Core/ImageSlice';
 import type vtkVolume from '@kitware/vtk.js/Rendering/Core/Volume';
 import type CanvasActor from '../RenderingEngine/CanvasActor';
+import type { BlendModes } from '../enums';
 export type Actor = vtkActor;
 export type VolumeActor = vtkVolume;
 export type ImageActor = vtkImageSlice;
@@ -12,5 +13,10 @@ export interface ActorEntry {
     referencedId?: string;
     slabThickness?: number;
     clippingFilter?: any;
+    blendMode?: BlendModes;
+    callbacks?: ({ volumeActor, volumeId, }: {
+        volumeActor: VolumeActor;
+        volumeId: string;
+    }) => void;
     [key: string]: unknown;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "2.9.0",
-  "description": "",
+  "version": "2.10.0",
+  "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
   "repository": "https://github.com/cornerstonejs/cornerstone3D",
@@ -82,5 +82,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "06611b57ab0630cae3487040cc3034d544d63a98"
+  "gitHead": "aab86e3f13a86bcd2d975a4cfbdf7eee7fa1627a"
 }