@cornerstonejs/tools 4.12.3 → 4.12.5

package/dist/esm/utilities/getCalibratedUnits.js

@@ -1,4 +1,4 @@
-import { Enums, utilities } from '@cornerstonejs/core';
+import { Enums } from '@cornerstonejs/core';
 const { CalibrationTypes } = Enums;
 const PIXEL_UNITS = 'px';
 const VOXEL_UNITS = 'voxels';
@@ -8,10 +8,6 @@ const SUPPORTED_REGION_DATA_TYPES = [
     3,
     4,
 ];
-const SUPPORTED_LENGTH_VARIANT = [
-    '3,3',
-    '4,7',
-];
 const SUPPORTED_PROBE_VARIANT = [
     '4,3',
     '4,7',
@@ -31,94 +27,67 @@ const UNIT_MAPPING = {
 };
 const EPS = 1e-3;
 const SQUARE = '\xb2';
+const types = [
+    CalibrationTypes.ERMF,
+    CalibrationTypes.USER,
+    CalibrationTypes.ERROR,
+    CalibrationTypes.PROJECTION,
+    CalibrationTypes.CALIBRATED,
+    CalibrationTypes.UNKNOWN,
+];
 const getCalibratedLengthUnitsAndScale = (image, handles) => {
-    const { calibration, hasPixelSpacing } = image;
+    const { calibration, hasPixelSpacing, spacing = [1, 1, 1] } = image;
     let unit = hasPixelSpacing ? 'mm' : PIXEL_UNITS;
     const volumeUnit = hasPixelSpacing ? 'mm\xb3' : VOXEL_UNITS;
     let areaUnit = unit + SQUARE;
-    let scale = 1;
+    const baseScale = calibration?.scale || 1;
+    let scale = baseScale / (calibration?.columnPixelSpacing || spacing[0]);
+    let scaleY = baseScale / (calibration?.rowPixelSpacing || spacing[1]);
+    let scaleZ = baseScale / spacing[2];
     let calibrationType = '';
     if (!calibration ||
         (!calibration.type && !calibration.sequenceOfUltrasoundRegions)) {
-        return { unit, areaUnit, scale, volumeUnit };
+        return { unit, areaUnit, scale, scaleY, scaleZ, volumeUnit };
+    }
+    if (types.includes(calibration?.type)) {
+        calibrationType = calibration.type;
     }
     if (calibration.type === CalibrationTypes.UNCALIBRATED) {
         return {
             unit: PIXEL_UNITS,
             areaUnit: PIXEL_UNITS + SQUARE,
             scale,
+            scaleY,
+            scaleZ,
             volumeUnit: VOXEL_UNITS,
         };
     }
     if (calibration.sequenceOfUltrasoundRegions) {
-        let imageIndex1, imageIndex2;
-        if (Array.isArray(handles) && handles.length === 2) {
-            [imageIndex1, imageIndex2] = handles;
-        }
-        else if (typeof handles === 'function') {
-            const points = handles();
-            imageIndex1 = points[0];
-            imageIndex2 = points[1];
-        }
-        let regions = calibration.sequenceOfUltrasoundRegions.filter((region) => imageIndex1[0] >= region.regionLocationMinX0 &&
-            imageIndex1[0] <= region.regionLocationMaxX1 &&
-            imageIndex1[1] >= region.regionLocationMinY0 &&
-            imageIndex1[1] <= region.regionLocationMaxY1 &&
-            imageIndex2[0] >= region.regionLocationMinX0 &&
-            imageIndex2[0] <= region.regionLocationMaxX1 &&
-            imageIndex2[1] >= region.regionLocationMinY0 &&
-            imageIndex2[1] <= region.regionLocationMaxY1);
-        if (!regions?.length) {
-            return { unit, areaUnit, scale, volumeUnit };
-        }
-        regions = regions.filter((region) => SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType) &&
-            SUPPORTED_LENGTH_VARIANT.includes(`${region.physicalUnitsXDirection},${region.physicalUnitsYDirection}`));
-        if (!regions.length) {
-            return {
-                unit: PIXEL_UNITS,
-                areaUnit: PIXEL_UNITS + SQUARE,
-                scale,
-                volumeUnit: VOXEL_UNITS,
-            };
-        }
-        const region = regions[0];
-        const physicalDeltaX = Math.abs(region.physicalDeltaX);
-        const physicalDeltaY = Math.abs(region.physicalDeltaY);
-        const isSamePhysicalDelta = utilities.isEqual(physicalDeltaX, physicalDeltaY, EPS);
-        if (isSamePhysicalDelta) {
+        const region = calibration.sequenceOfUltrasoundRegions.find((region) => handles.every((handle) => handle[0] >= region.regionLocationMinX0 &&
+            handle[0] <= region.regionLocationMaxX1 &&
+            handle[1] >= region.regionLocationMinY0 &&
+            handle[1] <= region.regionLocationMaxY1) && SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType));
+        if (region &&
+            region.physicalUnitsXDirection === region.physicalUnitsYDirection) {
+            const physicalDeltaX = Math.abs(region.physicalDeltaX);
+            const physicalDeltaY = Math.abs(region.physicalDeltaY);
             scale = 1 / physicalDeltaX;
+            scaleY = 1 / physicalDeltaY;
             calibrationType = 'US Region';
             unit = UNIT_MAPPING[region.physicalUnitsXDirection] || 'unknown';
             areaUnit = unit + SQUARE;
         }
-        else {
-            return {
-                unit: PIXEL_UNITS,
-                areaUnit: PIXEL_UNITS + SQUARE,
-                scale,
-                volumeUnit: VOXEL_UNITS,
-            };
-        }
     }
     else if (calibration.scale) {
         scale = calibration.scale;
     }
-    const types = [
-        CalibrationTypes.ERMF,
-        CalibrationTypes.USER,
-        CalibrationTypes.ERROR,
-        CalibrationTypes.PROJECTION,
-        CalibrationTypes.CALIBRATED,
-        CalibrationTypes.UNKNOWN,
-    ];
-    if (types.includes(calibration?.type)) {
-        calibrationType = calibration.type;
-    }
     return {
         unit: unit + (calibrationType ? ` ${calibrationType}` : ''),
         areaUnit: areaUnit + (calibrationType ? ` ${calibrationType}` : ''),
-        scale,
         volumeUnit: volumeUnit + (calibrationType ? ` ${calibrationType}` : ''),
+        scale,
+        scaleY,
+        scaleZ,
     };
 };
 const getCalibratedProbeUnitsAndValue = (image, handles) => {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.12.3";
+export declare const version = "4.12.5";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.12.3';
+export const version = '4.12.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.12.3",
+  "version": "4.12.5",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.12.3",
+    "@cornerstonejs/core": "4.12.5",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "ea79a24d2099225dd33ac53e06e106f15322007f"
+  "gitHead": "97cc5eed916981c859c091556e6c4e36a139b281"
 }

package/dist/esm/utilities/contours/calculatePerimeter.d.ts

@@ -1,2 +0,0 @@
-export declare function calculatePerimeter(polyline: number[][], closed: boolean): number;
-export default calculatePerimeter;

package/dist/esm/utilities/contours/calculatePerimeter.js

@@ -1,16 +0,0 @@
-import { vec3 } from 'gl-matrix';
-export function calculatePerimeter(polyline, closed) {
-    let perimeter = 0;
-    for (let i = 0; i < polyline.length - 1; i++) {
-        const point1 = polyline[i];
-        const point2 = polyline[i + 1];
-        perimeter += vec3.dist(point1, point2);
-    }
-    if (closed) {
-        const firstPoint = polyline[0];
-        const lastPoint = polyline[polyline.length - 1];
-        perimeter += vec3.dist(firstPoint, lastPoint);
-    }
-    return perimeter;
-}
-export default calculatePerimeter;