dcmjs 0.18.11 → 0.19.0

package/build/dcmjs.es.js

@@ -7134,6 +7134,27 @@ var graphicTypeEquals = function graphicTypeEquals(graphicType) {
   };
 };
 
+var FINDING = {
+  CodingSchemeDesignator: "DCM",
+  CodeValue: "121071"
+};
+var FINDING_SITE = {
+  CodingSchemeDesignator: "SCT",
+  CodeValue: "363698007"
+};
+var FINDING_SITE_OLD = {
+  CodingSchemeDesignator: "SRT",
+  CodeValue: "G-C0E3"
+};
+
+var codeValueMatch = function codeValueMatch(group, code, oldCode) {
+  var ConceptNameCodeSequence = group.ConceptNameCodeSequence;
+  if (!ConceptNameCodeSequence) return;
+  var CodingSchemeDesignator = ConceptNameCodeSequence.CodingSchemeDesignator,
+      CodeValue = ConceptNameCodeSequence.CodeValue;
+  return CodingSchemeDesignator == code.CodingSchemeDesignator && CodeValue == code.CodeValue || oldCode && CodingSchemeDesignator == oldCode.CodingSchemeDesignator && CodeValue == oldCode.CodeValue;
+};
+
 function getTID300ContentItem(tool, toolType, ReferencedSOPSequence, toolClass) {
   var args = toolClass.getTID300RepresentationArguments(tool);
   args.ReferencedSOPSequence = ReferencedSOPSequence;
@@ -7165,6 +7186,57 @@ function () {
   }
 
   _createClass(MeasurementReport, null, [{
+    key: "getSetupMeasurementData",
+    value: function getSetupMeasurementData(MeasurementGroup) {
+      var ContentSequence = MeasurementGroup.ContentSequence;
+      var contentSequenceArr = toArray(ContentSequence);
+      var findingGroup = contentSequenceArr.find(function (group) {
+        return codeValueMatch(group, FINDING);
+      });
+      var findingSiteGroups = contentSequenceArr.filter(function (group) {
+        return codeValueMatch(group, FINDING_SITE, FINDING_SITE_OLD);
+      }) || [];
+      var NUMGroup = contentSequenceArr.find(function (group) {
+        return group.ValueType === "NUM";
+      });
+      var SCOORDGroup = toArray(NUMGroup.ContentSequence).find(function (group) {
+        return group.ValueType === "SCOORD";
+      });
+      var ReferencedSOPSequence = SCOORDGroup.ContentSequence.ReferencedSOPSequence;
+      var ReferencedSOPInstanceUID = ReferencedSOPSequence.ReferencedSOPInstanceUID,
+          ReferencedFrameNumber = ReferencedSOPSequence.ReferencedFrameNumber;
+      var defaultState = {
+        sopInstanceUid: ReferencedSOPInstanceUID,
+        frameIndex: ReferencedFrameNumber || 1,
+        complete: true,
+        finding: findingGroup ? findingGroup.ConceptCodeSequence : undefined,
+        findingSites: findingSiteGroups.map(function (fsg) {
+          return _objectSpread2({}, fsg.ConceptCodeSequence);
+        })
+      };
+
+      if (defaultState.finding) {
+        defaultState.description = defaultState.finding.CodeMeaning;
+      }
+
+      var findingSite = defaultState.findingSites && defaultState.findingSites[0];
+
+      if (findingSite) {
+        defaultState.location = findingSite[0] && findingSite[0].CodeMeaning || findingSite.CodeMeaning;
+      }
+
+      return {
+        defaultState: defaultState,
+        findingGroup: findingGroup,
+        findingSiteGroups: findingSiteGroups,
+        NUMGroup: NUMGroup,
+        SCOORDGroup: SCOORDGroup,
+        ReferencedSOPSequence: ReferencedSOPSequence,
+        ReferencedSOPInstanceUID: ReferencedSOPInstanceUID,
+        ReferencedFrameNumber: ReferencedFrameNumber
+      };
+    }
+  }, {
     key: "generateReport",
     value: function generateReport(toolState, metadataProvider, options) {
       // ToolState for array of imageIDs to a Report
@@ -7409,8 +7481,8 @@ function () {
           RelationshipType: "CONTAINS",
           ValueType: "CODE",
           ConceptNameCodeSequence: {
-            CodeValue: "G-C0E3",
-            CodingSchemeDesignator: "SRT",
+            CodeValue: "363698007",
+            CodingSchemeDesignator: "SCT",
             CodeMeaning: "Finding Site"
           },
           ConceptCodeSequence: {
@@ -7486,8 +7558,6 @@ function (_TID300Measurement) {
 var CORNERSTONE_4_TAG = "cornerstoneTools@^4.0.0";
 
 var LENGTH = "Length";
-var FINDING = "121071";
-var FINDING_SITE = "G-C0E3";
 
 var Length$1 =
 /*#__PURE__*/
@@ -7500,25 +7570,12 @@ function () {
   _createClass(Length, null, [{
     key: "getMeasurementData",
     value: function getMeasurementData(MeasurementGroup) {
-      var ContentSequence = MeasurementGroup.ContentSequence;
-      var findingGroup = toArray(ContentSequence).find(function (group) {
-        return group.ConceptNameCodeSequence.CodeValue === FINDING;
-      });
-      var findingSiteGroups = toArray(ContentSequence).filter(function (group) {
-        return group.ConceptNameCodeSequence.CodeValue === FINDING_SITE;
-      });
-      var NUMGroup = toArray(ContentSequence).find(function (group) {
-        return group.ValueType === "NUM";
-      });
-      var SCOORDGroup = toArray(NUMGroup.ContentSequence).find(function (group) {
-        return group.ValueType === "SCOORD";
-      });
-      var ReferencedSOPSequence = SCOORDGroup.ContentSequence.ReferencedSOPSequence;
-      var ReferencedSOPInstanceUID = ReferencedSOPSequence.ReferencedSOPInstanceUID,
-          ReferencedFrameNumber = ReferencedSOPSequence.ReferencedFrameNumber;
-      var lengthState = {
-        sopInstanceUid: ReferencedSOPInstanceUID,
-        frameIndex: ReferencedFrameNumber || 1,
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          NUMGroup = _MeasurementReport$ge.NUMGroup,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+
+      var state = _objectSpread2({}, defaultState, {
         length: NUMGroup.MeasuredValueSequence.NumericValue,
         toolType: Length.toolType,
         handles: {
@@ -7531,20 +7588,16 @@ function () {
             allowedOutsideImage: true,
             hasBoundingBox: true
           }
-        },
-        finding: findingGroup ? findingGroup.ConceptCodeSequence : undefined,
-        findingSites: findingSiteGroups.map(function (fsg) {
-          return _objectSpread2({}, fsg.ConceptCodeSequence);
-        })
-      };
+        }
+      });
 
       var _SCOORDGroup$GraphicD = _slicedToArray(SCOORDGroup.GraphicData, 4);
 
-      lengthState.handles.start.x = _SCOORDGroup$GraphicD[0];
-      lengthState.handles.start.y = _SCOORDGroup$GraphicD[1];
-      lengthState.handles.end.x = _SCOORDGroup$GraphicD[2];
-      lengthState.handles.end.y = _SCOORDGroup$GraphicD[3];
-      return lengthState;
+      state.handles.start.x = _SCOORDGroup$GraphicD[0];
+      state.handles.start.y = _SCOORDGroup$GraphicD[1];
+      state.handles.end.x = _SCOORDGroup$GraphicD[2];
+      state.handles.end.y = _SCOORDGroup$GraphicD[3];
+      return state;
     }
   }, {
     key: "getTID300RepresentationArguments",
@@ -7604,11 +7657,11 @@ MeasurementReport.registerTool(Length$1);
 function expandPoints(points) {
   var allPoints = [];
   points.forEach(function (point) {
-    allPoints.push(point[0]);
-    allPoints.push(point[1]);
+    allPoints.push(point[0] || point.x);
+    allPoints.push(point[1] || point.y);
 
-    if (point[2] !== undefined) {
-      allPoints.push(point[2]);
+    if (point[2] !== undefined || point.z !== undefined) {
+      allPoints.push(point[2] || point.z);
     }
   });
   return allPoints;
@@ -7630,24 +7683,20 @@ function (_TID300Measurement) {
     value: function contentItem() {
       var _this$props = this.props,
           points = _this$props.points,
+          area = _this$props.area,
           ReferencedSOPSequence = _this$props.ReferencedSOPSequence,
           _this$props$use3DSpat = _this$props.use3DSpatialCoordinates,
-          use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat; // 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 perimeter = {};
+          use3DSpatialCoordinates = _this$props$use3DSpat === void 0 ? false : _this$props$use3DSpat,
+          perimeter = _this$props.perimeter;
       var GraphicData = expandPoints(points); // TODO: Add Mean and STDev value of (modality?) pixels
 
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
         ConceptNameCodeSequence: {
-          CodeValue: "G-A197",
-          CodingSchemeDesignator: "SRT",
-          CodeMeaning: "Perimeter" // TODO: Look this up from a Code Meaning dictionary
-
+          CodeValue: "131191004",
+          CodingSchemeDesignator: "SCT",
+          CodeMeaning: "Perimeter"
         },
         MeasuredValueSequence: {
           MeasurementUnitsCodeSequence: {
@@ -7686,7 +7735,7 @@ function (_TID300Measurement) {
             CodingSchemeVersion: "1.4",
             CodeMeaning: "SquareMilliMeter"
           },
-          NumericValue: perimeter
+          NumericValue: area
         },
         ContentSequence: {
           RelationshipType: "INFERRED FROM",
@@ -7706,59 +7755,100 @@ function (_TID300Measurement) {
   return Polyline;
 }(TID300Measurement);
 
-var Freehand =
+var FreehandRoi =
 /*#__PURE__*/
 function () {
-  function Freehand() {
-    _classCallCheck(this, Freehand);
+  function FreehandRoi() {
+    _classCallCheck(this, FreehandRoi);
   }
 
-  _createClass(Freehand, null, [{
-    key: "measurementContentToLengthState",
-    value: function measurementContentToLengthState(groupItemContent) {
-      var content = groupItemContent.ContentSequence;
-      var ReferencedSOPSequence = content.ContentSequence.ReferencedSOPSequence;
-      var ReferencedSOPInstanceUID = ReferencedSOPSequence.ReferencedSOPInstanceUID,
-          ReferencedFrameNumber = ReferencedSOPSequence.ReferencedFrameNumber;
-      var state = {
-        sopInstanceUid: ReferencedSOPInstanceUID,
-        frameIndex: ReferencedFrameNumber || 0,
-        toolType: Freehand.toolType
-      }; // TODO: To be implemented!
-      // Needs to add points, lengths
+  _createClass(FreehandRoi, null, [{
+    key: "getMeasurementData",
+    value: function getMeasurementData(MeasurementGroup) {
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
 
-      return state;
-    } // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
+      var state = _objectSpread2({}, defaultState, {
+        toolType: FreehandRoi.toolType,
+        handles: {
+          points: [],
+          textBox: {
+            active: false,
+            hasMoved: false,
+            movesIndependently: false,
+            drawnIndependently: true,
+            allowedOutsideImage: true,
+            hasBoundingBox: true
+          }
+        },
+        color: undefined,
+        invalidated: true
+      });
 
-  }, {
-    key: "getMeasurementData",
-    value: function getMeasurementData(measurementContent) {
-      return measurementContent.map(Freehand.measurementContentToLengthState);
+      var GraphicData = SCOORDGroup.GraphicData;
+
+      for (var i = 0; i < GraphicData.length; i += 2) {
+        state.handles.points.push({
+          x: GraphicData[i],
+          y: GraphicData[i + 1]
+        });
+      }
+
+      return state;
     }
   }, {
     key: "getTID300RepresentationArguments",
     value: function getTID300RepresentationArguments()
     /*tool*/
     {
-      // TO BE IMPLEMENTED
+      var _tool = tool,
+          handles = _tool.handles,
+          finding = _tool.finding,
+          findingSites = _tool.findingSites,
+          cachedStats = _tool.cachedStats;
+      var points = handles.points;
+      var _cachedStats$area = cachedStats.area,
+          area = _cachedStats$area === void 0 ? 0 : _cachedStats$area,
+          _cachedStats$perimete = cachedStats.perimeter,
+          perimeter = _cachedStats$perimete === void 0 ? 0 : _cachedStats$perimete;
+      var trackingIdentifierTextValue = "cornerstoneTools@^4.0.0:FreehandRoi";
       return {
-        /*points, lengths*/
+        points: points,
+        area: area,
+        perimeter: perimeter,
+        trackingIdentifierTextValue: trackingIdentifierTextValue,
+        finding: finding,
+        findingSites: findingSites || []
       };
     }
   }]);
 
-  return Freehand;
+  return FreehandRoi;
 }();
 
-Freehand.toolType = "Freehand";
-Freehand.utilityToolType = "Freehand";
-Freehand.TID300Representation = Polyline;
+FreehandRoi.toolType = "FreehandRoi";
+FreehandRoi.utilityToolType = "FreehandRoi";
+FreehandRoi.TID300Representation = Polyline;
 
-Freehand.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
-  return false; // TODO
+FreehandRoi.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
+  if (!TrackingIdentifier.includes(":")) {
+    return false;
+  }
+
+  var _TrackingIdentifier$s = TrackingIdentifier.split(":"),
+      _TrackingIdentifier$s2 = _slicedToArray(_TrackingIdentifier$s, 2),
+      cornerstone4Tag = _TrackingIdentifier$s2[0],
+      toolType = _TrackingIdentifier$s2[1];
+
+  if (cornerstone4Tag !== CORNERSTONE_4_TAG) {
+    return false;
+  }
+
+  return toolType === FreehandRoi.toolType;
 };
 
-MeasurementReport.registerTool(Freehand);
+MeasurementReport.registerTool(FreehandRoi);
 
 var Bidirectional =
 /*#__PURE__*/
@@ -8083,8 +8173,6 @@ function (_TID300Measurement) {
 }(TID300Measurement);
 
 var ELLIPTICALROI = "EllipticalRoi";
-var FINDING$2 = "121071";
-var FINDING_SITE$2 = "G-C0E3";
 
 var EllipticalRoi =
 /*#__PURE__*/
@@ -8097,19 +8185,11 @@ function () {
   _createClass(EllipticalRoi, null, [{
     key: "getMeasurementData",
     value: function getMeasurementData(MeasurementGroup) {
-      var ContentSequence = MeasurementGroup.ContentSequence;
-      var findingGroup = toArray(ContentSequence).find(function (group) {
-        return group.ConceptNameCodeSequence.CodeValue === FINDING$2;
-      });
-      var findingSiteGroups = toArray(ContentSequence).filter(function (group) {
-        return group.ConceptNameCodeSequence.CodeValue === FINDING_SITE$2;
-      });
-      var NUMGroup = toArray(ContentSequence).find(function (group) {
-        return group.ValueType === "NUM";
-      });
-      var SCOORDGroup = toArray(NUMGroup.ContentSequence).find(function (group) {
-        return group.ValueType === "SCOORD";
-      });
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          NUMGroup = _MeasurementReport$ge.NUMGroup,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+
       var GraphicData = SCOORDGroup.GraphicData;
       var majorAxis = [{
         x: GraphicData[0],
@@ -8142,12 +8222,8 @@ function () {
         x: majorAxis[1].x - minorAxisDirection.x * halfMinorAxisLength,
         y: majorAxis[1].y - minorAxisDirection.y * halfMinorAxisLength
       };
-      var ReferencedSOPSequence = SCOORDGroup.ContentSequence.ReferencedSOPSequence;
-      var ReferencedSOPInstanceUID = ReferencedSOPSequence.ReferencedSOPInstanceUID,
-          ReferencedFrameNumber = ReferencedSOPSequence.ReferencedFrameNumber;
-      var state = {
-        sopInstanceUid: ReferencedSOPInstanceUID,
-        frameIndex: ReferencedFrameNumber || 0,
+
+      var state = _objectSpread2({}, defaultState, {
         toolType: EllipticalRoi.toolType,
         active: false,
         cachedStats: {
@@ -8176,12 +8252,9 @@ function () {
           }
         },
         invalidated: true,
-        visible: true,
-        finding: findingGroup ? findingGroup.ConceptCodeSequence : undefined,
-        findingSites: findingSiteGroups.map(function (fsg) {
-          return _objectSpread2({}, fsg.ConceptCodeSequence);
-        })
-      };
+        visible: true
+      });
+
       return state;
     }
   }, {
@@ -8300,7 +8373,14 @@ function (_TID300Measurement) {
           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];
+      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);
+      }
+
       return this.getMeasurement([{
         RelationshipType: "CONTAINS",
         ValueType: "NUM",
@@ -8329,8 +8409,6 @@ function (_TID300Measurement) {
 }(TID300Measurement);
 
 var ARROW_ANNOTATE = "ArrowAnnotate";
-var FINDING$3 = "121071";
-var FINDING_SITE$3 = "G-C0E3";
 var CORNERSTONEFREETEXT = "CORNERSTONEFREETEXT";
 
 var ArrowAnnotate =
@@ -8338,33 +8416,20 @@ var ArrowAnnotate =
 function () {
   function ArrowAnnotate() {
     _classCallCheck(this, ArrowAnnotate);
-  } // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
-
+  }
 
   _createClass(ArrowAnnotate, null, [{
     key: "getMeasurementData",
     value: function getMeasurementData(MeasurementGroup) {
-      var ContentSequence = MeasurementGroup.ContentSequence;
-      var NUMGroup = toArray(ContentSequence).find(function (group) {
-        return group.ValueType === "NUM";
-      });
-      var SCOORDGroup = toArray(NUMGroup.ContentSequence).find(function (group) {
-        return group.ValueType === "SCOORD";
-      });
-      var findingGroup = toArray(ContentSequence).find(function (group) {
-        return group.ConceptNameCodeSequence.CodeValue === FINDING$3;
-      });
-      var findingSiteGroups = toArray(ContentSequence).filter(function (group) {
-        return group.ConceptNameCodeSequence.CodeValue === FINDING_SITE$3;
-      });
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup,
+          findingGroup = _MeasurementReport$ge.findingGroup;
+
       var text = findingGroup.ConceptCodeSequence.CodeMeaning;
       var GraphicData = SCOORDGroup.GraphicData;
-      var ReferencedSOPSequence = SCOORDGroup.ContentSequence.ReferencedSOPSequence;
-      var ReferencedSOPInstanceUID = ReferencedSOPSequence.ReferencedSOPInstanceUID,
-          ReferencedFrameNumber = ReferencedSOPSequence.ReferencedFrameNumber;
-      var state = {
-        sopInstanceUid: ReferencedSOPInstanceUID,
-        frameIndex: ReferencedFrameNumber || 0,
+
+      var state = _objectSpread2({}, defaultState, {
         toolType: ArrowAnnotate.toolType,
         active: false,
         handles: {
@@ -8374,11 +8439,11 @@ function () {
             highlight: true,
             active: false
           },
-          // TODO: How do we choose where the end goes?
-          // Just put it pointing from the bottom right for now?
+          // Use a generic offset if the stored data doesn't have the endpoint, otherwise
+          // use the actual endpoint.
           end: {
-            x: GraphicData[0] + 20,
-            y: GraphicData[1] + 20,
+            x: GraphicData.length == 4 ? GraphicData[2] : GraphicData[0] + 20,
+            y: GraphicData.length == 4 ? GraphicData[3] : GraphicData[1] + 20,
             highlight: true,
             active: false
           },
@@ -8392,18 +8457,15 @@ function () {
         },
         invalidated: true,
         text: text,
-        visible: true,
-        finding: findingGroup ? findingGroup.ConceptCodeSequence : undefined,
-        findingSites: findingSiteGroups.map(function (fsg) {
-          return _objectSpread2({}, fsg.ConceptCodeSequence);
-        })
-      };
+        visible: true
+      });
+
       return state;
     }
   }, {
     key: "getTID300RepresentationArguments",
     value: function getTID300RepresentationArguments(tool) {
-      var points = [tool.handles.start];
+      var points = [tool.handles.start, tool.handles.end];
       var finding = tool.finding,
           findingSites = tool.findingSites;
       var TID300RepresentationArguments = {
@@ -13032,14 +13094,384 @@ function fillSegmentation$1(segmentation, inputLabelmaps3D) {
   console.warn("No generateSegmentation adapater for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
 }
 
+var CobbAngle =
+/*#__PURE__*/
+function (_TID300Measurement) {
+  _inherits(CobbAngle, _TID300Measurement);
+
+  function CobbAngle() {
+    _classCallCheck(this, CobbAngle);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(CobbAngle).apply(this, arguments));
+  }
+
+  _createClass(CobbAngle, [{
+    key: "contentItem",
+    value: function contentItem() {
+      var _this$props = this.props,
+          point1 = _this$props.point1,
+          point2 = _this$props.point2,
+          point3 = _this$props.point3,
+          point4 = _this$props.point4,
+          rAngle = _this$props.rAngle,
+          ReferencedSOPSequence = _this$props.ReferencedSOPSequence;
+      return this.getMeasurement([{
+        RelationshipType: "CONTAINS",
+        ValueType: "NUM",
+        ConceptNameCodeSequence: {
+          CodeValue: "285285000",
+          CodingSchemeDesignator: "SCT",
+          CodeMeaning: "Cobb angle"
+        },
+        MeasuredValueSequence: {
+          MeasurementUnitsCodeSequence: {
+            CodeValue: "deg",
+            CodingSchemeDesignator: "UCUM",
+            CodingSchemeVersion: "1.4",
+            CodeMeaning: "\xB0"
+          },
+          NumericValue: rAngle
+        },
+        ContentSequence: {
+          RelationshipType: "INFERRED FROM",
+          ValueType: "SCOORD",
+          GraphicType: "POLYLINE",
+          GraphicData: [point1.x, point1.y, point2.x, point2.y, point3.x, point3.y, point4.x, point4.y],
+          ContentSequence: {
+            RelationshipType: "SELECTED FROM",
+            ValueType: "IMAGE",
+            ReferencedSOPSequence: ReferencedSOPSequence
+          }
+        }
+      }]);
+    }
+  }]);
+
+  return CobbAngle;
+}(TID300Measurement);
+
+var COBB_ANGLE = "CobbAngle";
+
+var CobbAngle$1 =
+/*#__PURE__*/
+function () {
+  function CobbAngle() {
+    _classCallCheck(this, CobbAngle);
+  } // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
+
+
+  _createClass(CobbAngle, null, [{
+    key: "getMeasurementData",
+    value: function getMeasurementData(MeasurementGroup) {
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          NUMGroup = _MeasurementReport$ge.NUMGroup,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+
+      var state = _objectSpread2({}, defaultState, {
+        rAngle: NUMGroup.MeasuredValueSequence.NumericValue,
+        toolType: CobbAngle.toolType,
+        handles: {
+          start: {},
+          end: {},
+          start2: {
+            highlight: true,
+            drawnIndependently: true
+          },
+          end2: {
+            highlight: true,
+            drawnIndependently: true
+          },
+          textBox: {
+            hasMoved: false,
+            movesIndependently: false,
+            drawnIndependently: true,
+            allowedOutsideImage: true,
+            hasBoundingBox: true
+          }
+        }
+      });
+
+      var _SCOORDGroup$GraphicD = _slicedToArray(SCOORDGroup.GraphicData, 8);
+
+      state.handles.start.x = _SCOORDGroup$GraphicD[0];
+      state.handles.start.y = _SCOORDGroup$GraphicD[1];
+      state.handles.end.x = _SCOORDGroup$GraphicD[2];
+      state.handles.end.y = _SCOORDGroup$GraphicD[3];
+      state.handles.start2.x = _SCOORDGroup$GraphicD[4];
+      state.handles.start2.y = _SCOORDGroup$GraphicD[5];
+      state.handles.end2.x = _SCOORDGroup$GraphicD[6];
+      state.handles.end2.y = _SCOORDGroup$GraphicD[7];
+      return state;
+    }
+  }, {
+    key: "getTID300RepresentationArguments",
+    value: function getTID300RepresentationArguments(tool) {
+      var handles = tool.handles,
+          finding = tool.finding,
+          findingSites = tool.findingSites;
+      var point1 = handles.start;
+      var point2 = handles.end;
+      var point3 = handles.start2;
+      var point4 = handles.end2;
+      var rAngle = tool.rAngle;
+      var trackingIdentifierTextValue = "cornerstoneTools@^4.0.0:CobbAngle";
+      return {
+        point1: point1,
+        point2: point2,
+        point3: point3,
+        point4: point4,
+        rAngle: rAngle,
+        trackingIdentifierTextValue: trackingIdentifierTextValue,
+        finding: finding,
+        findingSites: findingSites || []
+      };
+    }
+  }]);
+
+  return CobbAngle;
+}();
+
+CobbAngle$1.toolType = COBB_ANGLE;
+CobbAngle$1.utilityToolType = COBB_ANGLE;
+CobbAngle$1.TID300Representation = CobbAngle;
+
+CobbAngle$1.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
+  if (!TrackingIdentifier.includes(":")) {
+    return false;
+  }
+
+  var _TrackingIdentifier$s = TrackingIdentifier.split(":"),
+      _TrackingIdentifier$s2 = _slicedToArray(_TrackingIdentifier$s, 2),
+      cornerstone4Tag = _TrackingIdentifier$s2[0],
+      toolType = _TrackingIdentifier$s2[1];
+
+  if (cornerstone4Tag !== CORNERSTONE_4_TAG) {
+    return false;
+  }
+
+  return toolType === COBB_ANGLE;
+};
+
+MeasurementReport.registerTool(CobbAngle$1);
+
+var ANGLE = "Angle";
+
+var Angle =
+/*#__PURE__*/
+function () {
+  function Angle() {
+    _classCallCheck(this, Angle);
+  }
+  /**
+   * Generate TID300 measurement data for a plane angle measurement - use a CobbAngle, but label it as Angle
+   * @param  MeasurementGroup
+   * @returns
+   */
+
+
+  _createClass(Angle, null, [{
+    key: "getMeasurementData",
+    value: function getMeasurementData(MeasurementGroup) {
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          NUMGroup = _MeasurementReport$ge.NUMGroup,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+
+      var state = _objectSpread2({}, defaultState, {
+        rAngle: NUMGroup.MeasuredValueSequence.NumericValue,
+        toolType: Angle.toolType,
+        handles: {
+          start: {},
+          middle: {},
+          end: {},
+          textBox: {
+            hasMoved: false,
+            movesIndependently: false,
+            drawnIndependently: true,
+            allowedOutsideImage: true,
+            hasBoundingBox: true
+          }
+        }
+      });
+
+      var _SCOORDGroup$GraphicD = _slicedToArray(SCOORDGroup.GraphicData, 8);
+
+      state.handles.start.x = _SCOORDGroup$GraphicD[0];
+      state.handles.start.y = _SCOORDGroup$GraphicD[1];
+      state.handles.middle.x = _SCOORDGroup$GraphicD[2];
+      state.handles.middle.y = _SCOORDGroup$GraphicD[3];
+      state.handles.middle.x = _SCOORDGroup$GraphicD[4];
+      state.handles.middle.y = _SCOORDGroup$GraphicD[5];
+      state.handles.end.x = _SCOORDGroup$GraphicD[6];
+      state.handles.end.y = _SCOORDGroup$GraphicD[7];
+      return state;
+    }
+  }, {
+    key: "getTID300RepresentationArguments",
+    value: function getTID300RepresentationArguments(tool) {
+      var handles = tool.handles,
+          finding = tool.finding,
+          findingSites = tool.findingSites;
+      var point1 = handles.start;
+      var point2 = handles.middle;
+      var point3 = handles.middle;
+      var point4 = handles.end;
+      var rAngle = tool.rAngle;
+      var trackingIdentifierTextValue = "cornerstoneTools@^4.0.0:Angle";
+      return {
+        point1: point1,
+        point2: point2,
+        point3: point3,
+        point4: point4,
+        rAngle: rAngle,
+        trackingIdentifierTextValue: trackingIdentifierTextValue,
+        finding: finding,
+        findingSites: findingSites || []
+      };
+    }
+  }]);
+
+  return Angle;
+}();
+
+Angle.toolType = ANGLE;
+Angle.utilityToolType = ANGLE;
+Angle.TID300Representation = CobbAngle;
+
+Angle.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
+  if (!TrackingIdentifier.includes(":")) {
+    return false;
+  }
+
+  var _TrackingIdentifier$s = TrackingIdentifier.split(":"),
+      _TrackingIdentifier$s2 = _slicedToArray(_TrackingIdentifier$s, 2),
+      cornerstone4Tag = _TrackingIdentifier$s2[0],
+      toolType = _TrackingIdentifier$s2[1];
+
+  if (cornerstone4Tag !== CORNERSTONE_4_TAG) {
+    return false;
+  }
+
+  return toolType === ANGLE;
+};
+
+MeasurementReport.registerTool(Angle);
+
+var RectangleRoi =
+/*#__PURE__*/
+function () {
+  function RectangleRoi() {
+    _classCallCheck(this, RectangleRoi);
+  }
+
+  _createClass(RectangleRoi, null, [{
+    key: "getMeasurementData",
+    value: function getMeasurementData(MeasurementGroup) {
+      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
+          defaultState = _MeasurementReport$ge.defaultState,
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+
+      var state = _objectSpread2({}, defaultState, {
+        toolType: RectangleRoi.toolType,
+        handles: {
+          start: {},
+          end: {},
+          textBox: {
+            active: false,
+            hasMoved: false,
+            movesIndependently: false,
+            drawnIndependently: true,
+            allowedOutsideImage: true,
+            hasBoundingBox: true
+          },
+          initialRotation: 0
+        },
+        color: undefined,
+        invalidated: true
+      });
+
+      var intermediate = {};
+
+      var _SCOORDGroup$GraphicD = _slicedToArray(SCOORDGroup.GraphicData, 6);
+
+      state.handles.start.x = _SCOORDGroup$GraphicD[0];
+      state.handles.start.y = _SCOORDGroup$GraphicD[1];
+      intermediate.x = _SCOORDGroup$GraphicD[2];
+      intermediate.y = _SCOORDGroup$GraphicD[3];
+      state.handles.end.x = _SCOORDGroup$GraphicD[4];
+      state.handles.end.y = _SCOORDGroup$GraphicD[5];
+      return state;
+    }
+  }, {
+    key: "getTID300RepresentationArguments",
+    value: function getTID300RepresentationArguments(tool) {
+      var finding = tool.finding,
+          findingSites = tool.findingSites,
+          cachedStats = tool.cachedStats,
+          handles = tool.handles;
+      console.log("getTID300 Rectangle", tool, cachedStats, handles);
+      var start = handles.start,
+          end = handles.end;
+      var points = [start, {
+        x: start.x,
+        y: end.y
+      }, end, {
+        x: end.x,
+        y: start.y
+      }];
+      var area = cachedStats.area,
+          perimeter = cachedStats.perimeter;
+      console.log("Point=", points, "cachedStats=", cachedStats);
+      var trackingIdentifierTextValue = "cornerstoneTools@^4.0.0:RectangleRoi";
+      return {
+        points: points,
+        area: area,
+        perimeter: perimeter,
+        trackingIdentifierTextValue: trackingIdentifierTextValue,
+        finding: finding,
+        findingSites: findingSites || []
+      };
+    }
+  }]);
+
+  return RectangleRoi;
+}();
+
+RectangleRoi.toolType = "RectangleRoi";
+RectangleRoi.utilityToolType = "RectangleRoi";
+RectangleRoi.TID300Representation = Polyline;
+
+RectangleRoi.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
+  if (!TrackingIdentifier.includes(":")) {
+    return false;
+  }
+
+  var _TrackingIdentifier$s = TrackingIdentifier.split(":"),
+      _TrackingIdentifier$s2 = _slicedToArray(_TrackingIdentifier$s, 2),
+      cornerstone4Tag = _TrackingIdentifier$s2[0],
+      toolType = _TrackingIdentifier$s2[1];
+
+  if (cornerstone4Tag !== CORNERSTONE_4_TAG) {
+    return false;
+  }
+
+  return toolType === RectangleRoi.toolType;
+};
+
+MeasurementReport.registerTool(RectangleRoi);
+
 var Cornerstone = {
   Length: Length$1,
-  Freehand: Freehand,
+  FreehandRoi: FreehandRoi,
   Bidirectional: Bidirectional$1,
   EllipticalRoi: EllipticalRoi,
   ArrowAnnotate: ArrowAnnotate,
   MeasurementReport: MeasurementReport,
-  Segmentation: Segmentation$3
+  Segmentation: Segmentation$3,
+  CobbAngle: CobbAngle$1,
+  Angle: Angle,
+  RectangleRoi: RectangleRoi
 };
 
 // Should we move it to Colors.js
@@ -13964,6 +14396,7 @@ var TID1500 = {
 var TID300 = {
   TID300Measurement: TID300Measurement,
   Length: Length,
+  CobbAngle: CobbAngle,
   Bidirectional: Bidirectional,
   Polyline: Polyline,
   Ellipse: Ellipse