IDC Re #2656: update dcmjs 0.19.4 and change tol to 0.01. + fix boundary cases in parseSCOORD3D (#2699)

* IDC: update dcmjs to version 0.19.4

* IDC Re #2656: change tol to 0.01 for segs in dcmjs. + fix boundary cases in parseSCOORD3D
This commit is contained in:
Davide Punzo authored and GitHub committed 2022-02-03 18:08:05 +01:00
1 parent 6e3a58931a
commit c554c5fac2
13 files changed
+42 -19

No files matched your search

@@ -28,7 +28,13 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
srDisplaySet.isLoaded = true;
const imageDisplaySets = displaySets.filter(ds => ds.Modality !== 'SR');
const imageDisplaySets = displaySets.filter(
ds =>
ds.Modality !== 'SR' &&
ds.Modality !== 'SEG' &&
ds.Modality !== 'RTSTRUCT' &&
ds.Modality !== 'RTDOSE'
);
imageDisplaySets.forEach(imageDisplaySet => {
// Check currently added displaySets and add measurements if the sources exist.
checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, imageDisplaySet);
@@ -24,12 +24,17 @@ const getReferencedImagesList = ImagingMeasurementReportContentSequence => {
getSequenceAsArray(ImageLibraryGroup.ContentSequence).forEach(item => {
const { ReferencedSOPSequence } = item;
const {
ReferencedSOPClassUID,
ReferencedSOPInstanceUID,
} = ReferencedSOPSequence;
if (ReferencedSOPSequence) {
const {
ReferencedSOPClassUID,
ReferencedSOPInstanceUID,
} = ReferencedSOPSequence;
referencedImages.push({ ReferencedSOPClassUID, ReferencedSOPInstanceUID });
referencedImages.push({
ReferencedSOPClassUID,
ReferencedSOPInstanceUID,
});
}
});
return referencedImages;
@@ -79,6 +79,12 @@ const processNonGeometricallyDefinedMeasurement = mergedContentSequence => {
MeasuredValueSequence,
} = item;
if (!ContentSequence) {
console.warn(`Graphic ${ContentSequence} missing, skipping annotation.`);
return;
}
const { ValueType } = ContentSequence;
if (!ValueType === 'SCOORD' && !ValueType === 'SCOORD3D') {