dcmjs 0.39.0 → 0.40.0

package/build/dcmjs.es.js

@@ -12810,6 +12810,31 @@ var TID300Measurement = /*#__PURE__*/function () {
         };
       });
     }
+
+    /**
+     * Expands an array of points stored as objects into a flattened array of points
+     *
+     * @param param.points [{x: 0, y: 1}, {x: 1, y: 2}] or [{x: 0, y: 1, z: 0}, {x: 1, y: 2, z: 0}]
+     * @param param.use3DSpatialCoordinates boolean: true for 3D points and false for 2D points.
+     *
+     * @return {Array} [point1x, point1y, point2x, point2y] or [point1x, point1y, point1z, point2x, point2y, point2z]
+     */
+  }, {
+    key: "flattenPoints",
+    value: function flattenPoints(_ref) {
+      var points = _ref.points,
+        _ref$use3DSpatialCoor = _ref.use3DSpatialCoordinates,
+        use3DSpatialCoordinates = _ref$use3DSpatialCoor === void 0 ? false : _ref$use3DSpatialCoor;
+      var flattenedCoordinates = [];
+      points.forEach(function (point) {
+        flattenedCoordinates.push(point[0] || point.x);
+        flattenedCoordinates.push(point[1] || point.y);
+        if (use3DSpatialCoordinates) {
+          flattenedCoordinates.push(point[2] || point.z);
+        }
+      });
+      return flattenedCoordinates;
+    }
   }]);
   return TID300Measurement;
 }();
@@ -12872,8 +12897,15 @@ var Length$2 = /*#__PURE__*/function (_TID300Measurement) {
         point2 = _this$props.point2,
         _this$props$unit = _this$props.unit,
         unit = _this$props$unit === void 0 ? "mm" : _this$props$unit,
+        _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
+        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
         distance = _this$props.distance,
-        ReferencedSOPSequence = _this$props.ReferencedSOPSequence;
+        ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        points: [point1, point2],
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -12888,10 +12920,11 @@ var Length$2 = /*#__PURE__*/function (_TID300Measurement) {
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
-          ValueType: "SCOORD",
+          ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
-          GraphicData: [point1.x, point1.y, point2.x, point2.y],
-          ContentSequence: {
+          GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
+          ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
             ReferencedSOPSequence: ReferencedSOPSequence
@@ -12981,24 +13014,6 @@ Length$1.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
 };
 MeasurementReport$3.registerTool(Length$1);
 
-/**
- * Expand an array of points stored as objects into
- * a flattened array of points
- *
- * @param points [{x: 0, y: 1}, {x: 1, y: 2}] or [{x: 0, y: 1, z: 0}, {x: 1, y: 2, z: 0}]
- * @return {Array} [point1x, point1y, point2x, point2y] or [point1x, point1y, point1z, point2x, point2y, point2z]
- */
-function expandPoints$3(points) {
-  var allPoints = [];
-  points.forEach(function (point) {
-    allPoints.push(point[0] || point.x);
-    allPoints.push(point[1] || point.y);
-    if (point[2] !== undefined || point.z !== undefined) {
-      allPoints.push(point[2] || point.z);
-    }
-  });
-  return allPoints;
-}
 var Polyline$1 = /*#__PURE__*/function (_TID300Measurement) {
   _inherits(Polyline, _TID300Measurement);
   function Polyline() {
@@ -13018,8 +13033,12 @@ var Polyline$1 = /*#__PURE__*/function (_TID300Measurement) {
         use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
         perimeter = _this$props.perimeter,
         _this$props$unit = _this$props.unit,
-        unit = _this$props$unit === void 0 ? "mm" : _this$props$unit;
-      var GraphicData = expandPoints$3(points);
+        unit = _this$props$unit === void 0 ? "mm" : _this$props$unit,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        points: points,
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
 
       // TODO: Add Mean and STDev value of (modality?) pixels
       return this.getMeasurement([{
@@ -13039,6 +13058,7 @@ var Polyline$1 = /*#__PURE__*/function (_TID300Measurement) {
           ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
           GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
           ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
@@ -13063,6 +13083,7 @@ var Polyline$1 = /*#__PURE__*/function (_TID300Measurement) {
           ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
           GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
           ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
@@ -13173,7 +13194,18 @@ var Bidirectional$2 = /*#__PURE__*/function (_TID300Measurement) {
         longAxisLength = _this$props.longAxisLength,
         shortAxisLength = _this$props.shortAxisLength,
         unit = _this$props.unit,
-        ReferencedSOPSequence = _this$props.ReferencedSOPSequence;
+        _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
+        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
+        ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var longAxisGraphicData = this.flattenPoints({
+        points: [longAxis.point1, longAxis.point2],
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
+      var shortAxisGraphicData = this.flattenPoints({
+        points: [shortAxis.point1, shortAxis.point2],
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -13188,10 +13220,11 @@ var Bidirectional$2 = /*#__PURE__*/function (_TID300Measurement) {
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
-          ValueType: "SCOORD",
+          ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
-          GraphicData: [longAxis.point1.x, longAxis.point1.y, longAxis.point2.x, longAxis.point2.y],
-          ContentSequence: {
+          GraphicData: longAxisGraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
+          ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
             ReferencedSOPSequence: ReferencedSOPSequence
@@ -13211,10 +13244,11 @@ var Bidirectional$2 = /*#__PURE__*/function (_TID300Measurement) {
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
-          ValueType: "SCOORD",
+          ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
-          GraphicData: [shortAxis.point1.x, shortAxis.point1.y, shortAxis.point2.x, shortAxis.point2.y],
-          ContentSequence: {
+          GraphicData: shortAxisGraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
+          ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
             ReferencedSOPSequence: ReferencedSOPSequence
@@ -13388,21 +13422,6 @@ Bidirectional$1.isValidCornerstoneTrackingIdentifier = function (TrackingIdentif
 };
 MeasurementReport$3.registerTool(Bidirectional$1);
 
-/**
- * Expand an array of points stored as objects into
- * a flattened array of points
- *
- * @param points
- * @return {Array}
- */
-function expandPoints$2(points) {
-  var allPoints = [];
-  points.forEach(function (point) {
-    allPoints.push(point.x);
-    allPoints.push(point.y);
-  });
-  return allPoints;
-}
 var Ellipse$1 = /*#__PURE__*/function (_TID300Measurement) {
   _inherits(Ellipse, _TID300Measurement);
   function Ellipse() {
@@ -13414,10 +13433,16 @@ var Ellipse$1 = /*#__PURE__*/function (_TID300Measurement) {
     value: function contentItem() {
       var _this$props = this.props,
         points = _this$props.points,
+        _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
+        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
         ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
         area = _this$props.area,
-        areaUnit = _this$props.areaUnit;
-      var GraphicData = expandPoints$2(points);
+        areaUnit = _this$props.areaUnit,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        points: points,
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -13432,10 +13457,11 @@ var Ellipse$1 = /*#__PURE__*/function (_TID300Measurement) {
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
-          ValueType: "SCOORD",
+          ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "ELLIPSE",
           GraphicData: GraphicData,
-          ContentSequence: {
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
+          ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
             ReferencedSOPSequence: ReferencedSOPSequence
@@ -13619,21 +13645,6 @@ EllipticalRoi.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifie
 };
 MeasurementReport$3.registerTool(EllipticalRoi);
 
-/**
- * Expand an array of points stored as objects into
- * a flattened array of points
- *
- * @param points [{x: 0, y: 1}, {x: 1, y: 2}] or [{x: 0, y: 1, z: 0}, {x: 1, y: 2, z: 0}]
- * @return {Array} [point1x, point1y, point2x, point2y] or [point1x, point1y, point1z, point2x, point2y, point2z]
- */
-function expandPoints$1(points) {
-  var allPoints = [];
-  points.forEach(function (point) {
-    allPoints.push(point.x);
-    allPoints.push(point.y);
-  });
-  return allPoints;
-}
 var Circle$1 = /*#__PURE__*/function (_TID300Measurement) {
   _inherits(Circle, _TID300Measurement);
   function Circle() {
@@ -13653,13 +13664,17 @@ var Circle$1 = /*#__PURE__*/function (_TID300Measurement) {
         _this$props$areaUnit = _this$props.areaUnit,
         areaUnit = _this$props$areaUnit === void 0 ? "mm2" : _this$props$areaUnit,
         _this$props$unit = _this$props.unit,
-        unit = _this$props$unit === void 0 ? "mm" : _this$props$unit;
+        unit = _this$props$unit === void 0 ? "mm" : _this$props$unit,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
 
       // Combine all lengths to save the perimeter
       // @ToDO The permiter has to be implemented
       // const reducer = (accumulator, currentValue) => accumulator + currentValue;
       // const perimeter = lengths.reduce(reducer);
-      var GraphicData = expandPoints$1(points);
+      var GraphicData = this.flattenPoints({
+        points: points,
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
 
       // TODO: Add Mean and STDev value of (modality?) pixels
 
@@ -13680,6 +13695,7 @@ var Circle$1 = /*#__PURE__*/function (_TID300Measurement) {
           ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "CIRCLE",
           GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
           ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
@@ -13845,14 +13861,13 @@ var Point$1 = /*#__PURE__*/function (_TID300Measurement) {
         points = _this$props.points,
         ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
         _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
-        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat;
-      var GraphicData = use3DSpatialCoordinates ? [points[0].x, points[0].y, points[0].z] : [points[0].x, points[0].y];
-      // Allow storing another point as part of an indicator showing a single point
-      if (points.length == 2) {
-        GraphicData.push(points[1].x);
-        GraphicData.push(points[1].y);
-        if (use3DSpatialCoordinates) GraphicData.push(points[1].z);
-      }
+        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        // Allow storing another point as part of an indicator showing a single point
+        points: points.slice(0, 2),
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -13867,6 +13882,7 @@ var Point$1 = /*#__PURE__*/function (_TID300Measurement) {
           ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POINT",
           GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
           ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
@@ -17832,7 +17848,13 @@ var CobbAngle$1 = /*#__PURE__*/function (_TID300Measurement) {
         point3 = _this$props.point3,
         point4 = _this$props.point4,
         rAngle = _this$props.rAngle,
-        ReferencedSOPSequence = _this$props.ReferencedSOPSequence;
+        use3DSpatialCoordinates = _this$props.use3DSpatialCoordinates,
+        ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        points: [point1, point2, point3, point4],
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -17852,10 +17874,11 @@ var CobbAngle$1 = /*#__PURE__*/function (_TID300Measurement) {
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
-          ValueType: "SCOORD",
+          ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
-          GraphicData: [point1.x, point1.y, point2.x, point2.y, point3.x, point3.y, point4.x, point4.y],
-          ContentSequence: {
+          GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
+          ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
             ReferencedSOPSequence: ReferencedSOPSequence
@@ -20444,24 +20467,6 @@ Polyline.utilityToolType = "Polyline";
 Polyline.TID300Representation = Polyline$1;
 MeasurementReport$1.registerTool(Polyline);
 
-/**
- * Expand an array of points stored as objects into
- * a flattened array of points
- *
- * @param points [{x: 0, y: 1}, {x: 1, y: 2}] or [{x: 0, y: 1, z: 0}, {x: 1, y: 2, z: 0}]
- * @return {Array} [point1x, point1y, point2x, point2y] or [point1x, point1y, point1z, point2x, point2y, point2z]
- */
-function expandPoints(points) {
-  var allPoints = [];
-  points.forEach(function (point) {
-    allPoints.push(point[0]);
-    allPoints.push(point[1]);
-    if (point[2] !== undefined) {
-      allPoints.push(point[2]);
-    }
-  });
-  return allPoints;
-}
 var Polygon$1 = /*#__PURE__*/function (_TID300Measurement) {
   _inherits(Polygon, _TID300Measurement);
   function Polygon() {
@@ -20480,8 +20485,12 @@ var Polygon$1 = /*#__PURE__*/function (_TID300Measurement) {
         areaUnit = _this$props.areaUnit,
         ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
         _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
-        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat;
-      var GraphicData = expandPoints(points);
+        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        points: points,
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -20499,6 +20508,7 @@ var Polygon$1 = /*#__PURE__*/function (_TID300Measurement) {
           ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYGON",
           GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
           ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
@@ -20522,6 +20532,7 @@ var Polygon$1 = /*#__PURE__*/function (_TID300Measurement) {
           ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYGON",
           GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
           ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
@@ -20756,8 +20767,15 @@ var Calibration = /*#__PURE__*/function (_TID300Measurement) {
         point2 = _this$props.point2,
         _this$props$unit = _this$props.unit,
         unit = _this$props$unit === void 0 ? "mm" : _this$props$unit,
+        _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
+        use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
         distance = _this$props.distance,
-        ReferencedSOPSequence = _this$props.ReferencedSOPSequence;
+        ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
+        ReferencedFrameOfReferenceUID = _this$props.ReferencedFrameOfReferenceUID;
+      var GraphicData = this.flattenPoints({
+        points: [point1, point2],
+        use3DSpatialCoordinates: use3DSpatialCoordinates
+      });
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -20772,10 +20790,11 @@ var Calibration = /*#__PURE__*/function (_TID300Measurement) {
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
-          ValueType: "SCOORD",
+          ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
           GraphicType: "POLYLINE",
-          GraphicData: [point1.x, point1.y, point2.x, point2.y],
-          ContentSequence: {
+          GraphicData: GraphicData,
+          ReferencedFrameOfReferenceUID: use3DSpatialCoordinates ? ReferencedFrameOfReferenceUID : undefined,
+          ContentSequence: use3DSpatialCoordinates ? undefined : {
             RelationshipType: "SELECTED FROM",
             ValueType: "IMAGE",
             ReferencedSOPSequence: ReferencedSOPSequence