@cornerstonejs/core 4.12.5 → 4.12.6

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

@@ -13,8 +13,10 @@ declare class WSIViewport extends Viewport {
     protected metadataDicomweb: any;
     private microscopyElement;
     protected map: any;
+    private imageURISet;
     private internalCamera;
     private viewer;
+    private annotationRemovedListener;
     private voiRange;
     private feFilter;
     private averageWhite;

package/dist/esm/RenderingEngine/WSIViewport.js

@@ -9,14 +9,18 @@ import { EPSILON } from '../constants';
 import triggerEvent from '../utilities/triggerEvent';
 import { peerImport } from '../init';
 import microscopyViewportCss from '../constants/microscopyViewportCss';
+import eventTarget from '../eventTarget';
+import imageIdToURI from '../utilities/imageIdToURI';
 let WSIUtilFunctions = null;
 const EVENT_POSTRENDER = 'postrender';
+const ANNOTATION_REMOVED = 'CORNERSTONE_TOOLS_ANNOTATION_REMOVED';
 class WSIViewport extends Viewport {
     constructor(props) {
         super({
             ...props,
             canvas: props.canvas || getOrCreateCanvas(props.element),
         });
+        this.imageURISet = new Set();
         this.internalCamera = {
             rotation: 0,
             centerIndex: [0, 0],
@@ -26,6 +30,26 @@ class WSIViewport extends Viewport {
             resolution: 1,
             zoom: 1,
         };
+        this.annotationRemovedListener = (evt) => {
+            const { detail } = evt;
+            const metadata = detail?.annotation?.metadata;
+            if (!metadata) {
+                this.postrender();
+                return;
+            }
+            const referencedImageURI = metadata.referencedImageURI ??
+                (metadata.referencedImageId
+                    ? imageIdToURI(metadata.referencedImageId)
+                    : null);
+            if (referencedImageURI && !this.hasImageURI(referencedImageURI)) {
+                return;
+            }
+            const annotationFOR = metadata.FrameOfReferenceUID ?? null;
+            if (annotationFOR && annotationFOR !== this.frameOfReferenceUID) {
+                return;
+            }
+            this.postrender();
+        };
         this.voiRange = {
             lower: 0,
             upper: 255,
@@ -127,9 +151,11 @@ class WSIViewport extends Viewport {
     }
     addEventListeners() {
         this.canvas.addEventListener(EVENTS.ELEMENT_DISABLED, this.elementDisabledHandler);
+        eventTarget.addEventListener(ANNOTATION_REMOVED, this.annotationRemovedListener);
     }
     removeEventListeners() {
         this.canvas.removeEventListener(EVENTS.ELEMENT_DISABLED, this.elementDisabledHandler);
+        eventTarget.removeEventListener(ANNOTATION_REMOVED, this.annotationRemovedListener);
     }
     elementDisabledHandler() {
         this.removeEventListeners();
@@ -138,6 +164,7 @@ class WSIViewport extends Viewport {
         const cs3dElement = this.element.firstElementChild;
         cs3dElement.removeChild(this.microscopyElement);
         this.microscopyElement = null;
+        this.imageURISet.clear();
     }
     getImageDataMetadata(imageIndex = 0) {
         const maxImage = this.metadataDicomweb.reduce((maxImage, image) => {
@@ -269,7 +296,10 @@ class WSIViewport extends Viewport {
         return imageDataReturn;
     }
     hasImageURI(imageURI) {
-        return true;
+        if (!imageURI) {
+            return false;
+        }
+        return this.imageURISet.has(imageURI);
     }
     setCamera(camera) {
         const previousCamera = this.getCamera();
@@ -358,7 +388,7 @@ class WSIViewport extends Viewport {
         const webClient = options?.webClient ||
             metaData.get(MetadataModules.WADO_WEB_CLIENT, imageIds[0]);
         if (!webClient) {
-            throw new Error(`To use setDataIds on WSI data, you must provide metaData.webClient for ${imageIds[0]}`);
+            throw new Error(`To use setDataIds on WSI data, you must provide metaData.webClient for ${imageIds[0]}.`);
         }
         return this.setWSI(imageIds, webClient);
     }
@@ -366,6 +396,7 @@ class WSIViewport extends Viewport {
         this.microscopyElement.style.background = 'black';
         this.microscopyElement.innerText = 'Loading';
         this.imageIds = imageIds;
+        this.imageURISet = new Set(imageIds.map((imageId) => imageIdToURI(imageId)));
         const DicomMicroscopyViewer = await WSIViewport.getDicomMicroscopyViewer();
         WSIUtilFunctions ||= DicomMicroscopyViewer.utils;
         this.frameOfReferenceUID = null;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.12.5";
+export declare const version = "4.12.6";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.12.5';
+export const version = '4.12.6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.12.5",
+  "version": "4.12.6",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -97,5 +97,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "97cc5eed916981c859c091556e6c4e36a139b281"
+  "gitHead": "67da5ec35cb711e4310f0f1971bd8ed090377338"
 }