@cornerstonejs/core 2.1.5 → 2.1.7

package/dist/esm/RenderingEngine/BaseVolumeViewport.js

@@ -317,6 +317,7 @@ class BaseVolumeViewport extends Viewport {
                 colormap,
                 volumeId,
             };
+            triggerEvent(this.element, Events.VOI_MODIFIED, eventDetail);
             triggerEvent(this.element, Events.COLORMAP_MODIFIED, eventDetail);
         }
     }
@@ -420,13 +421,9 @@ class BaseVolumeViewport extends Viewport {
         }
         const { volumeActor } = applicableVolumeActorInfo;
         const volumeIdToUse = applicableVolumeActorInfo.volumeId;
-        let voiRangeToUse = voiRange;
+        const voiRangeToUse = voiRange;
         if (typeof voiRangeToUse === 'undefined') {
             throw new Error('voiRangeToUse is undefined, need to implement this in the new volume model');
-            const imageData = volumeActor.getMapper().getInputData();
-            const range = imageData.getPointData().getScalars().getRange();
-            const maxVoiRange = { lower: range[0], upper: range[1] };
-            voiRangeToUse = maxVoiRange;
         }
         const { VOILUTFunction } = this.getProperties(volumeIdToUse);
         if (VOILUTFunction === VOILUTFunctionType.SAMPLED_SIGMOID) {

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

@@ -3,7 +3,7 @@ import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane';
 import type { mat4 } from 'gl-matrix';
 import ViewportStatus from '../enums/ViewportStatus';
 import ViewportType from '../enums/ViewportType';
-import type { ICamera, ActorEntry, IRenderingEngine, ViewportInputOptions, Point2, Point3, FlipDirection, DisplayArea, ViewPresentation, ViewReference, ViewportProperties } from '../types';
+import type { ICamera, ActorEntry, IRenderingEngine, ViewportInputOptions, Point2, Point3, FlipDirection, DisplayArea, ViewPresentation, ViewReference, ViewportProperties, ImageActor } from '../types';
 import type { ViewportInput, ViewReferenceSpecifier, ReferenceCompatibleOptions, ViewPresentationSelector, DataSetOptions } from '../types/IViewport';
 import type { vtkSlabCamera } from './vtkClasses/vtkSlabCamera';
 import type IImageCalibration from '../types/IImageCalibration';
@@ -72,6 +72,7 @@ declare class Viewport {
     getActors(): ActorEntry[];
     getActorUIDs(): string[];
     getActor(actorUID: string): ActorEntry;
+    getImageActor(volumeId?: string): ImageActor | null;
     getActorUIDByIndex(index: number): string;
     getActorByIndex(index: number): ActorEntry;
     setActors(actors: ActorEntry[]): void;

package/dist/esm/RenderingEngine/Viewport.js

@@ -189,6 +189,18 @@ class Viewport {
     getActor(actorUID) {
         return this._actors.get(actorUID);
     }
+    getImageActor(volumeId) {
+        const actorEntries = this.getActors();
+        let actorEntry = actorEntries[0];
+        if (volumeId) {
+            actorEntry = actorEntries.find((a) => a.referencedId === volumeId);
+        }
+        if (!actorEntry || !isImageActor(actorEntry)) {
+            return null;
+        }
+        const actor = actorEntry.actor;
+        return actor;
+    }
     getActorUIDByIndex(index) {
         const actor = this.getActors()[index];
         if (actor) {
@@ -591,11 +603,18 @@ class Viewport {
     }
     getCameraNoRotation() {
         const vtkCamera = this.getVtkActiveCamera();
+        const sanitizeVector = (vector, defaultValue) => {
+            return vector.some((v) => isNaN(v)) ? defaultValue : vector;
+        };
+        const viewUp = sanitizeVector([...vtkCamera.getViewUp()], [0, 1, 0]);
+        const viewPlaneNormal = sanitizeVector([...vtkCamera.getViewPlaneNormal()], [0, 0, -1]);
+        const position = sanitizeVector([...vtkCamera.getPosition()], [0, 0, 1]);
+        const focalPoint = sanitizeVector([...vtkCamera.getFocalPoint()], [0, 0, 0]);
         return {
-            viewUp: [...vtkCamera.getViewUp()],
-            viewPlaneNormal: [...vtkCamera.getViewPlaneNormal()],
-            position: [...vtkCamera.getPosition()],
-            focalPoint: [...vtkCamera.getFocalPoint()],
+            viewUp,
+            viewPlaneNormal,
+            position,
+            focalPoint,
             parallelProjection: vtkCamera.getParallelProjection(),
             parallelScale: vtkCamera.getParallelScale(),
             viewAngle: vtkCamera.getViewAngle(),

package/dist/esm/RenderingEngine/VolumeViewport.js

@@ -166,7 +166,7 @@ class VolumeViewport extends BaseVolumeViewport {
     setCameraClippingRange() {
         const activeCamera = this.getVtkActiveCamera();
         if (activeCamera.getParallelProjection()) {
-            activeCamera.setClippingRange(activeCamera.getDistance(), activeCamera.getDistance() + this.getSlabThickness());
+            activeCamera.setClippingRange(activeCamera.getDistance() - this.getSlabThickness(), activeCamera.getDistance() + this.getSlabThickness());
         }
         else {
             activeCamera.setClippingRange(RENDERING_DEFAULTS.MINIMUM_SLAB_THICKNESS, RENDERING_DEFAULTS.MAXIMUM_RAY_DISTANCE);

package/dist/esm/RenderingEngine/vtkClasses/vtkStreamingOpenGLTexture.js

@@ -72,6 +72,9 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
     function updateDynamicVolumeTexture() {
         const volume = cache.getVolume(model.volumeId);
         const imageIds = volume.getCurrentTimePointImageIds();
+        if (!imageIds.length) {
+            return false;
+        }
         let constructor;
         for (let i = 0; i < imageIds.length; i++) {
             const imageId = imageIds[i];

package/dist/esm/cache/classes/BaseStreamingImageVolume.d.ts

@@ -24,7 +24,7 @@ export default class BaseStreamingImageVolume extends ImageVolume implements IIm
     protected updateTextureAndTriggerEvents(imageIdIndex: any, imageId: any, imageQualityStatus?: ImageQualityStatus): void;
     successCallback(imageId: string, image: any): void;
     errorCallback(imageId: any, permanent: any, error: any): void;
-    load: (callback: (...args: unknown[]) => void) => void;
+    load(callback: (...args: unknown[]) => void): void;
     getLoaderImageOptions(imageId: string): {
         targetBuffer: {
             type: import("../../types").PixelDataTypedArrayString;

package/dist/esm/cache/classes/BaseStreamingImageVolume.js

@@ -32,38 +32,6 @@ export default class BaseStreamingImageVolume extends ImageVolume {
             };
             imageLoadPoolManager.filterRequests(filterFunction);
         };
-        this.load = (callback) => {
-            const { imageIds, loadStatus, numFrames } = this;
-            const { transferSyntaxUID } = metaData.get('transferSyntax', imageIds[0]) || {};
-            const imageRetrieveConfiguration = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, this.volumeId, transferSyntaxUID, 'volume');
-            this.imagesLoader = this.isDynamicVolume()
-                ? this
-                : imageRetrieveConfiguration
-                    ? (imageRetrieveConfiguration.create ||
-                        ProgressiveRetrieveImages.createProgressive)(imageRetrieveConfiguration)
-                    : this;
-            if (loadStatus.loading === true) {
-                return;
-            }
-            const { loaded } = this.loadStatus;
-            const totalNumFrames = imageIds.length;
-            if (loaded) {
-                if (callback) {
-                    callback({
-                        success: true,
-                        framesLoaded: totalNumFrames,
-                        framesProcessed: totalNumFrames,
-                        numFrames,
-                        totalNumFrames,
-                    });
-                }
-                return;
-            }
-            if (callback) {
-                this.loadStatus.callbacks.push(callback);
-            }
-            this._prefetchImageIds();
-        };
         this.loadStatus = streamingProperties.loadStatus;
     }
     invalidateVolume(immediate) {
@@ -190,6 +158,38 @@ export default class BaseStreamingImageVolume extends ImageVolume {
         };
         triggerEvent(eventTarget, Events.IMAGE_LOAD_ERROR, eventDetail);
     }
+    load(callback) {
+        const { imageIds, loadStatus, numFrames } = this;
+        const { transferSyntaxUID } = metaData.get('transferSyntax', imageIds[0]) || {};
+        const imageRetrieveConfiguration = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, this.volumeId, transferSyntaxUID, 'volume');
+        this.imagesLoader = this.isDynamicVolume()
+            ? this
+            : imageRetrieveConfiguration
+                ? (imageRetrieveConfiguration.create ||
+                    ProgressiveRetrieveImages.createProgressive)(imageRetrieveConfiguration)
+                : this;
+        if (loadStatus.loading === true) {
+            return;
+        }
+        const { loaded } = this.loadStatus;
+        const totalNumFrames = imageIds.length;
+        if (loaded) {
+            if (callback) {
+                callback({
+                    success: true,
+                    framesLoaded: totalNumFrames,
+                    framesProcessed: totalNumFrames,
+                    numFrames,
+                    totalNumFrames,
+                });
+            }
+            return;
+        }
+        if (callback) {
+            this.loadStatus.callbacks.push(callback);
+        }
+        this._prefetchImageIds();
+    }
     getLoaderImageOptions(imageId) {
         const { transferSyntaxUID: transferSyntaxUID } = metaData.get('transferSyntax', imageId) || {};
         const imagePlaneModule = metaData.get('imagePlaneModule', imageId) || {};

package/dist/esm/cache/classes/ImageVolume.d.ts

@@ -49,6 +49,7 @@ export declare class ImageVolume {
     getImageIdIndex(imageId: string): number;
     getImageIdByIndex(imageIdIndex: number): string;
     getImageURIIndex(imageURI: string): number;
+    load(callback: (...args: unknown[]) => void): void;
     destroy(): void;
     invalidate(): void;
     modified(): void;

package/dist/esm/cache/classes/ImageVolume.js

@@ -97,6 +97,8 @@ export class ImageVolume {
     getImageURIIndex(imageURI) {
         return this._imageURIsIndexMap.get(imageURI);
     }
+    load(callback) {
+    }
     destroy() {
         this.imageData.delete();
         this.imageData = null;

package/dist/esm/loaders/cornerstoneStreamingImageVolumeLoader.js

@@ -3,6 +3,7 @@ import { RequestType } from '../enums';
 import imageLoadPoolManager from '../requestPool/imageLoadPoolManager';
 import { generateVolumePropsFromImageIds } from '../utilities';
 import { loadImage } from './imageLoader';
+import { registerUnknownVolumeLoader } from './volumeLoader';
 function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
     if (!options || !options.imageIds || !options.imageIds.length) {
         throw new Error('ImageIds must be provided to create a streaming image volume');
@@ -70,4 +71,5 @@ function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
         },
     };
 }
+registerUnknownVolumeLoader(cornerstoneStreamingImageVolumeLoader);
 export { cornerstoneStreamingImageVolumeLoader };

package/dist/esm/loaders/index.js

@@ -3,5 +3,4 @@ import { cornerstoneStreamingDynamicImageVolumeLoader } from './cornerstoneStrea
 import * as geometryLoader from './geometryLoader';
 import * as imageLoader from './imageLoader';
 import * as volumeLoader from './volumeLoader';
-volumeLoader.registerUnknownVolumeLoader(cornerstoneStreamingImageVolumeLoader);
 export { cornerstoneStreamingImageVolumeLoader, cornerstoneStreamingDynamicImageVolumeLoader, geometryLoader, imageLoader, volumeLoader, };

package/dist/esm/utilities/VoxelManager.js

@@ -417,7 +417,8 @@ export default class VoxelManager {
             });
         };
         voxelManager.getRange = () => {
-            let minValue, maxValue;
+            let minValue = Infinity;
+            let maxValue = -Infinity;
             for (const imageId of imageIds) {
                 const image = cache.getImage(imageId);
                 if (image.minPixelValue < minValue) {
@@ -529,36 +530,36 @@ export default class VoxelManager {
                 numberOfComponents,
             });
         });
-        const voxelManager = new VoxelManager(dimensions, (index) => voxelGroups[timePoint - 1]._get(index), (index, v) => voxelGroups[timePoint - 1]._set(index, v));
+        const voxelManager = new VoxelManager(dimensions, (index) => voxelGroups[timePoint]._get(index), (index, v) => voxelGroups[timePoint]._set(index, v));
         voxelManager.numberOfComponents = numberOfComponents;
         voxelManager.getScalarDataLength = () => {
-            return voxelGroups[timePoint - 1].getScalarDataLength();
+            return voxelGroups[timePoint].getScalarDataLength();
         };
         voxelManager.getConstructor = () => {
-            return voxelGroups[timePoint - 1].getConstructor();
+            return voxelGroups[timePoint].getConstructor();
         };
         voxelManager.getRange = () => {
-            return voxelGroups[timePoint - 1].getRange();
+            return voxelGroups[timePoint].getRange();
         };
         voxelManager.getMiddleSliceData = () => {
-            return voxelGroups[timePoint - 1].getMiddleSliceData();
+            return voxelGroups[timePoint].getMiddleSliceData();
         };
         voxelManager.setTimePoint = (newTimePoint) => {
             timePoint = newTimePoint;
-            voxelManager._get = (index) => voxelGroups[timePoint - 1]._get(index);
-            voxelManager._set = (index, v) => voxelGroups[timePoint - 1]._set(index, v);
+            voxelManager._get = (index) => voxelGroups[timePoint]._get(index);
+            voxelManager._set = (index, v) => voxelGroups[timePoint]._set(index, v);
         };
         voxelManager.getAtIndexAndTimePoint = (index, tp) => {
-            return voxelGroups[tp - 1]._get(index);
+            return voxelGroups[tp]._get(index);
         };
         voxelManager.getTimePointScalarData = (tp) => {
-            return voxelGroups[tp - 1].getCompleteScalarDataArray();
+            return voxelGroups[tp].getCompleteScalarDataArray();
         };
         voxelManager.getTimePointScalarData = (tp) => {
-            return voxelGroups[tp - 1].getCompleteScalarDataArray();
+            return voxelGroups[tp].getCompleteScalarDataArray();
         };
         voxelManager.getCurrentTimePointScalarData = () => {
-            return voxelGroups[timePoint - 1].getCompleteScalarDataArray();
+            return voxelGroups[timePoint].getCompleteScalarDataArray();
         };
         return voxelManager;
     }

package/dist/esm/utilities/eventListener/TargetEventListeners.js

@@ -80,7 +80,7 @@ class TargetEventListeners {
         this._target.addEventListener(type, callback, options);
     }
     _removeEventListener(type, callback, options) {
-        const useCapture = options.capture ?? false;
+        const useCapture = options?.capture ?? false;
         const listenerPhase = useCapture
             ? EventListenerPhases.Capture
             : EventListenerPhases.Bubble;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -84,5 +84,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "0d41c41af381224b181100e98bd0a0d55e9d149b"
+  "gitHead": "079eb63faace4c72556559fc1ce272c2a9a910ca"
 }