@cornerstonejs/adapters 4.11.1 → 4.11.3

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

@@ -2,7 +2,6 @@ import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 import { toArray } from '../helpers/toArray.js';
-import 'buffer';
 import '@cornerstonejs/core';
 
 const {

package/dist/esm/adapters/Cornerstone/MeasurementReport.js

@@ -1,7 +1,6 @@
 import { utilities, derivations, normalizers, data } from 'dcmjs';
 import { toArray } from '../helpers/toArray.js';
 import { codeMeaningEquals } from '../helpers/codeMeaningEquals.js';
-import 'buffer';
 import '@cornerstonejs/core';
 
 const {

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -2,7 +2,6 @@ import { utilities } from 'dcmjs';
 import { utilities as utilities$1 } from '@cornerstonejs/core';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 
 var _ArrowAnnotate;

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

@@ -1,7 +1,6 @@
 import CORNERSTONE_3D_TAG from './cornerstone3DTag.js';
 import MeasurementReport from './MeasurementReport.js';
 import 'dcmjs';
-import 'buffer';
 import { toScoords } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import { toArray } from '../helpers/toArray.js';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 import { scoordToWorld } from '../helpers/scoordToWorld.js';
 import BaseAdapter3D from './BaseAdapter3D.js';

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoords } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,6 +1,5 @@
 import { COMMENT_CODE, TEXT_ANNOTATION_POSITION } from './constants/index.js';
 import dcmjs from 'dcmjs';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoord } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,6 +1,6 @@
-import { type Types as CSTypes } from "@cornerstonejs/core";
-import type { Types } from "@cornerstonejs/tools";
-import LabelData from "./LabelData";
+import { type Types as CSTypes } from '@cornerstonejs/core';
+import type { Types } from '@cornerstonejs/tools';
+import LabelData from './LabelData';
 type Annotation = Types.Annotation;
 type SpatialCoordinatesState = {
     description?: string;
@@ -38,7 +38,7 @@ type SetupMeasurementData = {
     SCOORD3DGroup?: ScoordType;
     FrameOfReferenceUID?: string;
 };
-type SpatialCoordinatesData = Omit<SetupMeasurementData, "defaultState" | "NUMGroup"> & {
+type SpatialCoordinatesData = Omit<SetupMeasurementData, 'defaultState' | 'NUMGroup'> & {
     state: SpatialCoordinatesState;
 };
 export type AdapterOptions = {
@@ -76,7 +76,7 @@ export default class MeasurementReport {
             vr: string;
         };
         ImplementationClassUID: {
-            Value: any[];
+            Value: string[];
             vr: string;
         };
         ImplementationVersionName: {
@@ -85,10 +85,23 @@ export default class MeasurementReport {
         };
     };
     static generateDerivationSourceDataset: (instance: any) => {
+        StudyInstanceUID?: string;
+        SeriesInstanceUID?: string;
+        SeriesDescription?: string;
+        SeriesNumber?: number | string;
+        SeriesDate?: string;
+        SeriesTime?: string;
+        Modality?: string;
+        SOPInstanceUID?: string;
+        SOPClassUID?: string;
+        InstanceNumber?: string | number;
+        FrameOfReferenceUID?: string;
+        PerFrameFunctionalGroupsSequence?: CSTypes.FunctionalGroups[];
+        SharedFunctionalGroupsSequence?: CSTypes.FunctionalGroups;
         _meta: any;
         _vrMap: any;
     };
-    static processSCOORDGroup({ SCOORDGroup, toolType, sopInstanceUIDToImageIdMap, metadata }: {
+    static processSCOORDGroup({ SCOORDGroup, toolType, sopInstanceUIDToImageIdMap, metadata, }: {
         SCOORDGroup: any;
         toolType: any;
         sopInstanceUIDToImageIdMap: any;
@@ -122,17 +135,17 @@ export default class MeasurementReport {
             };
         };
     };
-    static processSCOORD3DGroup({ SCOORD3DGroup, toolType }: {
+    static processSCOORD3DGroup({ SCOORD3DGroup, toolType, }: {
         SCOORD3DGroup: any;
         toolType: any;
     }): SpatialCoordinatesData;
-    static getSpatialCoordinatesState({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, toolType }: {
+    static getSpatialCoordinatesState({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, toolType, }: {
         NUMGroup: any;
         sopInstanceUIDToImageIdMap: any;
         metadata: any;
         toolType: any;
     }): SpatialCoordinatesData;
-    static processSpatialCoordinatesGroup({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, findingGroup, findingSiteGroups, commentGroup, commentPositionGroup, toolType }: {
+    static processSpatialCoordinatesGroup({ NUMGroup, sopInstanceUIDToImageIdMap, metadata, findingGroup, findingSiteGroups, commentGroup, commentPositionGroup, toolType, }: {
         NUMGroup: any;
         sopInstanceUIDToImageIdMap: any;
         metadata: any;
@@ -156,7 +169,7 @@ export default class MeasurementReport {
         FrameOfReferenceUID: string;
     };
     static getSetupMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any, toolType: any): SetupMeasurementData;
-    static generateReferencedSOPSequence({ toolData, toolTypes, metadataProvider, imageId, sopInstanceUIDsToSeriesInstanceUIDMap, derivationSourceDatasets }: {
+    static generateReferencedSOPSequence({ toolData, toolTypes, metadataProvider, imageId, sopInstanceUIDsToSeriesInstanceUIDMap, derivationSourceDatasets, }: {
         toolData: any;
         toolTypes: any;
         metadataProvider: any;

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

@@ -1,18 +1,20 @@
 import { utilities as utilities$1, derivations, normalizers, data } from 'dcmjs';
-import { utilities, cache } from '@cornerstonejs/core';
+import { utilities, cache, Enums } from '@cornerstonejs/core';
 import CORNERSTONE_3D_TAG from './cornerstone3DTag.js';
 import { toArray } from '../helpers/toArray.js';
 import { codeMeaningEquals } from '../helpers/codeMeaningEquals.js';
-import 'buffer';
 import { copyStudyTags } from '../helpers/copyStudyTags.js';
 import { copySeriesTags } from '../helpers/copySeriesTags.js';
 import { scoordToWorld } from '../helpers/scoordToWorld.js';
 import { toPoint3 } from '../helpers/toPoint3.js';
 import CodingScheme from './CodingScheme.js';
-import { COMMENT_CODE, TEXT_ANNOTATION_POSITION, NO_IMAGE_ID } from './constants/index.js';
+import { COMMENT_CODE, TEXT_ANNOTATION_POSITION, metaSRAnnotation, NO_IMAGE_ID } from './constants/index.js';
 import LabelData from './LabelData.js';
 
 var _MeasurementReport;
+const {
+  MetadataModules
+} = Enums;
 const {
   TID1500,
   addAccessors
@@ -31,8 +33,8 @@ const {
   DicomMetaDictionary
 } = data;
 const FINDING = {
-  CodingSchemeDesignator: "DCM",
-  CodeValue: "121071"
+  CodingSchemeDesignator: 'DCM',
+  CodeValue: '121071'
 };
 const COMMENT = {
   CodingSchemeDesignator: COMMENT_CODE.schemeDesignator,
@@ -43,12 +45,12 @@ const COMMENT_POSITION = {
   CodeValue: TEXT_ANNOTATION_POSITION.value
 };
 const FINDING_SITE = {
-  CodingSchemeDesignator: "SCT",
-  CodeValue: "363698007"
+  CodingSchemeDesignator: 'SCT',
+  CodeValue: '363698007'
 };
 const FINDING_SITE_OLD = {
-  CodingSchemeDesignator: "SRT",
-  CodeValue: "G-C0E3"
+  CodingSchemeDesignator: 'SRT',
+  CodeValue: 'G-C0E3'
 };
 class MeasurementReport {
   static getTID300ContentItem(tool, ReferencedSOPSequence, toolClass, is3DMeasurement) {
@@ -91,27 +93,7 @@ class MeasurementReport {
     }
   }
   static generateDatasetMeta() {
-    const fileMetaInformationVersionArray = new Uint8Array(2);
-    fileMetaInformationVersionArray[1] = 1;
-    const _meta = {
-      FileMetaInformationVersion: {
-        Value: [fileMetaInformationVersionArray.buffer],
-        vr: "OB"
-      },
-      TransferSyntaxUID: {
-        Value: ["1.2.840.10008.1.2.1"],
-        vr: "UI"
-      },
-      ImplementationClassUID: {
-        Value: [DicomMetaDictionary.uid()],
-        vr: "UI"
-      },
-      ImplementationVersionName: {
-        Value: ["dcmjs"],
-        vr: "SH"
-      }
-    };
-    return _meta;
+    return metaSRAnnotation;
   }
   static processSCOORDGroup(_ref) {
     let {
@@ -128,7 +110,7 @@ class MeasurementReport {
       ReferencedFrameNumber = 1
     } = ReferencedSOPSequence;
     const referencedImageId = sopInstanceUIDToImageIdMap[`${ReferencedSOPInstanceUID}:${ReferencedFrameNumber}`];
-    const imagePlaneModule = metadata.get("imagePlaneModule", referencedImageId);
+    const imagePlaneModule = metadata.get('imagePlaneModule', referencedImageId);
     const annotationUID = DicomMetaDictionary.uid();
     return {
       SCOORDGroup,
@@ -201,8 +183,8 @@ class MeasurementReport {
       toolType
     } = _ref3;
     const contentSequenceArr = toArray(NUMGroup.ContentSequence);
-    const SCOORDGroup = contentSequenceArr.find(group => group.ValueType === "SCOORD");
-    const SCOORD3DGroup = contentSequenceArr.find(group => group.ValueType === "SCOORD3D");
+    const SCOORDGroup = contentSequenceArr.find(group => group.ValueType === 'SCOORD');
+    const SCOORD3DGroup = contentSequenceArr.find(group => group.ValueType === 'SCOORD3D');
     const result = SCOORD3DGroup && this.processSCOORD3DGroup({
       SCOORD3DGroup,
       toolType
@@ -213,7 +195,7 @@ class MeasurementReport {
       sopInstanceUIDToImageIdMap
     });
     if (!result) {
-      throw new Error("No spatial coordinates group found.");
+      throw new Error('No spatial coordinates group found.');
     }
     return result;
   }
@@ -291,8 +273,8 @@ class MeasurementReport {
     const commentGroup = contentSequenceArr.find(group => this.codeValueMatch(group, COMMENT));
     const commentPositionGroup = contentSequenceArr.find(group => this.codeValueMatch(group, COMMENT_POSITION));
     const findingSiteGroups = contentSequenceArr.filter(group => this.codeValueMatch(group, FINDING_SITE, FINDING_SITE_OLD)) || [];
-    const NUMGroup = contentSequenceArr.find(group => group.ValueType === "NUM") || {
-      ContentSequence: contentSequenceArr.filter(group => group.ValueType === "SCOORD" || group.ValueType === "SCOORD3D")
+    const NUMGroup = contentSequenceArr.find(group => group.ValueType === 'NUM') || {
+      ContentSequence: contentSequenceArr.filter(group => group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D')
     };
     const spatialGroup = this.processSpatialCoordinatesGroup({
       NUMGroup,
@@ -335,8 +317,8 @@ class MeasurementReport {
       toolData,
       toolTypes
     }) : imageId;
-    const sopCommonModule = metadataProvider.get("sopCommonModule", effectiveImageId);
-    const instance = metadataProvider.get("instance", effectiveImageId);
+    const sopCommonModule = metadataProvider.get('sopCommonModule', effectiveImageId);
+    const instance = metadataProvider.get('instance', effectiveImageId);
     const {
       sopInstanceUID,
       sopClassUID
@@ -349,7 +331,7 @@ class MeasurementReport {
       const derivationSourceDataset = MeasurementReport.generateDerivationSourceDataset(instance);
       derivationSourceDatasets.push(derivationSourceDataset);
     }
-    const frameNumber = metadataProvider.get("frameNumber", effectiveImageId);
+    const frameNumber = metadataProvider.get('frameNumber', effectiveImageId);
     const ReferencedSOPSequence = {
       ReferencedSOPClassUID: sopClassUID,
       ReferencedSOPInstanceUID: sopInstanceUID,
@@ -414,7 +396,11 @@ class MeasurementReport {
     });
     report.dataset = Object.assign(report.dataset, contentItem);
     report.dataset._meta = _meta;
-    report.SpecificCharacterSet = "ISO_IR 192";
+    report.SpecificCharacterSet = 'ISO_IR 192';
+    report.dataset.InstanceNumber ||= options.InstanceNumber || 1;
+    if (options.predecessorImageId) {
+      Object.assign(report.dataset, metadataProvider.get(MetadataModules.PREDECESSOR_SEQUENCE, options.predecessorImageId));
+    }
     if (is3DSR) {
       report.dataset.SOPClassUID = DicomMetaDictionary.sopClassUIDsByName.Comprehensive3DSR;
       if (!report.dataset.SOPClassUID) {
@@ -424,13 +410,16 @@ class MeasurementReport {
     return report;
   }
   static generateToolState(dataset, sopInstanceUIDToImageIdMap, metadata, hooks) {
-    if (dataset.ContentTemplateSequence.TemplateIdentifier !== "1500") {
-      throw new Error("This package can currently only interpret DICOM SR TID 1500");
+    if (dataset.ContentTemplateSequence.TemplateIdentifier !== '1500') {
+      throw new Error('This package can currently only interpret DICOM SR TID 1500');
     }
-    const REPORT = "Imaging Measurements";
-    const GROUP = "Measurement Group";
-    const TRACKING_IDENTIFIER = "Tracking Identifier";
-    const TRACKING_UNIQUE_IDENTIFIER = "Tracking Unique Identifier";
+    const REPORT = 'Imaging Measurements';
+    const GROUP = 'Measurement Group';
+    const TRACKING_IDENTIFIER = 'Tracking Identifier';
+    const TRACKING_UNIQUE_IDENTIFIER = 'Tracking Unique Identifier';
+    const {
+      imageId: predecessorImageId
+    } = dataset;
     const imagingMeasurementContent = toArray(dataset.ContentSequence).find(codeMeaningEquals(REPORT));
     const measurementGroups = toArray(imagingMeasurementContent.ContentSequence).filter(codeMeaningEquals(GROUP));
     const measurementData = {};
@@ -447,13 +436,14 @@ class MeasurementReport {
         if (toolAdapter) {
           const measurement = toolAdapter.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata, trackingIdentifierValue);
           measurement.TrackingUniqueIdentifier = trackingUniqueIdentifierValue;
+          measurement.predecessorImageId = predecessorImageId;
           console.log(`=== ${toolAdapter.toolType} ===`);
           console.log(measurement);
           measurementData[toolAdapter.toolType] ||= [];
           measurementData[toolAdapter.toolType].push(measurement);
         }
       } catch (e) {
-        console.warn("Unable to generate tool state for", measurementGroup, e);
+        console.warn('Unable to generate tool state for', measurementGroup, e);
       }
     });
     return measurementData;
@@ -465,7 +455,7 @@ class MeasurementReport {
       if (!replace) {
         throw new Error(`The registered tool name ${registerName} already exists in adapters, use a different toolType or use replace`);
       }
-      if (typeof replace === "function") {
+      if (typeof replace === 'function') {
         replace(this.measurementAdapterByToolType.get(registerName));
       }
     }

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

@@ -2,7 +2,6 @@ import MeasurementReport from './MeasurementReport.js';
 import { utilities } from 'dcmjs';
 import { vec3 } from 'gl-matrix';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoords } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

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

@@ -1,7 +1,6 @@
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
-import 'buffer';
 import { toScoords } from '../helpers/toScoordType.js';
 import '@cornerstonejs/core';
 

package/dist/esm/adapters/Cornerstone3D/RTStruct/RTSS.d.ts

@@ -1,67 +1,10 @@
-declare function generateRTSSFromSegmentations(segmentations: any, metadataProvider: any, DicomMetadataStore: any): Promise<{
-    StudyInstanceUID: any;
-    SOPClassUID: string;
-    SOPInstanceUID: any;
-    Manufacturer: string;
-    Modality: string;
-    FrameOfReferenceUID: any;
-    PositionReferenceIndicator: string;
-    StructureSetLabel: any;
-    StructureSetName: any;
-    ReferringPhysicianName: string;
-    OperatorsName: string;
-    StructureSetDate: any;
-    StructureSetTime: any;
-    _meta: any;
-    SeriesInstanceUID: any;
-    SeriesNumber: string;
-    PatientID: any;
-    PatientName: any;
-    PatientBirthDate: string;
-    PatientAge: any;
-    PatientSex: any;
-    PatientWeight: any;
-    StudyDate: any;
-    StudyTime: any;
-    StudyID: string;
-    AccessionNumber: any;
-    StructureSetROISequence: any[];
-    ROIContourSequence: any[];
-    RTROIObservationsSequence: any[];
-    ReferencedSeriesSequence: any[];
-    ReferencedFrameOfReferenceSequence: any[];
-}>;
-declare function generateRTSSFromAnnotations(annotations: any, metadataProvider: any, DicomMetadataStore: any): {
-    StudyInstanceUID: any;
-    SOPClassUID: string;
-    SOPInstanceUID: any;
-    Manufacturer: string;
-    Modality: string;
-    FrameOfReferenceUID: any;
-    PositionReferenceIndicator: string;
-    StructureSetLabel: any;
-    StructureSetName: any;
-    ReferringPhysicianName: string;
-    OperatorsName: string;
-    StructureSetDate: any;
-    StructureSetTime: any;
-    _meta: any;
-    SeriesInstanceUID: any;
-    SeriesNumber: string;
-    PatientID: any;
-    PatientName: any;
-    PatientBirthDate: string;
-    PatientAge: any;
-    PatientSex: any;
-    PatientWeight: any;
-    StudyDate: any;
-    StudyTime: any;
-    StudyID: string;
-    AccessionNumber: any;
-    StructureSetROISequence: any[];
-    ROIContourSequence: any[];
-    RTROIObservationsSequence: any[];
-    ReferencedSeriesSequence: any[];
-    ReferencedFrameOfReferenceSequence: any[];
-};
-export { generateRTSSFromSegmentations, generateRTSSFromAnnotations };
+import type { Types } from '@cornerstonejs/core';
+import type { Types as ToolTypes } from '@cornerstonejs/tools';
+import '../../../utilities/referencedMetadataProvider';
+type Segmentation = ToolTypes.Segmentation;
+export declare function generateRTSSFromSegmentations(segmentation: Segmentation, metadataProvider: any, _DicomMetadataStore: any): Promise<Types.RtssModule>;
+export declare function generateRTSSFromLabelmap(segmentations: Segmentation, options: any): Promise<Types.RtssModule>;
+export declare function generateRTSSFromAnnotations(segmentations: any, annotations: any, options: any): Types.RtssModule;
+export declare function generateRTSSFromContour(segmentations: Segmentation, options: any): Types.RtssModule;
+export declare function generateRTSSFromRepresentation(segmentations: Segmentation, options?: {}): Types.RtssModule | Promise<Types.RtssModule>;
+export {};