@cornerstonejs/adapters 1.57.0 → 1.57.2

package/dist/adapters.es.js

@@ -40956,7 +40956,7 @@ class Viewport {
   getCurrentImageIdIndex() {
     throw new Error('Not implemented');
   }
-  getTargetId(specifier) {
+  getReferenceId(specifier) {
     return null;
   }
   setPan(pan, storeAsInitialCamera = false) {
@@ -41233,6 +41233,32 @@ class Viewport {
       heightWorld: maxY - minY
     };
   }
+  getViewReference(viewRefSpecifier = {}) {
+    const {
+      focalPoint: cameraFocalPoint,
+      viewPlaneNormal
+    } = this.getCamera();
+    const target = {
+      FrameOfReferenceUID: this.getFrameOfReferenceUID(),
+      cameraFocalPoint,
+      viewPlaneNormal,
+      sliceIndex: viewRefSpecifier.sliceIndex ?? this.getCurrentImageIdIndex()
+    };
+    return target;
+  }
+  isReferenceViewable(viewRef, options) {
+    if (viewRef.FrameOfReferenceUID && viewRef.FrameOfReferenceUID !== this.getFrameOfReferenceUID()) {
+      return false;
+    }
+    const {
+      viewPlaneNormal
+    } = viewRef;
+    const camera = this.getCamera();
+    if (!isEqual$2(viewPlaneNormal, camera.viewPlaneNormal) && !isEqual$2(vec3.negate(camera.viewPlaneNormal, camera.viewPlaneNormal), viewPlaneNormal)) {
+      return options?.asVolume === true;
+    }
+    return true;
+  }
   _shouldUseNativeDataType() {
     const {
       useNorm16Texture,
@@ -41713,6 +41739,32 @@ class BaseVolumeViewport extends Viewport$1 {
       this.resetToDefaultProperties(volumeId);
     }
   }
+  getViewReference(viewRefSpecifier = {}) {
+    const target = super.getViewReference(viewRefSpecifier);
+    if (viewRefSpecifier?.forFrameOfReference !== false) {
+      target.volumeId = this.getVolumeId(viewRefSpecifier);
+    }
+    return {
+      ...target,
+      sliceIndex: this.getCurrentImageIdIndex()
+    };
+  }
+  isReferenceViewable(viewRef, options) {
+    if (!super.isReferenceViewable(viewRef, options)) {
+      return false;
+    }
+    if (options?.withNavigation) {
+      return true;
+    }
+    const currentSliceIndex = this.getCurrentImageIdIndex();
+    const {
+      sliceIndex
+    } = viewRef;
+    if (Array.isArray(sliceIndex)) {
+      return sliceIndex[0] <= currentSliceIndex && currentSliceIndex <= sliceIndex[1];
+    }
+    return sliceIndex === undefined || sliceIndex === currentSliceIndex;
+  }
   setProperties({
     voiRange,
     VOILUTFunction,
@@ -42017,10 +42069,20 @@ class BaseVolumeViewport extends Viewport$1 {
     const voxelIndex = index[2] * dimensions[0] * dimensions[1] + index[1] * dimensions[0] + index[0];
     return volume.getScalarData()[voxelIndex];
   }
-  getTargetId(specifier = {}) {
+  getVolumeId(specifier) {
+    if (!specifier?.volumeId) {
+      const actorEntries = this.getActors();
+      if (!actorEntries) {
+        return;
+      }
+      return actorEntries.find(actorEntry => actorEntry.actor.getClassName() === 'vtkVolume')?.uid;
+    }
+    return specifier.volumeId;
+  }
+  getReferenceId(specifier = {}) {
     let {
       volumeId,
-      sliceIndex
+      sliceIndex: sliceIndex
     } = specifier;
     if (!volumeId) {
       const actorEntries = this.getActors();
@@ -46167,11 +46229,52 @@ class StackViewport extends Viewport$1 {
     }
     return voiLUTFunction;
   }
-  getTargetId(specifier = {}) {
+  isReferenceViewable(viewRef, options = {}) {
+    if (!super.isReferenceViewable(viewRef, options)) {
+      return false;
+    }
+    let {
+      imageURI
+    } = options;
     const {
-      sliceIndex: imageIdIndex = this.currentImageIdIndex
+      referencedImageId,
+      sliceIndex
+    } = viewRef;
+    if (viewRef.volumeId && !referencedImageId) {
+      return options.asVolume === true;
+    }
+    let testIndex = this.getCurrentImageIdIndex();
+    if (options.withNavigation && typeof sliceIndex === 'number') {
+      testIndex = sliceIndex;
+    }
+    const imageId = this.imageIds[testIndex];
+    if (!imageId) {
+      return false;
+    }
+    if (!imageURI) {
+      const colonIndex = imageId.indexOf(':');
+      imageURI = imageId.substring(colonIndex + 1);
+    }
+    return referencedImageId.endsWith(imageURI);
+  }
+  getViewReference(viewRefSpecifier = {}) {
+    const {
+      sliceIndex = this.currentImageIdIndex
+    } = viewRefSpecifier;
+    return {
+      ...super.getViewReference(viewRefSpecifier),
+      referencedImageId: `${this.imageIds[sliceIndex]}`,
+      sliceIndex: sliceIndex
+    };
+  }
+  getReferenceId(specifier = {}) {
+    const {
+      sliceIndex = this.currentImageIdIndex
     } = specifier;
-    return `imageId:${this.imageIds[imageIdIndex]}`;
+    if (Array.isArray(sliceIndex)) {
+      throw new Error('Use of slice ranges for stacks not supported');
+    }
+    return `imageId:${this.imageIds[sliceIndex]}`;
   }
   getCPUFallbackError(method) {
     return new Error(`method ${method} cannot be used during CPU Fallback mode`);
@@ -46611,6 +46714,14 @@ class VideoViewport extends Viewport$1 {
         time: this.videoElement.currentTime,
         duration: this.videoElement.duration
       });
+      triggerEvent(this.element, EVENTS.IMAGE_RENDERED, {
+        element: this.element,
+        viewportId: this.id,
+        viewport: this,
+        renderingEngineId: this.renderingEngineId,
+        time: this.videoElement.currentTime,
+        duration: this.videoElement.duration
+      });
       const frame = this.getFrameNumber();
       if (this.isPlaying) {
         if (frame < this.frameRange[0]) {
@@ -47010,16 +47121,67 @@ class VideoViewport extends Viewport$1 {
     const current = this.imageId.replace('/frames/1', this.isPlaying ? `/frames/${this.frameRange[0]}-${this.frameRange[1]}` : `/frames/${this.getFrameNumber()}`);
     return current;
   }
-  getTargetId(specifier = {}) {
+  getReferenceId(specifier = {}) {
     const {
-      sliceIndex
+      sliceIndex: sliceIndex
     } = specifier;
     if (sliceIndex === undefined) {
       return `videoId:${this.getCurrentImageId()}`;
     }
+    if (Array.isArray(sliceIndex)) {
+      return `videoId:${this.imageId.substring(0, this.imageId.length - 1)}${sliceIndex[0] + 1}-${sliceIndex[1] + 1}`;
+    }
     const baseTarget = this.imageId.replace('/frames/1', `/frames/${1 + sliceIndex}`);
     return `videoId:${baseTarget}`;
   }
+  isReferenceViewable(viewRef, options = {}) {
+    let {
+      imageURI
+    } = options;
+    const {
+      referencedImageId,
+      sliceIndex: sliceIndex
+    } = viewRef;
+    if (!super.isReferenceViewable(viewRef)) {
+      return false;
+    }
+    const imageId = this.getCurrentImageId();
+    if (!imageURI) {
+      const colonIndex = imageId.indexOf(':');
+      imageURI = imageId.substring(colonIndex + 1, imageId.length - 1);
+    }
+    if (options.withNavigation) {
+      return true;
+    }
+    const currentIndex = this.getCurrentImageIdIndex();
+    if (Array.isArray(sliceIndex)) {
+      return currentIndex >= sliceIndex[0] && currentIndex <= sliceIndex[1];
+    }
+    if (sliceIndex !== undefined) {
+      return currentIndex === sliceIndex;
+    }
+    if (!referencedImageId) {
+      return false;
+    }
+    const match = referencedImageId.match(VideoViewport.frameRangeExtractor);
+    if (!match || !match[2]) {
+      return true;
+    }
+    const range = match[2].split('-').map(it => Number(it));
+    const frame = currentIndex + 1;
+    return range[0] <= frame && frame <= (range[1] ?? range[0]);
+  }
+  getViewReference(viewRefSpecifier) {
+    let sliceIndex = viewRefSpecifier?.sliceIndex;
+    if (!sliceIndex) {
+      sliceIndex = this.isPlaying ? [this.frameRange[0] - 1, this.frameRange[1] - 1] : this.getCurrentImageIdIndex();
+    }
+    return {
+      ...super.getViewReference(viewRefSpecifier),
+      referencedImageId: this.getReferenceId(viewRefSpecifier),
+      sliceIndex: sliceIndex
+    };
+  }
   getFrameNumber() {
     return 1 + this.getCurrentImageIdIndex();
   }
@@ -49208,8 +49370,11 @@ function getInterpolationData(viewportData, filterParams = []) {
   } = viewportData;
   const interpolationDatas = new Map();
   const annotations = getAnnotations(annotation.metadata.toolName, viewport.element);
+  if (!annotations) {
+    return interpolationDatas;
+  }
   for (let i = 0; i < sliceData.numberOfSlices; i++) {
-    const imageAnnotations = annotations.filter(x => x.metadata.referencedSliceIndex === i);
+    const imageAnnotations = annotations.filter(x => x.metadata.sliceIndex === i);
     if (!imageAnnotations?.length) {
       continue;
     }
@@ -49286,6 +49451,10 @@ function findAnnotationsForInterpolation(toolData, viewportData) {
     value: viewportData.interpolationUID
   }]);
   const rangeToInterpolate = getRangeToInterpolate(interpolationData);
+  if (!rangeToInterpolate) {
+    console.warn('No annotations found to interpolate', interpolationData);
+    return;
+  }
   const sliceEdited = _getSlicePositionOfToolData(interpolationData, toolData.annotationUID);
   const interpolationList = [];
   for (let i = rangeToInterpolate[0] + 1; i < rangeToInterpolate[1]; i++) {
@@ -49584,7 +49753,10 @@ function startInterpolation(viewportData) {
   const {
     interpolationData,
     interpolationList
-  } = findAnnotationsForInterpolation(toolData, viewportData);
+  } = findAnnotationsForInterpolation(toolData, viewportData) || {};
+  if (!interpolationData || !interpolationList) {
+    return;
+  }
   const eventData = {
     toolName: toolData.metadata.toolName,
     toolType: toolData.metadata.toolName,
@@ -49641,11 +49813,11 @@ function _addInterpolatedContour(interpolated3DPoints, handlePoints, sliceIndex,
     viewport
   } = eventData;
   const interpolatedAnnotation = createPolylineToolData(points, handlePoints, referencedToolData);
-  const targetId = viewport.getTargetId({
+  const targetId = viewport.getReferenceId({
     sliceIndex
   });
   interpolatedAnnotation.metadata.referencedImageId = targetId;
-  interpolatedAnnotation.metadata.referencedSliceIndex = sliceIndex;
+  interpolatedAnnotation.metadata.sliceIndex = sliceIndex;
   addAnnotation(interpolatedAnnotation, viewport.element);
   referencedToolData.onInterpolationComplete?.(interpolatedAnnotation, referencedToolData);
 }
@@ -49657,7 +49829,7 @@ function _editInterpolatedContour(interpolated3DPoints, handlePoints, sliceIndex
   let toolDataIndex;
   for (let i = 0; i < annotations.length; i++) {
     const annotation = annotations[i];
-    if (annotation.interpolationUID === referencedToolData.interpolationUID && annotation.metadata.referencedSliceIndex === sliceIndex) {
+    if (annotation.interpolationUID === referencedToolData.interpolationUID && annotation.metadata.sliceIndex === sliceIndex) {
       toolDataIndex = i;
       break;
     }
@@ -49884,7 +50056,7 @@ function deleteRelatedAnnotations(viewportData) {
     key: 'interpolationUID',
     value: viewportData.interpolationUID
   }]);
-  const referencedSliceIndex = annotation.metadata.referencedSliceIndex;
+  const referencedSliceIndex = annotation.metadata.sliceIndex;
   let minInterpolation = -1;
   let maxInterpolation = viewportData.sliceData.numberOfSlices;
   for (const [sliceIndex, annotations] of interpolationAnnotations.entries()) {
@@ -49928,7 +50100,7 @@ function deleteRelatedAnnotations(viewportData) {
       viewport: viewportData.viewport,
       sliceData: {
         numberOfSlices: viewportData.sliceData.numberOfSlices,
-        imageIndex: nextAnnotation.metadata.referencedSliceIndex
+        imageIndex: nextAnnotation.metadata.sliceIndex
       },
       annotation: nextAnnotation,
       interpolationUID: nextAnnotation.interpolationUID
@@ -49974,7 +50146,7 @@ class InterpolationManager {
         if (segmentIndex && segmentIndex !== data.segmentation.segmentIndex) {
           continue;
         }
-        if (sliceIndex !== undefined && metadata && sliceIndex !== metadata.referencedSliceIndex) {
+        if (sliceIndex !== undefined && metadata && sliceIndex !== metadata.sliceIndex) {
           continue;
         }
         if (segmentationId && segmentationId !== data.segmentation.segmentationId) {