dcmjs 0.29.13 → 0.30.1

package/build/dcmjs.es.js

@@ -10005,7 +10005,7 @@ var encodingMapping = {
   "iso-2022-58": "gb2312",
   gbk: "gbk"
 };
-var encapsulatedSyntaxes = ["1.2.840.10008.1.2.4.50", "1.2.840.10008.1.2.4.51", "1.2.840.10008.1.2.4.57", "1.2.840.10008.1.2.4.70", "1.2.840.10008.1.2.4.80", "1.2.840.10008.1.2.4.81", "1.2.840.10008.1.2.4.90", "1.2.840.10008.1.2.4.91", "1.2.840.10008.1.2.4.92", "1.2.840.10008.1.2.4.93", "1.2.840.10008.1.2.4.94", "1.2.840.10008.1.2.4.95", "1.2.840.10008.1.2.5", "1.2.840.10008.1.2.6.1", "1.2.840.10008.1.2.4.100", "1.2.840.10008.1.2.4.102", "1.2.840.10008.1.2.4.103"];
+var encapsulatedSyntaxes = ["1.2.840.10008.1.2.4.50", "1.2.840.10008.1.2.4.51", "1.2.840.10008.1.2.4.57", "1.2.840.10008.1.2.4.70", "1.2.840.10008.1.2.4.80", "1.2.840.10008.1.2.4.81", "1.2.840.10008.1.2.4.90", "1.2.840.10008.1.2.4.91", "1.2.840.10008.1.2.4.92", "1.2.840.10008.1.2.4.93", "1.2.840.10008.1.2.4.94", "1.2.840.10008.1.2.4.95", "1.2.840.10008.1.2.5", "1.2.840.10008.1.2.6.1", "1.2.840.10008.1.2.4.100", "1.2.840.10008.1.2.4.102", "1.2.840.10008.1.2.4.103", "1.2.840.10008.1.2.4.201", "1.2.840.10008.1.2.4.202", "1.2.840.10008.1.2.4.203"];
 var DicomMessage = /*#__PURE__*/function () {
   function DicomMessage() {
     _classCallCheck(this, DicomMessage);
@@ -17410,13 +17410,18 @@ function generateToolState$1(imageIds, arrayBuffer, metadataProvider) {
   var imagePlaneModule = metadataProvider.get("imagePlaneModule", imageIds[0]);
   var generalSeriesModule = metadataProvider.get("generalSeriesModule", imageIds[0]);
   var SeriesInstanceUID = generalSeriesModule.seriesInstanceUID;
-  if (!imagePlaneModule) {
-    console.warn("Insufficient metadata, imagePlaneModule missing.");
-  }
-  var ImageOrientationPatient = Array.isArray(imagePlaneModule.rowCosines) ? [].concat(_toConsumableArray(imagePlaneModule.rowCosines), _toConsumableArray(imagePlaneModule.columnCosines)) : [imagePlaneModule.rowCosines.x, imagePlaneModule.rowCosines.y, imagePlaneModule.rowCosines.z, imagePlaneModule.columnCosines.x, imagePlaneModule.columnCosines.y, imagePlaneModule.columnCosines.z];
+  var ImageOrientationPatient;
+  var validOrientations;
+  var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+  if (hasCoordinateSystem) {
+    if (!imagePlaneModule) {
+      console.warn("Insufficient metadata, imagePlaneModule missing.");
+    }
+    ImageOrientationPatient = Array.isArray(imagePlaneModule.rowCosines) ? [].concat(_toConsumableArray(imagePlaneModule.rowCosines), _toConsumableArray(imagePlaneModule.columnCosines)) : [imagePlaneModule.rowCosines.x, imagePlaneModule.rowCosines.y, imagePlaneModule.rowCosines.z, imagePlaneModule.columnCosines.x, imagePlaneModule.columnCosines.y, imagePlaneModule.columnCosines.z];
 
-  // Get IOP from ref series, compute supported orientations:
-  var validOrientations = getValidOrientations(ImageOrientationPatient);
+    // Get IOP from ref series, compute supported orientations:
+    validOrientations = getValidOrientations(ImageOrientationPatient);
+  }
   var sliceLength = multiframe.Columns * multiframe.Rows;
   var segMetadata = getSegmentMetadata(multiframe, SeriesInstanceUID);
   var TransferSyntaxUID = multiframe._meta.TransferSyntaxUID.Value[0];
@@ -17434,7 +17439,12 @@ function generateToolState$1(imageIds, arrayBuffer, metadataProvider) {
       throw new Error("Fractional segmentations are not yet supported");
     }
   }
-  var orientation = checkOrientation(multiframe, validOrientations, [imagePlaneModule.rows, imagePlaneModule.columns, imageIds.length], tolerance);
+  var orientation;
+  if (hasCoordinateSystem) {
+    orientation = checkOrientation(multiframe, validOrientations, [imagePlaneModule.rows, imagePlaneModule.columns, imageIds.length], tolerance);
+  } else {
+    orientation = "Planar";
+  }
   var overlapping = false;
   if (!skipOverlapping) {
     overlapping = checkSEGsOverlapping(pixelData, multiframe, imageIds, validOrientations, metadataProvider, tolerance);
@@ -17505,9 +17515,7 @@ function findReferenceSourceImageId(multiframe, frameSegment, imageIds, metadata
     return imageId;
   }
   var frameSourceImageSequence = undefined;
-  if (SourceImageSequence && SourceImageSequence.length !== 0) {
-    frameSourceImageSequence = SourceImageSequence[frameSegment];
-  } else if (PerFrameFunctionalGroup.DerivationImageSequence) {
+  if (PerFrameFunctionalGroup.DerivationImageSequence) {
     var DerivationImageSequence = PerFrameFunctionalGroup.DerivationImageSequence;
     if (Array.isArray(DerivationImageSequence)) {
       if (DerivationImageSequence.length !== 0) {
@@ -17526,6 +17534,8 @@ function findReferenceSourceImageId(multiframe, frameSegment, imageIds, metadata
         }
       }
     }
+  } else if (SourceImageSequence && SourceImageSequence.length !== 0) {
+    frameSourceImageSequence = SourceImageSequence[frameSegment];
   }
   if (frameSourceImageSequence) {
     imageId = getImageIdOfSourceImagebySourceImageSequence(frameSourceImageSequence, imageIds, metadataProvider);
@@ -17603,9 +17613,15 @@ function checkSEGsOverlapping(pixelData, multiframe, imageIds, validOrientations
       for (var i = 0; i < role.length; ++i) {
         var _frameSegment = role[i];
         var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[_frameSegment];
-        var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
         var pixelDataI2D = ndarray$1(new Uint8Array(pixelData.buffer, _frameSegment * sliceLength, sliceLength), [Rows, Columns]);
-        var alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+        var alignedPixelDataI = void 0;
+        var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+        if (hasCoordinateSystem) {
+          var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
+          alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+        } else {
+          alignedPixelDataI = pixelDataI2D;
+        }
         if (!alignedPixelDataI) {
           console.warn("Individual SEG frames are out of plane with respect to the first SEG frame, this is not yet supported, skipping this frame.");
           continue;
@@ -17668,9 +17684,15 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
         i = _i2;
         return "continue";
       }
-      var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
       var pixelDataI2D = ndarray$1(new Uint8Array(pixelData.buffer, _i2 * sliceLength, sliceLength), [Rows, Columns]);
-      var alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+      var alignedPixelDataI = void 0;
+      var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+      if (hasCoordinateSystem) {
+        var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
+        alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+      } else {
+        alignedPixelDataI = pixelDataI2D;
+      }
       if (!alignedPixelDataI) {
         throw new Error("Individual SEG frames are out of plane with respect to the first SEG frame. " + "This is not yet supported. Aborting segmentation loading.");
       }
@@ -17680,8 +17702,8 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
         i = _i2;
         return "continue";
       }
-      var sourceImageMetadata = metadataProvider.get("instance", imageId);
-      if (Rows !== sourceImageMetadata.Rows || Columns !== sourceImageMetadata.Columns) {
+      var sourceImageMetadata = metadataProvider.get("imagePixelModule", 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. ");
       }
       var imageIdIndex = imageIds.findIndex(function (element) {
@@ -17751,9 +17773,15 @@ function insertPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray, labelmapBu
   var sliceLength = Columns * Rows;
   var _loop5 = function _loop5(groupsLen, _i3) {
     var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[_i3];
-    var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
     var pixelDataI2D = ndarray$1(new Uint8Array(pixelData.buffer, _i3 * sliceLength, sliceLength), [Rows, Columns]);
-    var alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+    var alignedPixelDataI = void 0;
+    var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+    if (hasCoordinateSystem) {
+      var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
+      alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+    } else {
+      alignedPixelDataI = pixelDataI2D;
+    }
     if (!alignedPixelDataI) {
       throw new Error("Individual SEG frames are out of plane with respect to the first SEG frame. " + "This is not yet supported. Aborting segmentation loading.");
     }
@@ -17766,8 +17794,8 @@ function insertPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray, labelmapBu
       console.warn("Image not present in stack, can't import frame : " + _i3 + ".");
       return "continue";
     }
-    var sourceImageMetadata = metadataProvider.get("instance", imageId);
-    if (Rows !== sourceImageMetadata.Rows || Columns !== sourceImageMetadata.Columns) {
+    var sourceImageMetadata = metadataProvider.get("imagePixelModule", 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. ");
     }
     var imageIdIndex = imageIds.findIndex(function (element) {