@cornerstonejs/tools 5.5.0 → 5.6.0

package/dist/esm/utilities/defaultGetTextLines.js

@@ -0,0 +1,53 @@
+import { utilities as csUtils } from '@cornerstonejs/core';
+const { isEqual } = csUtils;
+export const AREA_METRICS = [
+    { name: 'Area', attribute: 'area', unitAttribute: 'areaUnit' },
+    { name: 'Mean', attribute: 'mean', unitAttribute: 'modalityUnit' },
+    { name: 'Max', attribute: 'max', unitAttribute: 'modalityUnit' },
+    { name: 'Min', attribute: 'min', unitAttribute: 'modalityUnit' },
+    { name: 'Std Dev', attribute: 'stdDev', unitAttribute: 'modalityUnit' },
+];
+export function createGetTextLines(metrics) {
+    return function (data, targetId) {
+        const targetIds = Array.isArray(targetId) ? targetId : [targetId];
+        const cachedVolumeStats = targetIds
+            .map((id) => data.cachedStats[id])
+            .filter((stats) => metrics.some(({ attribute }) => stats?.[attribute] !== undefined && stats?.[attribute] !== null));
+        if (!cachedVolumeStats.length) {
+            return;
+        }
+        const textLines = [];
+        for (const metric of metrics) {
+            pushResult(textLines, createMultiResultLine(cachedVolumeStats, targetIds, metric.name, metric.attribute, metric.unitAttribute));
+        }
+        return textLines;
+    };
+}
+export const defaultAreaGetTextLines = createGetTextLines(AREA_METRICS);
+function pushResult(textLines, value) {
+    if (value) {
+        textLines.push(value);
+    }
+}
+export function createMultiResultLine(cachedVolumeStats, targetIds, name, attribute, unitAttribute) {
+    const result = [`${name}:`];
+    let lastValue = null;
+    let lastUnit = null;
+    for (const stats of cachedVolumeStats) {
+        if (!csUtils.isNumber(stats?.[attribute])) {
+            continue;
+        }
+        const attributeValue = stats[attribute];
+        const unitValue = stats[unitAttribute];
+        if (isEqual(lastValue, attributeValue) && lastUnit === unitValue) {
+            continue;
+        }
+        result.push(`${csUtils.roundNumber(attributeValue)} ${unitValue}`);
+        lastValue = attributeValue;
+        lastUnit = unitValue;
+    }
+    if (result.length <= 1) {
+        return;
+    }
+    return result.join(' ');
+}

package/dist/esm/utilities/getEllipseWorldCoordinates.d.ts

@@ -1,2 +1,2 @@
-import type { VolumeViewport, Types } from '@cornerstonejs/core';
-export default function getEllipseWorldCoordinates(points: [Types.Point3, Types.Point3], viewport: Types.IStackViewport | VolumeViewport): Types.Point3[];
+import type { Types } from '@cornerstonejs/core';
+export default function getEllipseWorldCoordinates(points: [Types.Point3, Types.Point3], viewport: Types.IViewport): Types.Point3[];

package/dist/esm/utilities/getEllipseWorldCoordinates.js

@@ -1,7 +1,7 @@
 import { vec3 } from 'gl-matrix';
+import getViewportICamera from './getViewportICamera.js';
 export default function getEllipseWorldCoordinates(points, viewport) {
-    const camera = viewport.getCamera();
-    const { viewUp, viewPlaneNormal } = camera;
+    const { viewUp, viewPlaneNormal } = getViewportICamera(viewport);
     const viewRight = vec3.create();
     vec3.cross(viewRight, viewUp, viewPlaneNormal);
     const [centerWorld, endWorld] = points;

package/dist/esm/utilities/index.d.ts

@@ -46,4 +46,5 @@ import getOrCreateImageVolume from './segmentation/getOrCreateImageVolume.js';
 import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/utils/fanExtraction.js';
 import { jumpToFocalPoint } from './genericViewportToolHelpers.js';
 import pickIntensityPointInSlab, { getSlabIntensityPickContext } from './pickIntensityPointInSlab.js';
+export * from './defaultGetTextLines.js';
 export { math, planar, spatial, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };

package/dist/esm/utilities/index.js

@@ -46,4 +46,5 @@ import getOrCreateImageVolume from './segmentation/getOrCreateImageVolume.js';
 import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/utils/fanExtraction.js';
 import { jumpToFocalPoint } from './genericViewportToolHelpers.js';
 import pickIntensityPointInSlab, { getSlabIntensityPickContext, } from './pickIntensityPointInSlab.js';
+export * from './defaultGetTextLines.js';
 export { math, planar, spatial, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };

package/dist/esm/utilities/planar/filterAnnotationsWithinSlice.js

@@ -49,7 +49,7 @@ export default function filterAnnotationsWithinSlice(annotations, camera, spacin
     if (!annotationsWithParallelNormals.length) {
         return [];
     }
-    const halfSpacingInNormalDirection = spacingInNormalDirection / 2;
+    const halfSpacingInNormalDirection = spacingInNormalDirection / 2 + EPSILON;
     const { focalPoint } = camera;
     const annotationsWithinSlice = [];
     for (const annotation of annotationsWithParallelNormals) {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.5.0";
+export declare const version = "5.6.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.5.0';
+export const version = '5.6.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -126,11 +126,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.5.0",
+    "@cornerstonejs/core": "5.6.0",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.5.0",
+    "@cornerstonejs/core": "5.6.0",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -149,5 +149,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "9a6e9edc926a53324461f17358dd034d009e4137"
+  "gitHead": "bca909b8af25305cc850f52b43d5834b55fcf011"
 }