@ohif/app 3.12.0-beta.67 → 3.12.0-beta.69

package/dist/{4113.bundle.d57b077bf8b22a2fffe6.js → 4113.bundle.cdb5aabbb16c44b3937d.js}

@@ -1367,19 +1367,15 @@ function hydrateStructuredReport({
   }
   const instance = src/* DicomMetadataStore */.H8.getInstance(displaySet.StudyInstanceUID, displaySet.SeriesInstanceUID, displaySet.SOPInstanceUID);
   const sopInstanceUIDToImageId = {};
-  const imageIdsForToolState = {};
   displaySet.measurements.forEach(measurement => {
     const {
       ReferencedSOPInstanceUID,
       imageId,
-      frameNumber
+      frameNumber = 1
     } = measurement;
-    if (!sopInstanceUIDToImageId[ReferencedSOPInstanceUID]) {
-      sopInstanceUIDToImageId[ReferencedSOPInstanceUID] = imageId;
-      imageIdsForToolState[ReferencedSOPInstanceUID] = [];
-    }
-    if (!imageIdsForToolState[ReferencedSOPInstanceUID][frameNumber]) {
-      imageIdsForToolState[ReferencedSOPInstanceUID][frameNumber] = imageId;
+    const key = `${ReferencedSOPInstanceUID}:${frameNumber}`;
+    if (!sopInstanceUIDToImageId[key]) {
+      sopInstanceUIDToImageId[key] = imageId;
     }
   });
 
@@ -1421,8 +1417,8 @@ function hydrateStructuredReport({
       // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
       // files, and looking up the imageId from sopInstanceUIDToImageId results
       // in the wrong value.
-      const frameNumber = toolData.annotation.data && toolData.annotation.data.frameNumber || 1;
-      const imageId = imageIdsForToolState[toolData.sopInstanceUid][frameNumber] || sopInstanceUIDToImageId[toolData.sopInstanceUid];
+      const frameNumber = toolData.annotation.data?.frameNumber || 1;
+      const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
       if (!imageIds.includes(imageId)) {
         imageIds.push(imageId);
       }
@@ -1459,7 +1455,7 @@ function hydrateStructuredReport({
     // files, and looking up the imageId from sopInstanceUIDToImageId results
     // in the wrong value.
     const frameNumber = toolData.annotation.data && toolData.annotation.data.frameNumber || 1;
-    const imageId = imageIdsForToolState[toolData.sopInstanceUid][frameNumber] || sopInstanceUIDToImageId[toolData.sopInstanceUid];
+    const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
     if (!imageId) {
       return getReferenceData3D(toolData, servicesManager);
     }

package/dist/{2345.bundle.c17b90bde0073fd7dbb6.js → 5400.bundle.eb0f5866140b5db31518.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[2345],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[5400],{
 
 /***/ 18262:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -891,13 +891,11 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
                 else {
                     this.updateOpenCachedStats({
                         metadata,
-                        canvasCoordinates,
                         targetId,
                         cachedStats,
                         modalityUnit,
                         calibratedScale,
-                        deltaInX,
-                        deltaInY,
+                        points,
                     });
                 }
             }
@@ -1150,8 +1148,7 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
         worldPosIndex2[2] = Math.floor(worldPosIndex2[2]);
         let area = _utilities_math__WEBPACK_IMPORTED_MODULE_4__.polyline.getArea(canvasCoordinates) / scale / scale;
         area *= deltaInX * deltaInY;
-        let perimeter = (0,_utilities_contours_calculatePerimeter__WEBPACK_IMPORTED_MODULE_21__/* ["default"] */ .A)(canvasCoordinates, closed) / scale;
-        perimeter *= Math.sqrt(Math.pow(deltaInX, 2) + Math.pow(deltaInY, 2));
+        const perimeter = (0,_utilities_contours_calculatePerimeter__WEBPACK_IMPORTED_MODULE_21__/* ["default"] */ .A)(points, closed) / scale;
         const iDelta = 0.01 * (iMax - iMin);
         const jDelta = 0.01 * (jMax - jMin);
         const kDelta = 0.01 * (kMax - kMin);
@@ -1221,10 +1218,9 @@ class PlanarFreehandROITool extends _base_ContourSegmentationBaseTool__WEBPACK_I
             unit,
         };
     }
-    updateOpenCachedStats({ targetId, metadata, canvasCoordinates, cachedStats, modalityUnit, calibratedScale, deltaInX, deltaInY, }) {
+    updateOpenCachedStats({ targetId, metadata, cachedStats, modalityUnit, calibratedScale, points, }) {
         const { scale, unit } = calibratedScale;
-        let length = (0,_utilities_contours_calculatePerimeter__WEBPACK_IMPORTED_MODULE_21__/* ["default"] */ .A)(canvasCoordinates, closed) / scale;
-        length *= Math.sqrt(Math.pow(deltaInX, 2) + Math.pow(deltaInY, 2));
+        const length = (0,_utilities_contours_calculatePerimeter__WEBPACK_IMPORTED_MODULE_21__/* ["default"] */ .A)(points, closed) / scale;
         cachedStats[targetId] = {
             Modality: metadata.Modality,
             length,
@@ -2502,58 +2498,6 @@ function pointInSphere(sphere, pointLPS) {
 
 
 
-/***/ }),
-
-/***/ 61768:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (/* binding */ interpolateSegmentPoints)
-/* harmony export */ });
-/* harmony import */ var _algorithms_bspline__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(30269);
-
-function getContinuousUniformDistributionValues(minDistributionDistance, closedInterval) {
-    const result = [];
-    const [intervalIni, intervalEnd] = closedInterval;
-    const intervalSize = intervalEnd - intervalIni + 1;
-    const intensity = Math.floor(intervalSize / minDistributionDistance);
-    let x = 0;
-    let continuosDistributionValue = Math.round(((intervalSize - 1) / (intensity - 1)) * x) + intervalIni;
-    while (continuosDistributionValue <= intervalEnd) {
-        result.push(continuosDistributionValue);
-        x++;
-        continuosDistributionValue =
-            Math.round(((intervalSize - 1) / (intensity - 1)) * x) + intervalIni;
-    }
-    return result;
-}
-function interpolateSegmentPoints(points, iniIndex, endIndex, knotsRatioPercentage) {
-    const segmentSize = endIndex - iniIndex + 1;
-    const amountOfKnots = Math.floor((knotsRatioPercentage / 100) * segmentSize) ?? 1;
-    const minKnotDistance = Math.floor(segmentSize / amountOfKnots) ?? 1;
-    if (isNaN(segmentSize) || !segmentSize || !minKnotDistance) {
-        return points;
-    }
-    if (segmentSize / minKnotDistance < 2) {
-        return points;
-    }
-    const interpolationIniIndex = Math.max(0, iniIndex);
-    const interpolationEndIndex = Math.min(points.length - 1, endIndex);
-    const segmentPointsUnchangedBeg = points.slice(0, interpolationIniIndex);
-    const segmentPointsUnchangedEnd = points.slice(interpolationEndIndex + 1, points.length);
-    const knotsIndexes = getContinuousUniformDistributionValues(minKnotDistance, [
-        interpolationIniIndex,
-        interpolationEndIndex,
-    ]);
-    const interpolatedPoints = (0,_algorithms_bspline__WEBPACK_IMPORTED_MODULE_0__/* .interpolatePoints */ .H)(points, knotsIndexes);
-    return [
-        ...segmentPointsUnchangedBeg,
-        ...interpolatedPoints,
-        ...segmentPointsUnchangedEnd,
-    ];
-}
-
-
 /***/ }),
 
 /***/ 27730: