@cornerstonejs/core 1.82.2 → 1.82.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.82.2",
+  "version": "1.82.4",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "82b018e701d6634a5206866c6b8b22cdabc8e758"
+  "gitHead": "979c403d57223b2fbf33bf66c48612bb57990c80"
 }

package/src/RenderingEngine/VideoViewport.ts

@@ -224,7 +224,7 @@ class VideoViewport extends Viewport implements IVideoViewport {
   public setDataIds(imageIds: string[], options?: ImageSetOptions) {
     this.setVideo(
       imageIds[0],
-      (options?.viewReference?.sliceIndex as number) || 1
+      ((options?.viewReference?.sliceIndex as number) || 0) + 1
     );
   }
 

package/src/RenderingEngine/WSIViewport.ts

@@ -442,7 +442,10 @@ class WSIViewport extends Viewport implements IWSIViewport {
    * This is a wrapper for setWSI to allow generic behaviour
    */
   public setDataIds(imageIds: string[]) {
-    const webClient = metaData.get(MetadataModules.WEB_CLIENT, imageIds[0]);
+    const 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]}`
@@ -454,7 +457,7 @@ class WSIViewport extends Viewport implements IWSIViewport {
   }
 
   public async setWSI(imageIds: string[], client) {
-    this.microscopyElement.style.background = 'red';
+    this.microscopyElement.style.background = 'black';
     this.microscopyElement.innerText = 'Loading';
     this.imageIds = imageIds;
     const DicomMicroscopyViewer = await WSIViewport.getDicomMicroscopyViewer();

package/src/enums/MetadataModules.ts

@@ -28,10 +28,14 @@ enum MetadataModules {
   ULTRASOUND_ENHANCED_REGION = 'ultrasoundEnhancedRegionModule',
   VOI_LUT = 'voiLutModule',
   /**
-   * Some modules need direct access to a web client.  This allows getting
-   * it as metadata in order to get it generically.
+   * Some modules need direct access to a data services (WADO) web client.
+   * This allows getting images and metadata as raw results for display.
+   * This is DICOMweb WADO, not base WADO, and should support:
+   *    * Series level metadata retrieve
+   *    * Bulkdata retrieve
+   *    * Image retrieve
    */
-  WEB_CLIENT = 'webClient',
+  WADO_WEB_CLIENT = 'wadoWebClient',
 }
 
 export default MetadataModules;

package/src/utilities/genericMetadataProvider.ts

@@ -6,20 +6,33 @@ let state: Record<string, any> = {}; // Calibrated pixel spacing per imageId
  */
 const metadataProvider = {
   /**
-   * Adds metadata for an imageId.
+   * Adds a cloned copy of the metadata for an imageId as the given type.
+   * Note that this will strip out any functions or other non-cloneables.
+   *
    * @param imageId - the imageId for the metadata to store
    * @param payload - the payload
    */
-  add: (imageId: string, payload: any): void => {
+  add: (imageId: string, payload: { metadata: any; type: string }): void => {
+    metadataProvider.addRaw(imageId, {
+      ...payload,
+      metadata: structuredClone(payload.metadata),
+    });
+  },
+
+  /**
+   * Adds a raw metadata instances for an imageId.  This allows preserving
+   * class inheritance values and member functions/proxy instances, but runs
+   * the risk that the raw object can be modified through side affects.
+   */
+  addRaw: (imageId: string, payload: { metadata: any; type: string }) => {
     const type = payload.type;
 
     if (!state[imageId]) {
       state[imageId] = {};
     }
 
-    // Use the raw metadata, or create a deep copy of payload.metadata
-    state[imageId][type] =
-      payload.rawMetadata ?? structuredClone(payload.metadata);
+    // Use the raw metadata here
+    state[imageId][type] = payload.metadata;
   },
 
   /**