dcmjs 0.22.1 → 0.22.2

package/build/dcmjs.js

@@ -13482,7 +13482,7 @@ b"+i+"*=d\
 	  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;
@@ -13517,7 +13517,6 @@ b"+i+"*=d\
 	  var frameSegmentsMapping = new Map();
 
 	  var _loop3 = function _loop3(frameSegment) {
-	    var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[frameSegment];
 	    var segmentIndex = getSegmentIndex(multiframe, frameSegment);
 
 	    if (segmentIndex === undefined) {
@@ -13655,7 +13654,7 @@ b"+i+"*=d\
 	        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. ");
@@ -13762,7 +13761,7 @@ b"+i+"*=d\
 	      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. ");
@@ -13902,19 +13901,20 @@ b"+i+"*=d\
 	 * @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;