@cornerstonejs/tools 4.17.5 → 4.18.1

package/dist/esm/tools/annotation/ProbeTool.js

@@ -298,31 +298,40 @@ class ProbeTool extends AnnotationTool {
                 continue;
             }
             const { dimensions, imageData, metadata, voxelManager } = image;
-            const modality = metadata.Modality;
+            const modality = metadata?.Modality;
             let ijk = transformWorldToIndex(imageData, worldPos);
             ijk = vec3.round(ijk, ijk);
             if (csUtils.indexWithinDimensions(ijk, dimensions)) {
                 this.isHandleOutsideImage = false;
-                let value = voxelManager.getAtIJKPoint(ijk);
-                if (targetId.startsWith('imageId:')) {
+                if (targetId.startsWith('imageId:') && modality !== 'ECG') {
                     const imageId = targetId.split('imageId:')[1];
                     const imageURI = csUtils.imageIdToURI(imageId);
                     const viewports = csUtils.getViewportsWithImageURI(imageURI);
                     const viewport = viewports[0];
                     ijk[2] = viewport.getCurrentImageIdIndex();
                 }
+                let value;
                 let modalityUnit;
-                if (modality === 'US') {
+                if (modality === 'ECG') {
                     const calibratedResults = getCalibratedProbeUnitsAndValue(image, [
                         ijk,
                     ]);
-                    const hasEnhancedRegionValues = calibratedResults.values.every((value) => value !== null);
+                    value = calibratedResults.values;
+                    modalityUnit = calibratedResults.units;
+                }
+                else if (modality === 'US') {
+                    value = voxelManager?.getAtIJKPoint(ijk);
+                    const calibratedResults = getCalibratedProbeUnitsAndValue(image, [
+                        ijk,
+                    ]);
+                    const hasEnhancedRegionValues = calibratedResults.values.every((v) => v !== null);
                     value = (hasEnhancedRegionValues ? calibratedResults.values : value);
                     modalityUnit = hasEnhancedRegionValues
                         ? calibratedResults.units
                         : 'raw';
                 }
                 else {
+                    value = voxelManager?.getAtIJKPoint(ijk);
                     modalityUnit = getPixelValueUnits(modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
                 }
                 cachedStats[targetId] = {

package/dist/esm/tools/annotation/UltrasoundDirectionalTool.js

@@ -1,5 +1,5 @@
 import { ChangeTypes, Events } from '../../enums';
-import { getEnabledElement, utilities as csUtils, StackViewport, } from '@cornerstonejs/core';
+import { getEnabledElement, utilities as csUtils, StackViewport, ECGViewport, } from '@cornerstonejs/core';
 import { AnnotationTool } from '../base';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
@@ -35,8 +35,9 @@ class UltrasoundDirectionalTool extends AnnotationTool {
             const worldPos = currentPoints.world;
             const enabledElement = getEnabledElement(element);
             const { viewport } = enabledElement;
-            if (!(viewport instanceof StackViewport)) {
-                throw new Error('UltrasoundDirectionalTool can only be used on a StackViewport');
+            if (!(viewport instanceof StackViewport) &&
+                !(viewport instanceof ECGViewport)) {
+                throw new Error('UltrasoundDirectionalTool can only be used on a StackViewport or ECGViewport');
             }
             hideElementCursor(element);
             this.isDrawing = true;

package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js

@@ -131,7 +131,7 @@ function completeDrawClosedContour(element, options) {
     if (this.haltDrawing(element, canvasPoints)) {
         return false;
     }
-    const { annotation, viewportIdsToRender } = this.commonData;
+    const { annotation, viewportIdsToRender, movingTextBox } = this.commonData;
     const enabledElement = getEnabledElement(element);
     const { viewport } = enabledElement;
     addCanvasPointsToArray(element, canvasPoints, canvasPoints[0], this.commonData);
@@ -145,7 +145,7 @@ function completeDrawClosedContour(element, options) {
         targetWindingDirection: ContourWindingDirection.Clockwise,
     }, viewport);
     const { textBox } = annotation.data.handles;
-    if (!textBox?.hasMoved) {
+    if (!textBox?.hasMoved && !movingTextBox) {
         triggerContourAnnotationCompleted(annotation, contourHoleProcessingEnabled);
     }
     this.isDrawing = false;
@@ -177,7 +177,7 @@ function completeDrawOpenContour(element, options) {
     if (this.haltDrawing(element, canvasPoints)) {
         return false;
     }
-    const { annotation, viewportIdsToRender } = this.commonData;
+    const { annotation, viewportIdsToRender, movingTextBox } = this.commonData;
     const enabledElement = getEnabledElement(element);
     const { viewport } = enabledElement;
     const updatedPoints = shouldSmooth(this.configuration, annotation)
@@ -200,7 +200,7 @@ function completeDrawOpenContour(element, options) {
     if (annotation.data.isOpenUShapeContour) {
         annotation.data.openUShapeContourVectorToPeak = resolveVectorToPeak(canvasPoints, viewport, annotation.data.isOpenUShapeContour);
     }
-    if (!textBox.hasMoved) {
+    if (!textBox.hasMoved && !movingTextBox) {
         triggerContourAnnotationCompleted(annotation, contourHoleProcessingEnabled);
     }
     this.isDrawing = false;

package/dist/esm/utilities/getCalibratedUnits.js

@@ -11,6 +11,7 @@ const SUPPORTED_REGION_DATA_TYPES = [
 const SUPPORTED_PROBE_VARIANT = [
     '4,3',
     '4,7',
+    '4,-1',
 ];
 const UNIT_MAPPING = {
     0: 'px',
@@ -24,6 +25,7 @@ const UNIT_MAPPING = {
     8: 'cm\xb2',
     9: 'cm\xb2/s',
     0xc: 'degrees',
+    [-1]: 'mV',
 };
 const EPS = 1e-3;
 const SQUARE = '\xb2';
@@ -66,7 +68,9 @@ const getCalibratedLengthUnitsAndScale = (image, handles) => {
         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));
+            handle[1] <= region.regionLocationMaxY1) &&
+            (SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType) ||
+                SUPPORTED_PROBE_VARIANT.includes(`${region.physicalUnitsXDirection},${region.physicalUnitsYDirection}`)));
         if (region &&
             region.physicalUnitsXDirection === region.physicalUnitsYDirection) {
             const physicalDeltaX = Math.abs(region.physicalDeltaX);
@@ -77,6 +81,19 @@ const getCalibratedLengthUnitsAndScale = (image, handles) => {
             unit = UNIT_MAPPING[region.physicalUnitsXDirection] || 'unknown';
             areaUnit = unit + SQUARE;
         }
+        else if (region && region.physicalUnitsYDirection === -1) {
+            const physicalDeltaX = Math.abs(region.physicalDeltaX);
+            const physicalDeltaY = Math.abs(region.physicalDeltaY);
+            scale = 1 / physicalDeltaX;
+            scaleY = 1 / physicalDeltaY;
+            calibrationType = 'ECG Region';
+            unit =
+                UNIT_MAPPING[region.physicalUnitsXDirection] ||
+                    UNIT_MAPPING[region.physicalUnitsYDirection] ||
+                    'unknown';
+            areaUnit =
+                (UNIT_MAPPING[region.physicalUnitsYDirection] || 'px') + SQUARE;
+        }
     }
     else if (calibration.scale) {
         scale = calibration.scale;
@@ -101,7 +118,8 @@ const getCalibratedProbeUnitsAndValue = (image, handles) => {
         return { units, values };
     }
     if (calibration.sequenceOfUltrasoundRegions) {
-        const supportedRegionsMetadata = calibration.sequenceOfUltrasoundRegions.filter((region) => SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType) &&
+        const supportedRegionsMetadata = calibration.sequenceOfUltrasoundRegions.filter((region) => (SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType) ||
+            SUPPORTED_PROBE_VARIANT.includes(`${region.physicalUnitsXDirection},${region.physicalUnitsYDirection}`)) &&
             SUPPORTED_PROBE_VARIANT.includes(`${region.physicalUnitsXDirection},${region.physicalUnitsYDirection}`));
         if (!supportedRegionsMetadata?.length) {
             return { units, values };
@@ -119,11 +137,12 @@ const getCalibratedProbeUnitsAndValue = (image, handles) => {
             physicalDeltaY;
         const xValue = (imageIndex[0] - region.regionLocationMinX0 - referencePixelX0) *
             physicalDeltaX;
-        calibrationType = 'US Region';
+        calibrationType =
+            region.physicalUnitsYDirection === -1 ? 'ECG Region' : 'US Region';
         values = [xValue, yValue];
         units = [
-            UNIT_MAPPING[region.physicalUnitsXDirection],
-            UNIT_MAPPING[region.physicalUnitsYDirection],
+            UNIT_MAPPING[region.physicalUnitsXDirection] ?? 'unknown',
+            UNIT_MAPPING[region.physicalUnitsYDirection] ?? 'unknown',
         ];
     }
     return {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.17.5";
+export declare const version = "4.18.1";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.17.5';
+export const version = '4.18.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.17.5",
+  "version": "4.18.1",
   "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.17.5",
+    "@cornerstonejs/core": "4.18.1",
     "@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": "d42f5ee3747c6521ef3af5e9d1faf69c98157396"
+  "gitHead": "1fc5684032269b1b1e3e3733cd891d48c27303f7"
 }