@cornerstonejs/adapters 4.15.16 → 4.15.18

package/dist/esm/adapters/Cornerstone3D/ArrowAnnotate.js

@@ -6,7 +6,7 @@ import { toScoord } from '../helpers/toScoordType.js';
 
 var _ArrowAnnotate;
 const {
-  Point: TID300Point
+  ArrowAnnotate: TID300ArrowAnnotate
 } = utilities.TID300;
 const {
   imageToWorldCoords
@@ -89,7 +89,7 @@ class ArrowAnnotate extends BaseAdapter3D {
 }
 _ArrowAnnotate = ArrowAnnotate;
 (() => {
-  _ArrowAnnotate.init("ArrowAnnotate", TID300Point);
+  _ArrowAnnotate.init("ArrowAnnotate", TID300ArrowAnnotate);
   _ArrowAnnotate.registerLegacy();
 })();
 

package/dist/esm/adapters/Cornerstone3D/Bidirectional.d.ts

@@ -52,6 +52,7 @@ declare class Bidirectional extends BaseAdapter3D {
         };
         longAxisLength: any;
         shortAxisLength: any;
+        unit: any;
         trackingIdentifierTextValue: string;
         finding: any;
         findingSites: any;

package/dist/esm/adapters/Cornerstone3D/Bidirectional.js

@@ -41,7 +41,9 @@ class Bidirectional extends BaseAdapter3D {
       state.annotation.data.cachedStats = {
         [`imageId:${referencedImageId}`]: {
           length: longAxisNUMGroup.MeasuredValueSequence.NumericValue,
-          width: shortAxisNUMGroup.MeasuredValueSequence.NumericValue
+          width: shortAxisNUMGroup.MeasuredValueSequence.NumericValue,
+          unit: longAxisNUMGroup.MeasuredValueSequence.MeasurementUnitsCodeSequence.CodeValue,
+          widthUnit: shortAxisNUMGroup.MeasuredValueSequence.MeasurementUnitsCodeSequence.CodeValue
         }
       };
     }
@@ -88,7 +90,8 @@ class Bidirectional extends BaseAdapter3D {
     const shortAxisEndImage = toScoord(scoordProps, longAxisPoints[1]);
     const {
       length,
-      width
+      width,
+      unit
     } = cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       longAxis: {
@@ -101,6 +104,7 @@ class Bidirectional extends BaseAdapter3D {
       },
       longAxisLength: length,
       shortAxisLength: width,
+      unit,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding: finding,
       findingSites: findingSites || [],

package/dist/esm/adapters/Cornerstone3D/CircleROI.d.ts

@@ -11,8 +11,15 @@ declare class CircleROI extends BaseAdapter3D {
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         area: any;
+        areaUnit: any;
         perimeter: number;
+        modalityUnit: any;
+        radiusUnit: any;
         radius: any;
+        max: any;
+        min: any;
+        stdDev: any;
+        mean: any;
         points: ({
             x: any;
             y: any;

package/dist/esm/adapters/Cornerstone3D/CircleROI.js

@@ -3,6 +3,7 @@ import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
+import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 
 var _CircleROI;
 const {
@@ -17,6 +18,9 @@ class CircleROI extends BaseAdapter3D {
       referencedImageId,
       ReferencedFrameNumber
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
+    const referencedSOPInstanceUID = state.sopInstanceUid;
+    const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
+    const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
@@ -30,7 +34,8 @@ class CircleROI extends BaseAdapter3D {
         [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
           radius: 0,
-          perimeter: 0
+          perimeter: 0,
+          ...restoreAdditionalMetrics(measurementNUMGroups)
         }
       };
     }
@@ -59,13 +64,27 @@ class CircleROI extends BaseAdapter3D {
     const end = toScoord(scoordProps, handles.points[1]);
     const {
       area,
-      radius
+      radius,
+      max,
+      min,
+      stdDev,
+      mean,
+      modalityUnit,
+      radiusUnit,
+      areaUnit
     } = cachedStats[`imageId:${referencedImageId}`] || {};
     const perimeter = 2 * Math.PI * radius;
     return {
       area,
+      areaUnit,
       perimeter,
+      modalityUnit,
+      radiusUnit,
       radius,
+      max,
+      min,
+      stdDev,
+      mean,
       points: [center, end],
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,

package/dist/esm/adapters/Cornerstone3D/EllipticalROI.d.ts

@@ -11,6 +11,12 @@ declare class EllipticalROI extends BaseAdapter3D {
     };
     static getTID300RepresentationArguments(tool: any, is3DMeasurement?: boolean): {
         area: any;
+        areaUnit: any;
+        max: any;
+        min: any;
+        mean: any;
+        stdDev: any;
+        modalityUnit: any;
         points: ({
             x: any;
             y: any;

package/dist/esm/adapters/Cornerstone3D/EllipticalROI.js

@@ -3,6 +3,7 @@ import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
+import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 
 var _EllipticalROI;
 const {
@@ -17,6 +18,9 @@ class EllipticalROI extends BaseAdapter3D {
       referencedImageId,
       ReferencedFrameNumber
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType);
+    const referencedSOPInstanceUID = state.sopInstanceUid;
+    const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
+    const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
     state.annotation.data = {
       ...state.annotation.data,
       handles: {
@@ -27,7 +31,8 @@ class EllipticalROI extends BaseAdapter3D {
     };
     state.annotation.data.cachedStats = referencedImageId ? {
       [`imageId:${referencedImageId}`]: {
-        area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
+        area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
+        ...restoreAdditionalMetrics(measurementNUMGroups)
       }
     } : {};
     return state;
@@ -73,11 +78,23 @@ class EllipticalROI extends BaseAdapter3D {
       points.push(left, right, top, bottom);
     }
     const {
-      area
+      area,
+      max,
+      min,
+      mean,
+      stdDev,
+      modalityUnit,
+      areaUnit
     } = cachedStats[`imageId:${referencedImageId}`] || {};
     const convertedPoints = points.map(point => toScoord(scoordProps, point));
     return {
       area,
+      areaUnit,
+      max,
+      min,
+      mean,
+      stdDev,
+      modalityUnit,
       points: convertedPoints,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,

package/dist/esm/adapters/Cornerstone3D/LabelData.js

@@ -7,9 +7,11 @@ const {
   sr: {
     valueTypes,
     coding
+  },
+  adapters: {
+    Cornerstone3D
   }
 } = dcmjs;
-const CORNERSTONEFREETEXT = "CORNERSTONEFREETEXT";
 class LabelData {
   constructor(tid300Item, annotation) {
     this.tid300Item = tid300Item;
@@ -32,12 +34,16 @@ class LabelData {
     return contentEntries;
   }
   filterCornerstoneFreeText(contentEntries) {
+    const {
+      codeValues
+    } = Cornerstone3D.CodeScheme;
+    const freeTextCodes = [codeValues.FREE_TEXT_CODE_VALUE, codeValues.CORNERSTONEFREETEXT];
     for (let i = 0; i < contentEntries.length; i++) {
       const group = contentEntries[i];
       if (!group.ConceptCodeSequence) {
         continue;
       }
-      const csLabel = group.ConceptCodeSequence.find(item => item.CodeValue === CORNERSTONEFREETEXT);
+      const csLabel = group.ConceptCodeSequence.findIndex(item => freeTextCodes.includes(item.CodeValue));
       if (csLabel !== -1) {
         group.ConceptCodeSequence.splice(csLabel, 1);
         if (group.ConceptCodeSequence.length === 0) {
@@ -64,9 +70,6 @@ class LabelData {
       FrameOfReferenceUID: frameOfReferenceUID
     } = annotation.metadata;
     const is3DMeasurement = !referencedImageId;
-    const {
-      worldPosition
-    } = textBox;
     const {
       x,
       y,
@@ -74,27 +77,28 @@ class LabelData {
     } = toScoord({
       is3DMeasurement,
       referencedImageId
-    }, worldPosition);
+    }, textBox.worldPosition);
     const graphicType = valueTypes.GraphicTypes.POINT;
     const relationshipType = valueTypes.RelationshipTypes.CONTAINS;
     const name = new coding.CodedConcept(TEXT_ANNOTATION_POSITION);
-    if (is3DMeasurement) {
-      const graphicData = [x, y, z];
-      return new valueTypes.Scoord3DContentItem({
-        name,
-        relationshipType,
-        graphicType,
-        frameOfReferenceUID,
-        graphicData
-      });
-    }
-    const graphicData = [x, y];
-    return new valueTypes.ScoordContentItem({
+    const scoord = is3DMeasurement ? new valueTypes.Scoord3DContentItem({
+      name,
+      relationshipType,
+      graphicType,
+      graphicData: [x, y, z],
+      frameOfReferenceUID
+    }) : new valueTypes.ScoordContentItem({
       name,
       relationshipType,
       graphicType,
-      graphicData
+      graphicData: [x, y]
     });
+    scoord.ContentSequence = [{
+      RelationshipType: valueTypes.RelationshipTypes.SELECTED_FROM,
+      ValueType: valueTypes.ValueTypes.IMAGE,
+      ReferencedSOPSequence: this.ReferencedSOPSequence
+    }];
+    return scoord;
   }
 }
 

package/dist/esm/adapters/Cornerstone3D/Length.js

@@ -20,7 +20,8 @@ class Length extends BaseAdapter3D {
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
     const cachedStats = referencedImageId ? {
       [`imageId:${referencedImageId}`]: {
-        length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
+        length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
+        unit: NUMGroup.MeasuredValueSequence.MeasurementUnitsCodeSequence.CodeValue
       }
     } : {};
     state.annotation.data = {

package/dist/esm/adapters/Cornerstone3D/MeasurementReport.d.ts

@@ -26,6 +26,9 @@ type SetupMeasurementData = {
     };
     NUMGroup: {
         MeasuredValueSequence: {
+            MeasurementUnitsCodeSequence: {
+                CodeValue: string;
+            };
             NumericValue: number;
         };
     };

package/dist/esm/adapters/Cornerstone3D/PlanarFreehandROI.js

@@ -4,6 +4,7 @@ import { vec3 } from 'gl-matrix';
 import BaseAdapter3D from './BaseAdapter3D.js';
 import { toScoords } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
+import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 
 var _PlanarFreehandROI;
 const {
@@ -28,6 +29,9 @@ class PlanarFreehandROI extends BaseAdapter3D {
     if (isOpenContour) {
       points.push(worldCoords[0], worldCoords[worldCoords.length - 1]);
     }
+    const referencedSOPInstanceUID = state.sopInstanceUid;
+    const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
+    const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
     state.annotation.data = {
       ...state.annotation.data,
       contour: {
@@ -43,7 +47,8 @@ class PlanarFreehandROI extends BaseAdapter3D {
     if (referencedImageId) {
       state.annotation.data.cachedStats = {
         [`imageId:${referencedImageId}`]: {
-          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
+          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null,
+          ...restoreAdditionalMetrics(measurementNUMGroups)
         }
       };
     }
@@ -81,13 +86,14 @@ class PlanarFreehandROI extends BaseAdapter3D {
       perimeter,
       mean,
       max,
-      stdDev
+      stdDev,
+      length
     } = data.cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       points,
       area,
       areaUnit,
-      perimeter,
+      perimeter: perimeter ?? length,
       modalityUnit,
       mean,
       max,

package/dist/esm/adapters/Cornerstone3D/RectangleROI.d.ts

@@ -22,6 +22,11 @@ export declare class RectangleROI extends BaseAdapter3D {
         })[];
         area: any;
         perimeter: any;
+        max: any;
+        mean: any;
+        stdDev: any;
+        areaUnit: any;
+        modalityUnit: any;
         trackingIdentifierTextValue: string;
         finding: any;
         findingSites: any;

package/dist/esm/adapters/Cornerstone3D/RectangleROI.js

@@ -3,6 +3,7 @@ import { toScoords } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
+import { extractAllNUMGroups, restoreAdditionalMetrics } from './metricHandler.js';
 
 var _RectangleROI;
 const {
@@ -23,10 +24,14 @@ class RectangleROI extends BaseAdapter3D {
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
     const points = worldCoords.length === 5 ? worldCoords.slice(0, 4) : worldCoords;
     const areaGroup = MeasurementGroup.ContentSequence.find(g => g.ValueType === "NUM" && g.ConceptNameCodeSequence[0].CodeMeaning === "Area");
+    const referencedSOPInstanceUID = state.sopInstanceUid;
+    const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
+    const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
     const cachedStats = referencedImageId ? {
       [`imageId:${referencedImageId}`]: {
         area: areaGroup?.MeasuredValueSequence?.[0]?.NumericValue || 0,
-        areaUnit: areaGroup?.MeasuredValueSequence?.[0]?.MeasurementUnitsCodeSequence?.CodeValue
+        areaUnit: areaGroup?.MeasuredValueSequence?.[0]?.MeasurementUnitsCodeSequence?.CodeValue,
+        ...restoreAdditionalMetrics(measurementNUMGroups)
       }
     } : {};
     state.annotation.data = {
@@ -58,12 +63,22 @@ class RectangleROI extends BaseAdapter3D {
     const corners = toScoords(scoordProps, data.handles.points);
     const {
       area,
-      perimeter
+      perimeter,
+      max,
+      mean,
+      stdDev,
+      areaUnit,
+      modalityUnit
     } = data.cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       points: [corners[0], corners[1], corners[3], corners[2], corners[0]],
       area,
       perimeter,
+      max,
+      mean,
+      stdDev,
+      areaUnit,
+      modalityUnit,
       trackingIdentifierTextValue: this.trackingIdentifierTextValue,
       finding,
       findingSites: findingSites || [],

package/dist/esm/adapters/Cornerstone3D/metricHandler.d.ts

@@ -0,0 +1,13 @@
+export interface AdditionalMetrics {
+    mean?: number;
+    stdDev?: number;
+    max?: number;
+    min?: number;
+    area?: number;
+    radius?: number;
+    modalityUnit?: string;
+    areaUnit?: string;
+    [key: string]: number | string | undefined;
+}
+export declare function extractAllNUMGroups(MeasurementGroup: any, referencedSOPInstanceUID: any): {};
+export declare function restoreAdditionalMetrics(numGroups: any): AdditionalMetrics;

package/dist/esm/adapters/Cornerstone3D/metricHandler.js

@@ -0,0 +1,74 @@
+function extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID) {
+  const numGroupsBySOPInstanceUID = {};
+  if (MeasurementGroup.ContentSequence) {
+    MeasurementGroup.ContentSequence.forEach(item => {
+      if (item.ValueType === "NUM" && item.ConceptNameCodeSequence) {
+        const codeMeaning = item.ConceptNameCodeSequence.CodeMeaning;
+        const numericValue = item.MeasuredValueSequence?.NumericValue;
+        const unitCode = item.MeasuredValueSequence?.MeasurementUnitsCodeSequence?.CodeValue;
+        if (numericValue !== undefined && referencedSOPInstanceUID) {
+          if (!numGroupsBySOPInstanceUID[referencedSOPInstanceUID]) {
+            numGroupsBySOPInstanceUID[referencedSOPInstanceUID] = {};
+          }
+          numGroupsBySOPInstanceUID[referencedSOPInstanceUID][codeMeaning] = {
+            value: numericValue,
+            unit: unitCode || ""
+          };
+        }
+      }
+    });
+  }
+  return numGroupsBySOPInstanceUID;
+}
+function restoreAdditionalMetrics(numGroups) {
+  const additionalMetrics = {};
+  let modalityUnit = "";
+  const metricMapping = {
+    Mean: "mean",
+    "Standard Deviation": "stdDev",
+    Maximum: "max",
+    Minimum: "min",
+    Area: "area",
+    Radius: "radius",
+    Perimeter: "perimeter",
+    Length: "length",
+    Width: "width"
+  };
+  const unitCategory = {
+    area: "areaUnit",
+    radius: "radiusUnit",
+    width: "widthUnit"
+  };
+  for (const [codeMeaning, metricKey] of Object.entries(metricMapping)) {
+    const group = numGroups[codeMeaning];
+    if (!group) {
+      continue;
+    }
+    const {
+      value,
+      unit
+    } = group;
+    if (value == null) {
+      continue;
+    }
+    additionalMetrics[metricKey] = value;
+    if (!unit) {
+      continue;
+    }
+    if (!modalityUnit) {
+      modalityUnit = unit;
+    }
+    const category = unitCategory[metricKey];
+    if (category) {
+      if (!additionalMetrics[category]) {
+        additionalMetrics[category] = unit;
+      }
+    } else {
+      additionalMetrics[`${metricKey}Unit`] = unit;
+    }
+  }
+  additionalMetrics.modalityUnit = modalityUnit;
+  return additionalMetrics;
+}
+
+export { extractAllNUMGroups, restoreAdditionalMetrics };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.16";
+export declare const version = "4.15.18";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/adapters",
-  "version": "4.15.16",
+  "version": "4.15.18",
   "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -84,13 +84,13 @@
   "dependencies": {
     "@babel/runtime-corejs2": "7.26.10",
     "buffer": "6.0.3",
-    "dcmjs": "0.45.0",
+    "dcmjs": "0.48.0",
     "gl-matrix": "3.4.3",
     "ndarray": "1.0.19"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.15.16",
-    "@cornerstonejs/tools": "4.15.16"
+    "@cornerstonejs/core": "4.15.18",
+    "@cornerstonejs/tools": "4.15.18"
   },
-  "gitHead": "734dd7f5fd416c386d08d6ab2d17f44226add8e2"
+  "gitHead": "2198d2e21481dd9f7e77148f98693ef0c2e5bdbc"
 }