@cornerstonejs/adapters 0.3.0 → 0.3.2

package/dist/@cornerstonejs/adapters.es.js

@@ -3289,6 +3289,17 @@ var __assign = function () {
 
   return __assign.apply(this, arguments);
 };
+function __spreadArray(to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+}
+
+var CORNERSTONE_3D_TAG = "Cornerstone3DTools@^0.1.0";
 
 // This is a custom coding scheme defined to store some annotations from Cornerstone.
 // Note: CodeMeaning is VR type LO, which means we only actually support 64 characters
@@ -3452,7 +3463,7 @@ var MeasurementReport = /** @class */ (function () {
         // Loop through each image in the toolData
         Object.keys(toolState).forEach(function (imageId) {
             var sopCommonModule = metadataProvider.get("sopCommonModule", imageId);
-            var instance = metadataProvider.getInstance(imageId);
+            var instance = metadataProvider.get("instance", imageId);
             var sopInstanceUID = sopCommonModule.sopInstanceUID, sopClassUID = sopCommonModule.sopClassUID;
             var seriesInstanceUID = instance.SeriesInstanceUID;
             sopInstanceUIDsToSeriesInstanceUIDMap[sopInstanceUID] =
@@ -3541,12 +3552,17 @@ var MeasurementReport = /** @class */ (function () {
         // That is up to the consumer to derive from the SOPInstanceUIDs.
         return measurementData;
     };
+    /**
+     * Register a new tool type.
+     * @param toolClass to perform I/O to DICOM for this tool
+     */
     MeasurementReport.registerTool = function (toolClass) {
         MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE[toolClass.utilityToolType] = toolClass;
         MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_TOOL_TYPE[toolClass.toolType] = toolClass;
         MeasurementReport.MEASUREMENT_BY_TOOLTYPE[toolClass.toolType] =
             toolClass.utilityToolType;
     };
+    MeasurementReport.CORNERSTONE_3D_TAG = CORNERSTONE_3D_TAG;
     MeasurementReport.MEASUREMENT_BY_TOOLTYPE = {};
     MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE = {};
     MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_TOOL_TYPE = {};
@@ -3561,11 +3577,9 @@ var MeasurementReport = /** @class */ (function () {
     return MeasurementReport;
 }());
 
-var CORNERSTONE_3D_TAG = "Cornerstone3DTools@^0.1.0";
-
 var TID300Point$1 = utilities.TID300.Point;
 var ARROW_ANNOTATE = "ArrowAnnotate";
-var trackingIdentifierTextValue$8 = "".concat(CORNERSTONE_3D_TAG, ":").concat(ARROW_ANNOTATE);
+var trackingIdentifierTextValue$7 = "".concat(CORNERSTONE_3D_TAG, ":").concat(ARROW_ANNOTATE);
 var codeValues = CodingScheme.codeValues,
     CodingSchemeDesignator = CodingScheme.CodingSchemeDesignator;
 
@@ -3655,7 +3669,7 @@ var ArrowAnnotate = /*#__PURE__*/function () {
           x: pointImage[0],
           y: pointImage[1]
         }],
-        trackingIdentifierTextValue: trackingIdentifierTextValue$8,
+        trackingIdentifierTextValue: trackingIdentifierTextValue$7,
         findingSites: findingSites || []
       }; // If freetext finding isn't present, add it from the tool text.
 
@@ -3702,7 +3716,7 @@ var TID300Bidirectional = utilities.TID300.Bidirectional;
 var BIDIRECTIONAL = "Bidirectional";
 var LONG_AXIS = "Long Axis";
 var SHORT_AXIS = "Short Axis";
-var trackingIdentifierTextValue$7 = "".concat(CORNERSTONE_3D_TAG, ":").concat(BIDIRECTIONAL);
+var trackingIdentifierTextValue$6 = "".concat(CORNERSTONE_3D_TAG, ":").concat(BIDIRECTIONAL);
 var Bidirectional = /** @class */ (function () {
     function Bidirectional() {
     }
@@ -3805,7 +3819,7 @@ var Bidirectional = /** @class */ (function () {
             },
             longAxisLength: length,
             shortAxisLength: width,
-            trackingIdentifierTextValue: trackingIdentifierTextValue$7,
+            trackingIdentifierTextValue: trackingIdentifierTextValue$6,
             finding: finding,
             findingSites: findingSites || []
         };
@@ -3829,7 +3843,7 @@ MeasurementReport.registerTool(Bidirectional);
 
 var TID300CobbAngle$1 = utilities.TID300.CobbAngle;
 var MEASUREMENT_TYPE$1 = "Angle";
-var trackingIdentifierTextValue$6 = "".concat(CORNERSTONE_3D_TAG, ":").concat(MEASUREMENT_TYPE$1);
+var trackingIdentifierTextValue$5 = "".concat(CORNERSTONE_3D_TAG, ":").concat(MEASUREMENT_TYPE$1);
 var Angle = /** @class */ (function () {
     function Angle() {
     }
@@ -3889,7 +3903,7 @@ var Angle = /** @class */ (function () {
             point3: point3,
             point4: point4,
             rAngle: angle,
-            trackingIdentifierTextValue: trackingIdentifierTextValue$6,
+            trackingIdentifierTextValue: trackingIdentifierTextValue$5,
             finding: finding,
             findingSites: findingSites || []
         };
@@ -3913,7 +3927,7 @@ MeasurementReport.registerTool(Angle);
 
 var TID300CobbAngle = utilities.TID300.CobbAngle;
 var MEASUREMENT_TYPE = "CobbAngle";
-var trackingIdentifierTextValue$5 = "".concat(CORNERSTONE_3D_TAG, ":").concat(MEASUREMENT_TYPE);
+var trackingIdentifierTextValue$4 = "".concat(CORNERSTONE_3D_TAG, ":").concat(MEASUREMENT_TYPE);
 var CobbAngle = /** @class */ (function () {
     function CobbAngle() {
     }
@@ -3978,7 +3992,7 @@ var CobbAngle = /** @class */ (function () {
             point3: point3,
             point4: point4,
             rAngle: angle,
-            trackingIdentifierTextValue: trackingIdentifierTextValue$5,
+            trackingIdentifierTextValue: trackingIdentifierTextValue$4,
             finding: finding,
             findingSites: findingSites || []
         };
@@ -4000,192 +4014,151 @@ var CobbAngle = /** @class */ (function () {
 }());
 MeasurementReport.registerTool(CobbAngle);
 
+function isValidCornerstoneTrackingIdentifier(trackingIdentifier) {
+    if (!trackingIdentifier.includes(":")) {
+        return false;
+    }
+    var _a = trackingIdentifier.split(":"), cornerstone3DTag = _a[0], toolType = _a[1];
+    if (cornerstone3DTag !== CORNERSTONE_3D_TAG) {
+        return false;
+    }
+    // The following is needed since the new cornerstone3D has changed
+    // case names such as EllipticalRoi to EllipticalROI
+    return toolType.toLowerCase() === this.toolType.toLowerCase();
+}
+
 var TID300Ellipse = utilities.TID300.Ellipse;
 var ELLIPTICALROI = "EllipticalROI";
 var EPSILON = 1e-4;
-var trackingIdentifierTextValue$4 = "".concat(CORNERSTONE_3D_TAG, ":").concat(ELLIPTICALROI);
-
-var EllipticalROI = /*#__PURE__*/function () {
-  function EllipticalROI() {
-    _classCallCheck(this, EllipticalROI);
-  }
-
-  _createClass(EllipticalROI, null, [{
-    key: "getMeasurementData",
-    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
-      var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType),
-          defaultState = _MeasurementReport$ge.defaultState,
-          NUMGroup = _MeasurementReport$ge.NUMGroup,
-          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup,
-          ReferencedFrameNumber = _MeasurementReport$ge.ReferencedFrameNumber;
-
-      var referencedImageId = defaultState.annotation.metadata.referencedImageId;
-      var GraphicData = SCOORDGroup.GraphicData; // GraphicData is ordered as [majorAxisStartX, majorAxisStartY, majorAxisEndX, majorAxisEndY, minorAxisStartX, minorAxisStartY, minorAxisEndX, minorAxisEndY]
-      // But Cornerstone3D points are ordered as top, bottom, left, right for the
-      // ellipse so we need to identify if the majorAxis is horizontal or vertical
-      // in the image plane and then choose the correct points to use for the ellipse.
-
-      var pointsWorld = [];
-
-      for (var i = 0; i < GraphicData.length; i += 2) {
-        var worldPos = imageToWorldCoords(referencedImageId, [GraphicData[i], GraphicData[i + 1]]);
-        pointsWorld.push(worldPos);
-      }
-
-      var majorAxisStart = vec3.fromValues.apply(vec3, _toConsumableArray(pointsWorld[0]));
-      var majorAxisEnd = vec3.fromValues.apply(vec3, _toConsumableArray(pointsWorld[1]));
-      var minorAxisStart = vec3.fromValues.apply(vec3, _toConsumableArray(pointsWorld[2]));
-      var minorAxisEnd = vec3.fromValues.apply(vec3, _toConsumableArray(pointsWorld[3]));
-      var majorAxisVec = vec3.create();
-      vec3.sub(majorAxisVec, majorAxisEnd, majorAxisStart); // normalize majorAxisVec to avoid scaling issues
-
-      vec3.normalize(majorAxisVec, majorAxisVec);
-      var minorAxisVec = vec3.create();
-      vec3.sub(minorAxisVec, minorAxisEnd, minorAxisStart);
-      vec3.normalize(minorAxisVec, minorAxisVec);
-      var imagePlaneModule = metadata.get("imagePlaneModule", referencedImageId);
-
-      if (!imagePlaneModule) {
-        throw new Error("imageId does not have imagePlaneModule metadata");
-      }
-
-      var columnCosines = imagePlaneModule.columnCosines; // find which axis is parallel to the columnCosines
-
-      var columnCosinesVec = vec3.fromValues.apply(vec3, _toConsumableArray(columnCosines));
-      var projectedMajorAxisOnColVec = vec3.dot(columnCosinesVec, majorAxisVec);
-      var projectedMinorAxisOnColVec = vec3.dot(columnCosinesVec, minorAxisVec);
-      var absoluteOfMajorDotProduct = Math.abs(projectedMajorAxisOnColVec);
-      var absoluteOfMinorDotProduct = Math.abs(projectedMinorAxisOnColVec);
-      var ellipsePoints = [];
-
-      if (Math.abs(absoluteOfMajorDotProduct - 1) < EPSILON) {
-        ellipsePoints = [pointsWorld[0], pointsWorld[1], pointsWorld[2], pointsWorld[3]];
-      } else if (Math.abs(absoluteOfMinorDotProduct - 1) < EPSILON) {
-        ellipsePoints = [pointsWorld[2], pointsWorld[3], pointsWorld[0], pointsWorld[1]];
-      } else {
-        console.warn("OBLIQUE ELLIPSE NOT YET SUPPORTED");
-      }
-
-      var state = defaultState;
-      state.annotation.data = {
-        handles: {
-          points: _toConsumableArray(ellipsePoints),
-          activeHandleIndex: 0,
-          textBox: {
-            hasMoved: false
-          }
-        },
-        cachedStats: _defineProperty({}, "imageId:".concat(referencedImageId), {
-          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
-        }),
-        frameNumber: ReferencedFrameNumber
-      };
-      return state;
+var EllipticalROI = /** @class */ (function () {
+    function EllipticalROI() {
     }
-  }, {
-    key: "getTID300RepresentationArguments",
-    value: function getTID300RepresentationArguments(tool, worldToImageCoords) {
-      var data = tool.data,
-          finding = tool.finding,
-          findingSites = tool.findingSites,
-          metadata = tool.metadata;
-      var _data$cachedStats = data.cachedStats,
-          cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
-          handles = data.handles;
-      var referencedImageId = metadata.referencedImageId;
-
-      if (!referencedImageId) {
-        throw new Error("EllipticalROI.getTID300RepresentationArguments: referencedImageId is not defined");
-      }
-
-      var top = worldToImageCoords(referencedImageId, handles.points[0]);
-      var bottom = worldToImageCoords(referencedImageId, handles.points[1]);
-      var left = worldToImageCoords(referencedImageId, handles.points[2]);
-      var right = worldToImageCoords(referencedImageId, handles.points[3]); // find the major axis and minor axis
-
-      var topBottomLength = Math.abs(top[1] - bottom[1]);
-      var leftRightLength = Math.abs(left[0] - right[0]);
-      var points = [];
-
-      if (topBottomLength > leftRightLength) {
-        // major axis is bottom to top
-        points.push({
-          x: top[0],
-          y: top[1]
-        });
-        points.push({
-          x: bottom[0],
-          y: bottom[1]
-        }); // minor axis is left to right
-
-        points.push({
-          x: left[0],
-          y: left[1]
-        });
-        points.push({
-          x: right[0],
-          y: right[1]
-        });
-      } else {
-        // major axis is left to right
-        points.push({
-          x: left[0],
-          y: left[1]
-        });
-        points.push({
-          x: right[0],
-          y: right[1]
-        }); // minor axis is bottom to top
-
-        points.push({
-          x: top[0],
-          y: top[1]
-        });
-        points.push({
-          x: bottom[0],
-          y: bottom[1]
-        });
-      }
-
-      var _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
-          area = _ref.area;
-
-      return {
-        area: area,
-        points: points,
-        trackingIdentifierTextValue: trackingIdentifierTextValue$4,
-        finding: finding,
-        findingSites: findingSites || []
-      };
-    }
-  }]);
-
-  return EllipticalROI;
-}();
-
-EllipticalROI.toolType = ELLIPTICALROI;
-EllipticalROI.utilityToolType = ELLIPTICALROI;
-EllipticalROI.TID300Representation = TID300Ellipse;
-
-EllipticalROI.isValidCornerstoneTrackingIdentifier = function (TrackingIdentifier) {
-  if (!TrackingIdentifier.includes(":")) {
-    return false;
-  }
-
-  var _TrackingIdentifier$s = TrackingIdentifier.split(":"),
-      _TrackingIdentifier$s2 = _slicedToArray(_TrackingIdentifier$s, 2),
-      cornerstone3DTag = _TrackingIdentifier$s2[0],
-      toolType = _TrackingIdentifier$s2[1];
-
-  if (cornerstone3DTag !== CORNERSTONE_3D_TAG) {
-    return false;
-  } // The following is needed since the new cornerstone3D has changed
-  // the EllipticalRoi toolName (which was in the old cornerstone) to EllipticalROI
-
-
-  return toolType.toLowerCase() === ELLIPTICALROI.toLowerCase();
-};
-
+    EllipticalROI.getMeasurementData = function (MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
+        var _a;
+        var _b = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType), defaultState = _b.defaultState, NUMGroup = _b.NUMGroup, SCOORDGroup = _b.SCOORDGroup, ReferencedFrameNumber = _b.ReferencedFrameNumber;
+        var referencedImageId = defaultState.annotation.metadata.referencedImageId;
+        var GraphicData = SCOORDGroup.GraphicData;
+        // GraphicData is ordered as [majorAxisStartX, majorAxisStartY, majorAxisEndX, majorAxisEndY, minorAxisStartX, minorAxisStartY, minorAxisEndX, minorAxisEndY]
+        // But Cornerstone3D points are ordered as top, bottom, left, right for the
+        // ellipse so we need to identify if the majorAxis is horizontal or vertical
+        // in the image plane and then choose the correct points to use for the ellipse.
+        var pointsWorld = [];
+        for (var i = 0; i < GraphicData.length; i += 2) {
+            var worldPos = imageToWorldCoords(referencedImageId, [
+                GraphicData[i],
+                GraphicData[i + 1]
+            ]);
+            pointsWorld.push(worldPos);
+        }
+        var majorAxisStart = vec3.fromValues.apply(vec3, pointsWorld[0]);
+        var majorAxisEnd = vec3.fromValues.apply(vec3, pointsWorld[1]);
+        var minorAxisStart = vec3.fromValues.apply(vec3, pointsWorld[2]);
+        var minorAxisEnd = vec3.fromValues.apply(vec3, pointsWorld[3]);
+        var majorAxisVec = vec3.create();
+        vec3.sub(majorAxisVec, majorAxisEnd, majorAxisStart);
+        // normalize majorAxisVec to avoid scaling issues
+        vec3.normalize(majorAxisVec, majorAxisVec);
+        var minorAxisVec = vec3.create();
+        vec3.sub(minorAxisVec, minorAxisEnd, minorAxisStart);
+        vec3.normalize(minorAxisVec, minorAxisVec);
+        var imagePlaneModule = metadata.get("imagePlaneModule", referencedImageId);
+        if (!imagePlaneModule) {
+            throw new Error("imageId does not have imagePlaneModule metadata");
+        }
+        var columnCosines = imagePlaneModule.columnCosines;
+        // find which axis is parallel to the columnCosines
+        var columnCosinesVec = vec3.fromValues.apply(vec3, columnCosines);
+        var projectedMajorAxisOnColVec = vec3.dot(columnCosinesVec, majorAxisVec);
+        var projectedMinorAxisOnColVec = vec3.dot(columnCosinesVec, minorAxisVec);
+        var absoluteOfMajorDotProduct = Math.abs(projectedMajorAxisOnColVec);
+        var absoluteOfMinorDotProduct = Math.abs(projectedMinorAxisOnColVec);
+        var ellipsePoints = [];
+        if (Math.abs(absoluteOfMajorDotProduct - 1) < EPSILON) {
+            ellipsePoints = [
+                pointsWorld[0],
+                pointsWorld[1],
+                pointsWorld[2],
+                pointsWorld[3]
+            ];
+        }
+        else if (Math.abs(absoluteOfMinorDotProduct - 1) < EPSILON) {
+            ellipsePoints = [
+                pointsWorld[2],
+                pointsWorld[3],
+                pointsWorld[0],
+                pointsWorld[1]
+            ];
+        }
+        else {
+            console.warn("OBLIQUE ELLIPSE NOT YET SUPPORTED");
+        }
+        var state = defaultState;
+        state.annotation.data = {
+            handles: {
+                points: __spreadArray([], ellipsePoints, true),
+                activeHandleIndex: 0,
+                textBox: {
+                    hasMoved: false
+                }
+            },
+            cachedStats: (_a = {},
+                _a["imageId:".concat(referencedImageId)] = {
+                    area: NUMGroup
+                        ? NUMGroup.MeasuredValueSequence.NumericValue
+                        : 0
+                },
+                _a),
+            frameNumber: ReferencedFrameNumber
+        };
+        return state;
+    };
+    EllipticalROI.getTID300RepresentationArguments = function (tool, worldToImageCoords) {
+        var data = tool.data, finding = tool.finding, findingSites = tool.findingSites, metadata = tool.metadata;
+        var _a = data.cachedStats, cachedStats = _a === void 0 ? {} : _a, handles = data.handles;
+        var referencedImageId = metadata.referencedImageId;
+        if (!referencedImageId) {
+            throw new Error("EllipticalROI.getTID300RepresentationArguments: referencedImageId is not defined");
+        }
+        var top = worldToImageCoords(referencedImageId, handles.points[0]);
+        var bottom = worldToImageCoords(referencedImageId, handles.points[1]);
+        var left = worldToImageCoords(referencedImageId, handles.points[2]);
+        var right = worldToImageCoords(referencedImageId, handles.points[3]);
+        // find the major axis and minor axis
+        var topBottomLength = Math.abs(top[1] - bottom[1]);
+        var leftRightLength = Math.abs(left[0] - right[0]);
+        var points = [];
+        if (topBottomLength > leftRightLength) {
+            // major axis is bottom to top
+            points.push({ x: top[0], y: top[1] });
+            points.push({ x: bottom[0], y: bottom[1] });
+            // minor axis is left to right
+            points.push({ x: left[0], y: left[1] });
+            points.push({ x: right[0], y: right[1] });
+        }
+        else {
+            // major axis is left to right
+            points.push({ x: left[0], y: left[1] });
+            points.push({ x: right[0], y: right[1] });
+            // minor axis is bottom to top
+            points.push({ x: top[0], y: top[1] });
+            points.push({ x: bottom[0], y: bottom[1] });
+        }
+        var area = (cachedStats["imageId:".concat(referencedImageId)] || {}).area;
+        return {
+            area: area,
+            points: points,
+            trackingIdentifierTextValue: this.trackingIdentifierTextValue,
+            finding: finding,
+            findingSites: findingSites || []
+        };
+    };
+    EllipticalROI.trackingIdentifierTextValue = "".concat(CORNERSTONE_3D_TAG, ":").concat(ELLIPTICALROI);
+    EllipticalROI.toolType = ELLIPTICALROI;
+    EllipticalROI.utilityToolType = ELLIPTICALROI;
+    EllipticalROI.TID300Representation = TID300Ellipse;
+    EllipticalROI.isValidCornerstoneTrackingIdentifier = isValidCornerstoneTrackingIdentifier;
+    return EllipticalROI;
+}());
 MeasurementReport.registerTool(EllipticalROI);
 
 var TID300Polyline$1 = utilities.TID300.Polyline;
@@ -4213,8 +4186,8 @@ var RectangleROI = /** @class */ (function () {
                 points: [
                     worldCoords[0],
                     worldCoords[1],
-                    worldCoords[2],
-                    worldCoords[3]
+                    worldCoords[3],
+                    worldCoords[2]
                 ],
                 activeHandleIndex: 0,
                 textBox: {
@@ -4244,7 +4217,13 @@ var RectangleROI = /** @class */ (function () {
         });
         var area = cachedStats.area, perimeter = cachedStats.perimeter;
         return {
-            points: corners,
+            points: [
+                corners[0],
+                corners[1],
+                corners[3],
+                corners[2],
+                corners[0]
+            ],
             area: area,
             perimeter: perimeter,
             trackingIdentifierTextValue: trackingIdentifierTextValue$3,