@cornerstonejs/adapters 3.7.14 → 3.7.16

package/dist/esm/adapters/Cornerstone/Segmentation_4X.js

@@ -51,7 +51,7 @@ const generateSegmentationDefaultOptions = {
  */
 function generateSegmentation(images, inputLabelmaps3D) {
   let userOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const isMultiframe = images[0].imageId.includes("?frame");
+  const isMultiframe = isMultiframeImage(images[0]);
   const segmentation = _createSegFromImages(images, isMultiframe, userOptions);
   return fillSegmentation(segmentation, inputLabelmaps3D, userOptions);
 }
@@ -893,14 +893,36 @@ function getImageIdOfSourceImageBySourceImageSequence(SourceImageSequence, sopUI
     ReferencedSOPInstanceUID,
     ReferencedFrameNumber
   } = SourceImageSequence;
-  const imageId = sopUIDImageIdIndexMap[ReferencedSOPInstanceUID];
-  if (imageId) {
-    return imageId;
+  const baseImageId = sopUIDImageIdIndexMap[ReferencedSOPInstanceUID];
+  if (!baseImageId) {
+    console.warn(`No imageId found for SOPInstanceUID: ${ReferencedSOPInstanceUID}`);
+    return undefined;
   }
-  if (ReferencedFrameNumber) {
-    return getImageIdOfReferencedFrame(ReferencedSOPInstanceUID, ReferencedFrameNumber, sopUIDImageIdIndexMap);
+  if (ReferencedFrameNumber !== undefined) {
+    if (baseImageId.includes("frames/")) {
+      return baseImageId.replace(/frames\/\d+/, `frames/${ReferencedFrameNumber}`);
+    } else if (baseImageId.includes("frame=")) {
+      return baseImageId.replace(/frame=\d+/, `frame=${ReferencedFrameNumber - 1}`);
+    } else {
+      if (baseImageId.includes("wadors:")) {
+        return `${baseImageId}/frames/${ReferencedFrameNumber}`;
+      } else {
+        return `${baseImageId}?frame=${ReferencedFrameNumber - 1}`;
+      }
+    }
   }
-  return undefined;
+  return baseImageId;
+}
+
+/**
+ * Determines if an image is a multiframe image based on its metadata.
+ *
+ * @param {Object} imageMetadata - The metadata object for the image
+ * @param {number} [imageMetadata.NumberOfFrames] - The number of frames in the image
+ * @returns {boolean} True if the image is a multiframe image (NumberOfFrames > 1)
+ */
+function isMultiframeImage(imageMetadata) {
+  return imageMetadata && imageMetadata.NumberOfFrames > 1;
 }
 
 /**
@@ -916,37 +938,31 @@ function getImageIdOfSourceImageBySourceImageSequence(SourceImageSequence, sopUI
  * @return {String}                                   The corresponding imageId.
  */
 function getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfReferenceUID, PerFrameFunctionalGroup, imageIds, metadataProvider, tolerance) {
-  if (ReferencedSeriesInstanceUID === undefined || PerFrameFunctionalGroup.PlanePositionSequence === undefined || PerFrameFunctionalGroup.PlanePositionSequence[0] === undefined || PerFrameFunctionalGroup.PlanePositionSequence[0].ImagePositionPatient === undefined) {
+  if (!ReferencedSeriesInstanceUID || !PerFrameFunctionalGroup.PlanePositionSequence?.[0]?.ImagePositionPatient) {
     return undefined;
   }
-  for (let imageIdsIndexc = 0; imageIdsIndexc < imageIds.length; ++imageIdsIndexc) {
-    const sourceImageMetadata = metadataProvider.get("instance", imageIds[imageIdsIndexc]);
-    if (sourceImageMetadata === undefined || sourceImageMetadata.ImagePositionPatient === undefined || sourceImageMetadata.FrameOfReferenceUID !== FrameOfReferenceUID || sourceImageMetadata.SeriesInstanceUID !== ReferencedSeriesInstanceUID) {
+  const segFramePosition = PerFrameFunctionalGroup.PlanePositionSequence[0].ImagePositionPatient;
+  for (let imageId of imageIds) {
+    const sourceImageMetadata = metadataProvider.get("instance", imageId);
+    if (!sourceImageMetadata) {
       continue;
     }
-    if (compareArrays(PerFrameFunctionalGroup.PlanePositionSequence[0].ImagePositionPatient, sourceImageMetadata.ImagePositionPatient, tolerance)) {
-      return imageIds[imageIdsIndexc];
+    const isMultiframe = isMultiframeImage(sourceImageMetadata);
+    if (!sourceImageMetadata.ImagePositionPatient || sourceImageMetadata.FrameOfReferenceUID !== FrameOfReferenceUID || sourceImageMetadata.SeriesInstanceUID !== ReferencedSeriesInstanceUID) {
+      continue;
     }
-  }
-}
 
-/**
- * getImageIdOfReferencedFrame - Returns the imageId corresponding to the
- * specified sopInstanceUid and frameNumber for multi-frame images.
- *
- * @param  {String} sopInstanceUid   The sopInstanceUid of the desired image.
- * @param  {Number} frameNumber      The frame number.
- * @param  {String} imageIds         The list of imageIds.
- * @param  {Object} sopUIDImageIdIndexMap A map of SOPInstanceUIDs to imageIds.
- * @return {String}                  The imageId that corresponds to the sopInstanceUid.
- */
-function getImageIdOfReferencedFrame(sopInstanceUid, frameNumber, sopUIDImageIdIndexMap) {
-  const imageId = sopUIDImageIdIndexMap[sopInstanceUid];
-  if (!imageId) {
-    return;
+    // For multiframe images, check each frame's position
+    if (isMultiframe) {
+      const framePosition = metadataProvider.get("imagePlaneModule", imageId)?.imagePositionPatient;
+      if (framePosition && compareArrays(segFramePosition, framePosition, tolerance)) {
+        return imageId;
+      }
+    } else if (compareArrays(segFramePosition, sourceImageMetadata.ImagePositionPatient, tolerance)) {
+      return imageId;
+    }
   }
-  const imageIdFrameNumber = Number(imageId.split("frame=")[1]);
-  return imageIdFrameNumber === frameNumber - 1 ? imageId : undefined;
+  return undefined;
 }
 
 /**
@@ -1161,4 +1177,4 @@ const Segmentation = {
   fillSegmentation
 };
 
-export { _createSegFromImages, _getLabelmapsFromReferencedFrameIndicies, alignPixelDataWithSourceData, calculateCentroid, checkSEGsOverlapping, Segmentation as default, fillSegmentation, findReferenceSourceImageId, generateSegmentation, generateToolState, getImageIdOfReferencedFrame, getImageIdOfSourceImageBySourceImageSequence, getImageIdOfSourceImagebyGeometry, getSegmentIndex, getSegmentMetadata, getUnpackedChunks, getUnpackedOffsetAndLength, getValidOrientations, insertOverlappingPixelDataPlanar, insertPixelDataPlanar, readFromUnpackedChunks, unpackPixelData };
+export { _createSegFromImages, _getLabelmapsFromReferencedFrameIndicies, alignPixelDataWithSourceData, calculateCentroid, checkSEGsOverlapping, Segmentation as default, fillSegmentation, findReferenceSourceImageId, generateSegmentation, generateToolState, getImageIdOfSourceImageBySourceImageSequence, getImageIdOfSourceImagebyGeometry, getSegmentIndex, getSegmentMetadata, getUnpackedChunks, getUnpackedOffsetAndLength, getValidOrientations, insertOverlappingPixelDataPlanar, insertPixelDataPlanar, readFromUnpackedChunks, unpackPixelData };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.7.14",
+    "version": "3.7.16",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -84,8 +84,8 @@
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.7.14",
-        "@cornerstonejs/tools": "^3.7.14"
+        "@cornerstonejs/core": "^3.7.16",
+        "@cornerstonejs/tools": "^3.7.16"
     },
-    "gitHead": "fda47121889610736faf098b995f8aa3de58ca7b"
+    "gitHead": "d1bf75eda8724e8213c0cf9f555b7d6a58504f29"
 }