@cornerstonejs/adapters 0.4.0 → 0.4.2

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

@@ -3531,21 +3531,26 @@ var MeasurementReport = /** @class */ (function () {
         });
         measurementGroups.forEach(function (measurementGroup) {
             var _a;
-            var measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
-            var TrackingIdentifierGroup = measurementGroupContentSequence.find(function (contentItem) {
-                return contentItem.ConceptNameCodeSequence.CodeMeaning ===
-                    TRACKING_IDENTIFIER;
-            });
-            var TrackingIdentifierValue = TrackingIdentifierGroup.TextValue;
-            var toolClass = ((_a = hooks === null || hooks === void 0 ? void 0 : hooks.getToolClass) === null || _a === void 0 ? void 0 : _a.call(hooks, measurementGroup, dataset, registeredToolClasses)) ||
-                registeredToolClasses.find(function (tc) {
-                    return tc.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue);
+            try {
+                var measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
+                var TrackingIdentifierGroup = measurementGroupContentSequence.find(function (contentItem) {
+                    return contentItem.ConceptNameCodeSequence.CodeMeaning ===
+                        TRACKING_IDENTIFIER;
                 });
-            if (toolClass) {
-                var measurement = toolClass.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata);
-                console.log("=== ".concat(toolClass.toolType, " ==="));
-                console.log(measurement);
-                measurementData[toolClass.toolType].push(measurement);
+                var TrackingIdentifierValue_1 = TrackingIdentifierGroup.TextValue;
+                var toolClass = ((_a = hooks === null || hooks === void 0 ? void 0 : hooks.getToolClass) === null || _a === void 0 ? void 0 : _a.call(hooks, measurementGroup, dataset, registeredToolClasses)) ||
+                    registeredToolClasses.find(function (tc) {
+                        return tc.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue_1);
+                    });
+                if (toolClass) {
+                    var measurement = toolClass.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata);
+                    console.log("=== ".concat(toolClass.toolType, " ==="));
+                    console.log(measurement);
+                    measurementData[toolClass.toolType].push(measurement);
+                }
+            }
+            catch (e) {
+                console.warn("Unable to generate tool state for", measurementGroup, e);
             }
         });
         // NOTE: There is no way of knowing the cornerstone imageIds as that could be anything.
@@ -4115,14 +4120,25 @@ var EllipticalROI = /** @class */ (function () {
     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 rotation = data.initialRotation || 0;
         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]);
+        var top, bottom, left, right;
+        // this way when it's restored we can assume the initial rotation is 0.
+        if (rotation == 90 || rotation == 270) {
+            bottom = worldToImageCoords(referencedImageId, handles.points[2]);
+            top = worldToImageCoords(referencedImageId, handles.points[3]);
+            left = worldToImageCoords(referencedImageId, handles.points[0]);
+            right = worldToImageCoords(referencedImageId, handles.points[1]);
+        }
+        else {
+            top = worldToImageCoords(referencedImageId, handles.points[0]);
+            bottom = worldToImageCoords(referencedImageId, handles.points[1]);
+            left = worldToImageCoords(referencedImageId, handles.points[2]);
+            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]);