@cornerstonejs/adapters 1.67.1 → 1.68.1

package/dist/adapters.es.js

@@ -2657,8 +2657,8 @@ function _generateToolState() {
           // and over again.
           sopUIDImageIdIndexMap = imageIds.reduce(function (acc, imageId) {
             var _metadataProvider$get = metadataProvider.get("generalImageModule", imageId),
-              sopInstanceUid = _metadataProvider$get.sopInstanceUid;
-            acc[sopInstanceUid] = imageId;
+              sopInstanceUID = _metadataProvider$get.sopInstanceUID;
+            acc[sopInstanceUID] = imageId;
             return acc;
           }, {});
           overlapping = false;
@@ -4725,7 +4725,8 @@ var PlanarFreehandROI = /** @class */ (function () {
     function PlanarFreehandROI() {
     }
     PlanarFreehandROI.getMeasurementData = function (MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
-        var _a = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType), defaultState = _a.defaultState, SCOORDGroup = _a.SCOORDGroup, ReferencedFrameNumber = _a.ReferencedFrameNumber;
+        var _a;
+        var _b = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType), defaultState = _b.defaultState, NUMGroup = _b.NUMGroup, SCOORDGroup = _b.SCOORDGroup, ReferencedFrameNumber = _b.ReferencedFrameNumber;
         var referencedImageId = defaultState.annotation.metadata.referencedImageId;
         var GraphicData = SCOORDGroup.GraphicData;
         var worldCoords = [];
@@ -4749,8 +4750,7 @@ var PlanarFreehandROI = /** @class */ (function () {
         }
         var state = defaultState;
         state.annotation.data = {
-            polyline: worldCoords,
-            isOpenContour: isOpenContour,
+            contour: { polyline: worldCoords, closed: !isOpenContour },
             handles: {
                 points: points,
                 activeHandleIndex: null,
@@ -4758,13 +4758,21 @@ var PlanarFreehandROI = /** @class */ (function () {
                     hasMoved: false
                 }
             },
+            cachedStats: (_a = {},
+                _a["imageId:".concat(referencedImageId)] = {
+                    area: NUMGroup
+                        ? NUMGroup.MeasuredValueSequence.NumericValue
+                        : null
+                },
+                _a),
             frameNumber: ReferencedFrameNumber
         };
         return state;
     };
     PlanarFreehandROI.getTID300RepresentationArguments = function (tool, worldToImageCoords) {
         var data = tool.data, finding = tool.finding, findingSites = tool.findingSites, metadata = tool.metadata;
-        var isOpenContour = data.isOpenContour, polyline = data.polyline;
+        var _a = data.contour, polyline = _a.polyline, closed = _a.closed;
+        var isOpenContour = closed !== true;
         var referencedImageId = metadata.referencedImageId;
         if (!referencedImageId) {
             throw new Error("PlanarFreehandROI.getTID300RepresentationArguments: referencedImageId is not defined");
@@ -4778,12 +4786,18 @@ var PlanarFreehandROI = /** @class */ (function () {
             // Explicitly expand to avoid ciruclar references.
             points.push([firstPoint[0], firstPoint[1]]);
         }
-        var area = 0; // TODO -> The tool doesn't have these stats yet.
-        var perimeter = 0;
+        var _b = data.cachedStats["imageId:".concat(referencedImageId)] || {}, area = _b.area, areaUnit = _b.areaUnit, modalityUnit = _b.modalityUnit, perimeter = _b.perimeter, mean = _b.mean, max = _b.max, stdDev = _b.stdDev;
         return {
+            /** From cachedStats */
             points: points,
             area: area,
+            areaUnit: areaUnit,
             perimeter: perimeter,
+            modalityUnit: modalityUnit,
+            mean: mean,
+            max: max,
+            stdDev: stdDev,
+            /** Other */
             trackingIdentifierTextValue: trackingIdentifierTextValue$2,
             finding: finding,
             findingSites: findingSites || []