@cornerstonejs/core 1.66.3 → 1.66.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.66.3",
+  "version": "1.66.5",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "5dcb513f1cf32f85739c47416879eb4fe1a0afc4"
+  "gitHead": "23c01d5231da3a5283a0d042e4eb5abac3aed44e"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -863,7 +863,9 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
     const colormapsVTK = vtkColorMaps.rgbPresetNames.map((presetName) =>
       vtkColorMaps.getPresetByName(presetName)
     );
-    const colormapsCS3D = getColormapNames().map((colormapName) => getColormap(colormapName));
+    const colormapsCS3D = getColormapNames().map((colormapName) =>
+      getColormap(colormapName)
+    );
     const colormaps = colormapsVTK.concat(colormapsCS3D);
     const matchedColormap = colormaps.find((colormap) => {
       const { RGBPoints: presetRGBPoints } = colormap;
@@ -1563,7 +1565,8 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
 
     sliceIndex ??= this.getCurrentImageIdIndex();
     const { viewPlaneNormal, focalPoint } = this.getCamera();
-    return `volumeId:${volumeId}?sliceIndex=${sliceIndex}&viewPlaneNormal=${viewPlaneNormal.join(
+    const querySeparator = volumeId.indexOf('?') > -1 ? '&' : '?';
+    return `volumeId:${volumeId}${querySeparator}sliceIndex=${sliceIndex}&viewPlaneNormal=${viewPlaneNormal.join(
       ','
     )}&focalPoint=${focalPoint.join(',')}`;
   }

package/src/RenderingEngine/VolumeViewport.ts

@@ -356,7 +356,13 @@ class VolumeViewport extends BaseVolumeViewport {
   public getCurrentImageIdIndex = (volumeId?: string): number => {
     const { viewPlaneNormal, focalPoint } = this.getCamera();
 
-    const { origin, direction, spacing } = this.getImageData(volumeId);
+    const imageData = this.getImageData(volumeId);
+
+    if (!imageData) {
+      return;
+    }
+
+    const { origin, direction, spacing } = imageData;
 
     const spacingInNormal = getSpacingInNormalDirection(
       { direction, spacing },

package/src/getEnabledElement.ts

@@ -86,6 +86,26 @@ export function getEnabledElementByIds(
   };
 }
 
+/**
+ * Retrieves the enabled element by the specified viewport ID. it searches
+ * through all the rendering engines to find the viewport with the specified
+ *
+ * @param viewportId - The ID of the viewport.
+ * @returns The enabled element associated with the specified viewport ID.
+ */
+export function getEnabledElementByViewportId(viewportId: string) {
+  const renderingEngines = getRenderingEngines();
+
+  for (let i = 0; i < renderingEngines.length; i++) {
+    const renderingEngine = renderingEngines[i];
+    const viewport = renderingEngine.getViewport(viewportId);
+
+    if (viewport) {
+      return getEnabledElementByIds(viewportId, renderingEngine.id);
+    }
+  }
+}
+
 /**
  * Get all the enabled elements from all the rendering engines
  * @returns An array of enabled elements.

package/src/index.ts

@@ -25,6 +25,7 @@ import imageLoadPoolManager from './requestPool/imageLoadPoolManager';
 
 import getEnabledElement, {
   getEnabledElementByIds,
+  getEnabledElementByViewportId,
   getEnabledElements,
 } from './getEnabledElement';
 import * as metaData from './metaData';
@@ -110,6 +111,7 @@ export {
   getEnabledElement,
   getEnabledElementByIds,
   getEnabledElements,
+  getEnabledElementByViewportId,
   createVolumeActor,
   getOrCreateCanvas,
   createVolumeMapper,

package/src/loaders/volumeLoader.ts

@@ -284,7 +284,6 @@ export async function createAndCacheDerivedVolume(
   options: DerivedVolumeOptions
 ): Promise<IImageVolume> {
   const referencedVolume = cache.getVolume(referencedVolumeId);
-
   if (!referencedVolume) {
     throw new Error(
       `Cannot created derived volume: Referenced volume with id ${referencedVolumeId} does not exist.`
@@ -333,6 +332,7 @@ export async function createAndCacheDerivedVolume(
     scalarData: volumeScalarData,
     sizeInBytes: numBytes,
     imageIds: [],
+    referencedVolumeId,
   });
 
   const volumeLoadObject = {

package/src/utilities/getTargetVolumeAndSpacingInNormalDir.ts

@@ -66,8 +66,8 @@ export default function getTargetVolumeAndSpacingInNormalDir(
 
   // If a volumeId is defined, set that volume as the target
   if (targetVolumeId) {
-    const imageVolumeIndex = imageVolumes.findIndex(
-      (iv) => iv.volumeId === targetVolumeId
+    const imageVolumeIndex = imageVolumes.findIndex((iv) =>
+      iv.volumeId.includes(targetVolumeId)
     );
 
     const imageVolume = imageVolumes[imageVolumeIndex];