dcmjs 0.22.1 → 0.22.2

package/build/dcmjs.es.js

@@ -13476,7 +13476,7 @@ function findReferenceSourceImageId(multiframe, frameSegment, imageIds, metadata
   if (imageId === undefined && ReferencedSeriesSequence) {
     var referencedSeriesSequence = Array.isArray(ReferencedSeriesSequence) ? ReferencedSeriesSequence[0] : ReferencedSeriesSequence;
     var ReferencedSeriesInstanceUID = referencedSeriesSequence.SeriesInstanceUID;
-    imageId = getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfReferenceUID, PerFrameFunctionalGroup, imageIds, tolerance);
+    imageId = getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfReferenceUID, PerFrameFunctionalGroup, imageIds, metadataProvider, tolerance);
   }
 
   return imageId;
@@ -13511,7 +13511,6 @@ function checkSEGsOverlapping(pixelData, multiframe, imageIds, validOrientations
   var frameSegmentsMapping = new Map();
 
   var _loop3 = function _loop3(frameSegment) {
-    var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[frameSegment];
     var segmentIndex = getSegmentIndex(multiframe, frameSegment);
 
     if (segmentIndex === undefined) {
@@ -13649,7 +13648,7 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
         return "continue";
       }
 
-      var sourceImageMetadata = cornerstone.metaData.get("instance", imageId);
+      var sourceImageMetadata = metadataProvider.get("instance", imageId);
 
       if (Rows !== sourceImageMetadata.Rows || Columns !== sourceImageMetadata.Columns) {
         throw new Error("Individual SEG frames have different geometry dimensions (Rows and Columns) " + "respect to the source image reference frame. This is not yet supported. " + "Aborting segmentation loading. ");
@@ -13756,7 +13755,7 @@ function insertPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray, labelmapBu
       return "continue";
     }
 
-    var sourceImageMetadata = cornerstone.metaData.get("instance", imageId);
+    var sourceImageMetadata = metadataProvider.get("instance", imageId);
 
     if (Rows !== sourceImageMetadata.Rows || Columns !== sourceImageMetadata.Columns) {
       throw new Error("Individual SEG frames have different geometry dimensions (Rows and Columns) " + "respect to the source image reference frame. This is not yet supported. " + "Aborting segmentation loading. ");
@@ -13896,19 +13895,20 @@ function getImageIdOfSourceImagebySourceImageSequence(SourceImageSequence, image
  * @param  {String}    FrameOfReferenceUID            Frame of reference.
  * @param  {Object}    PerFrameFunctionalGroup        Sequence describing segmentation reference attributes per frame.
  * @param  {String[]}  imageIds                       A list of imageIds.
+ * @param  {Object}    metadataProvider               A Cornerstone metadataProvider to query
  * @param  {Float}     tolerance                      The tolerance parameter
  *
  * @return {String}                                   The corresponding imageId.
  */
 
 
-function getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfReferenceUID, PerFrameFunctionalGroup, imageIds, tolerance) {
+function getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfReferenceUID, PerFrameFunctionalGroup, imageIds, metadataProvider, tolerance) {
   if (ReferencedSeriesInstanceUID === undefined || PerFrameFunctionalGroup.PlanePositionSequence === undefined || PerFrameFunctionalGroup.PlanePositionSequence[0] === undefined || PerFrameFunctionalGroup.PlanePositionSequence[0].ImagePositionPatient === undefined) {
     return undefined;
   }
 
   for (var imageIdsIndexc = 0; imageIdsIndexc < imageIds.length; ++imageIdsIndexc) {
-    var sourceImageMetadata = cornerstone.metaData.get("instance", imageIds[imageIdsIndexc]);
+    var sourceImageMetadata = metadataProvider.get("instance", imageIds[imageIdsIndexc]);
 
     if (sourceImageMetadata === undefined || sourceImageMetadata.ImagePositionPatient === undefined || sourceImageMetadata.FrameOfReferenceUID !== FrameOfReferenceUID || sourceImageMetadata.SeriesInstanceUID !== ReferencedSeriesInstanceUID) {
       continue;