@cornerstonejs/adapters 3.7.5 → 3.7.7

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

@@ -3,7 +3,7 @@ import ndarray from 'ndarray';
 import getDatasetsFromImages from '../helpers/getDatasetsFromImages.js';
 import checkOrientation from '../helpers/checkOrientation.js';
 import compareArrays from '../helpers/compareArrays.js';
-import Events from '../enums/Events.js';
+import { Events } from '../enums/Events.js';
 
 const {
   rotateDirectionCosinesInPlane,
@@ -893,7 +893,14 @@ function getImageIdOfSourceImageBySourceImageSequence(SourceImageSequence, sopUI
     ReferencedSOPInstanceUID,
     ReferencedFrameNumber
   } = SourceImageSequence;
-  return ReferencedFrameNumber ? getImageIdOfReferencedFrame(ReferencedSOPInstanceUID, ReferencedFrameNumber, sopUIDImageIdIndexMap) : sopUIDImageIdIndexMap[ReferencedSOPInstanceUID];
+  const imageId = sopUIDImageIdIndexMap[ReferencedSOPInstanceUID];
+  if (imageId) {
+    return imageId;
+  }
+  if (ReferencedFrameNumber) {
+    return getImageIdOfReferencedFrame(ReferencedSOPInstanceUID, ReferencedFrameNumber, sopUIDImageIdIndexMap);
+  }
+  return undefined;
 }
 
 /**

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

@@ -39,7 +39,10 @@ export default class MeasurementReport {
             vr: string;
         };
     };
-    static generateDerivationSourceDataset: (instance: any) => any;
+    static generateDerivationSourceDataset: (instance: any) => {
+        _meta: any;
+        _vrMap: any;
+    };
     static getSetupMeasurementData(MeasurementGroup: any, sopInstanceUIDToImageIdMap: any, metadata: any, toolType: any): {
         defaultState: {
             description: any;

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

@@ -3,6 +3,7 @@ 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 CodingScheme from './CodingScheme.js';
 
 var _MeasurementReport;
@@ -282,15 +283,8 @@ _MeasurementReport.codeValueMatch = (group, code, oldCode) => {
   return CodingSchemeDesignator == code.CodingSchemeDesignator && CodeValue == code.CodeValue || oldCode && CodingSchemeDesignator == oldCode.CodingSchemeDesignator && CodeValue == oldCode.CodeValue;
 };
 _MeasurementReport.generateDerivationSourceDataset = instance => {
-  const _vrMap = {
-    PixelData: "OW"
-  };
-  const _meta = _MeasurementReport.generateDatasetMeta();
-  const derivationSourceDataset = {
-    ...instance,
-    _meta: _meta,
-    _vrMap: _vrMap
-  };
+  _MeasurementReport.generateDatasetMeta();
+  const derivationSourceDataset = copyStudyTags(instance);
   return derivationSourceDataset;
 };
 

package/dist/esm/adapters/Cornerstone3D/Segmentation/labelmapImagesFromBuffer.js

@@ -5,7 +5,7 @@ import ndarray from 'ndarray';
 import checkOrientation from '../../helpers/checkOrientation.js';
 import { getValidOrientations, getSegmentMetadata, unpackPixelData, calculateCentroid, readFromUnpackedChunks, alignPixelDataWithSourceData, getSegmentIndex, findReferenceSourceImageId } from '../../Cornerstone/Segmentation_4X.js';
 import { compactMergeSegmentDataWithoutInformationLoss } from './compactMergeSegData.js';
-import Events from '../../enums/Events.js';
+import { Events } from '../../enums/Events.js';
 
 const {
   DicomMessage,

package/dist/esm/adapters/enums/Events.d.ts

@@ -1,4 +1,4 @@
-declare enum Events {
+export declare enum Events {
     SEGMENTATION_LOAD_PROGRESS = "CORNERSTONE_ADAPTER_SEGMENTATION_LOAD_PROGRESS"
 }
 export default Events;

package/dist/esm/adapters/enums/Events.js

@@ -2,6 +2,5 @@ var Events;
 (function (Events) {
   Events["SEGMENTATION_LOAD_PROGRESS"] = "CORNERSTONE_ADAPTER_SEGMENTATION_LOAD_PROGRESS";
 })(Events || (Events = {}));
-var Events$1 = Events;
 
-export { Events$1 as default };
+export { Events };

package/dist/esm/adapters/enums/index.d.ts

@@ -1,2 +1 @@
-import Events from "./Events";
-export { Events };
+export * from "./Events";

package/dist/esm/adapters/enums/index.js

@@ -1 +1 @@
-export { default as Events } from './Events.js';
+export { Events } from './Events.js';

package/dist/esm/adapters/helpers/copyStudyTags.d.ts

@@ -0,0 +1,7 @@
+export declare const patientTags: string[];
+export declare const studyTags: string[];
+export declare const patientStudyTags: string[];
+export declare function copyStudyTags(src: any): {
+    _meta: any;
+    _vrMap: any;
+};

package/dist/esm/adapters/helpers/copyStudyTags.js

@@ -0,0 +1,19 @@
+const patientTags = ["PatientName", "PatientID", "PatientBirthDate", "PatientBirthTime", "PatientID", "IssuerOfPatientID", "OtherPatientIDs", "OtherPatientIDsSequence", "PatientSex", "PatientIdentityRemoved", "DeidentificationMethodCodeSequence"];
+const studyTags = ["StudyDate", "StudyTime", "StudyStatusID", "StudyPriorityID", "StudyInstanceUID", "StudyDescription", "AccessionNumber", "StudyID", "ReferringPhysicianName", "BodyPartExamined", "TimezoneOffsetFromUTC"];
+const patientStudyTags = [...patientTags, ...studyTags];
+function copyStudyTags(src) {
+  const study = {
+    _meta: src._meta,
+    _vrMap: src._vrMap
+  };
+  for (const tagKey of patientStudyTags) {
+    const value = src[tagKey];
+    if (value === undefined) {
+      continue;
+    }
+    study[tagKey] = value;
+  }
+  return study;
+}
+
+export { copyStudyTags, patientStudyTags, patientTags, studyTags };

package/dist/esm/adapters/helpers/index.d.ts

@@ -2,4 +2,5 @@ import { toArray } from "./toArray";
 import { codeMeaningEquals } from "./codeMeaningEquals";
 import { graphicTypeEquals } from "./graphicTypeEquals";
 import { downloadDICOMData } from "./downloadDICOMData";
+export { copyStudyTags } from "./copyStudyTags";
 export { toArray, codeMeaningEquals, graphicTypeEquals, downloadDICOMData };

package/dist/esm/adapters/helpers/index.js

@@ -2,3 +2,4 @@ export { toArray } from './toArray.js';
 export { codeMeaningEquals } from './codeMeaningEquals.js';
 export { graphicTypeEquals } from './graphicTypeEquals.js';
 export { downloadDICOMData } from './downloadDICOMData.js';
+export { copyStudyTags } from './copyStudyTags.js';

package/dist/esm/index.d.ts

@@ -1,2 +1 @@
-import { Enums, adaptersSR, adaptersSEG, adaptersPMAP, adaptersRT, helpers } from "./adapters";
-export { adaptersSR, adaptersSEG, adaptersPMAP, adaptersRT, Enums, helpers };
+export * from "./adapters";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.7.5",
+    "version": "3.7.7",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -84,8 +84,8 @@
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.7.5",
-        "@cornerstonejs/tools": "^3.7.5"
+        "@cornerstonejs/core": "^3.7.7",
+        "@cornerstonejs/tools": "^3.7.7"
     },
-    "gitHead": "81632a9aae1c17f5de5d3a6c59d448960c4f7804"
+    "gitHead": "7ed61217915130914035998986ae22e05af1a4ea"
 }