@cornerstonejs/core 1.66.4 → 1.66.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.66.4",
+  "version": "1.66.6",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "4d12d9d2ecf38805e7c9ca7e93bf36372bfe85ff"
+  "gitHead": "d60934ef8318bfae38a2e1665171540e41f9e1b4"
 }

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/utilities/getTargetVolumeAndSpacingInNormalDir.ts

@@ -3,6 +3,7 @@ import { EPSILON } from '../constants';
 import { ICamera, IImageVolume, IVolumeViewport, Point3 } from '../types';
 import getSpacingInNormalDirection from './getSpacingInNormalDirection';
 import { getVolumeLoaderSchemes } from '../loaders/volumeLoader';
+import { getVolumeId } from './getVolumeId';
 
 // One EPSILON part larger multiplier
 const EPSILON_PART = 1 + EPSILON;
@@ -20,15 +21,14 @@ const isPrimaryVolume = (volume): boolean =>
 
 /**
  * Given a volume viewport and camera, find the target volume.
- * The imageVolume is retrieved from cache for the specified targetVolumeId or
+ * The imageVolume is retrieved from cache for the specified targetId or
  * in case it is not provided, it chooses the volumeId on the viewport (there
  * might be more than one in case of fusion) that has the finest resolution in the
  * direction of view (normal).
  *
  * @param viewport - volume viewport
  * @param camera - current camera
- * @param targetVolumeId - If a target volumeId is given that volume
- * is forced to be used.
+ * @param targetId - If a targetId is forced to be used.
  * @param useSlabThickness - If true, the number of steps will be calculated
  * based on the slab thickness instead of the spacing in the normal direction
  * @returns An object containing the imageVolume and spacingInNormalDirection.
@@ -37,7 +37,7 @@ const isPrimaryVolume = (volume): boolean =>
 export default function getTargetVolumeAndSpacingInNormalDir(
   viewport: IVolumeViewport,
   camera: ICamera,
-  targetVolumeId?: string,
+  targetId?: string,
   useSlabThickness = false
 ): {
   imageVolume: IImageVolume;
@@ -65,9 +65,10 @@ export default function getTargetVolumeAndSpacingInNormalDir(
     .filter((iv) => !!iv);
 
   // If a volumeId is defined, set that volume as the target
-  if (targetVolumeId) {
-    const imageVolumeIndex = imageVolumes.findIndex(
-      (iv) => iv.volumeId === targetVolumeId
+  if (targetId) {
+    const targetVolumeId = getVolumeId(targetId);
+    const imageVolumeIndex = imageVolumes.findIndex((iv) =>
+      targetVolumeId.includes(iv.volumeId)
     );
 
     const imageVolume = imageVolumes[imageVolumeIndex];

package/src/utilities/getVolumeId.ts

@@ -0,0 +1,16 @@
+/**
+ * Retrieves the volume ID from a target ID. Target Id is not only
+ * volumeId but might include other information, but it starts with volumeId.
+ *
+ * @param targetId - The target ID from which to extract the volume ID.
+ * @returns The volume ID extracted from the target ID.
+ */
+export const getVolumeId = (targetId: string) => {
+  const prefix = 'volumeId:';
+  const str = targetId.includes(prefix)
+    ? targetId.substring(prefix.length)
+    : targetId;
+
+  const index = str.indexOf('?');
+  return index === -1 ? str : str.substring(0, index);
+};

package/src/utilities/index.ts

@@ -70,6 +70,7 @@ import roundNumber, { roundToPrecision } from './roundNumber';
 import convertToGrayscale from './convertToGrayscale';
 import getViewportImageIds from './getViewportImageIds';
 import { getRandomSampleFromArray } from './getRandomSampleFromArray';
+import { getVolumeId } from './getVolumeId';
 
 // name spaces
 import * as planar from './planar';
@@ -158,4 +159,5 @@ export {
   roundToPrecision,
   getViewportImageIds,
   getRandomSampleFromArray,
+  getVolumeId,
 };