This commit is contained in:
1 parent
c59d66412f
commit
b04e186274
16 files changed
+463
-99
No files matched your search
@@ -1,4 +1,5 @@
|
||||
export default {
|
||||
TEXT: 'TEXT',
|
||||
POINT: 'POINT',
|
||||
MULTIPOINT: 'MULTIPOINT',
|
||||
POLYLINE: 'POLYLINE',
|
||||
|
||||
@@ -18,7 +18,7 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
|
||||
const { ContentSequence } = firstInstance;
|
||||
|
||||
srDisplaySet.referencedImages = getReferencedImagesList(ContentSequence);
|
||||
srDisplaySet.measurements = getMeasurements(ContentSequence, srDisplaySet);
|
||||
srDisplaySet.measurements = getMeasurements(ContentSequence);
|
||||
const mappings = MeasurementService.getSourceMappings(
|
||||
'CornerstoneTools',
|
||||
'4'
|
||||
@@ -127,6 +127,7 @@ const checkIfCanAddMeasurementsToDisplaySet = (
|
||||
|
||||
const imageIds = images.map(i => i.getImageId());
|
||||
const SOPInstanceUIDs = images.map(i => i.SOPInstanceUID);
|
||||
imageDisplaySet.SRLabels = [];
|
||||
measurements.forEach(measurement => {
|
||||
const { coords } = measurement;
|
||||
|
||||
@@ -140,6 +141,21 @@ const checkIfCanAddMeasurementsToDisplaySet = (
|
||||
if (imageIndex > -1) {
|
||||
const imageId = imageIds[imageIndex];
|
||||
const imageMetadata = images[imageIndex].getData().metadata;
|
||||
|
||||
const coords = measurement.coords;
|
||||
for (let i = 0; i < coords.length; i++) {
|
||||
const coord = coords[i];
|
||||
if (coord.GraphicType !== 'TEXT') {
|
||||
continue;
|
||||
}
|
||||
|
||||
imageDisplaySet.SRLabels.push({
|
||||
ReferencedSOPInstanceUID:
|
||||
coord.ReferencedSOPSequence.ReferencedSOPInstanceUID,
|
||||
labels: measurement.labels[i],
|
||||
});
|
||||
}
|
||||
|
||||
addMeasurement(
|
||||
measurement,
|
||||
imageId,
|
||||
|
||||
@@ -1,22 +1,14 @@
|
||||
const getCoordsFromSCOORDOrSCOORD3D = (graphicItem, displaySet) => {
|
||||
const { ValueType, RelationshipType, GraphicType, GraphicData } = graphicItem;
|
||||
|
||||
// if (RelationshipType !== RELATIONSHIP_TYPE.INFERRED_FROM) {
|
||||
// console.warn(
|
||||
// `Relationshiptype === ${RelationshipType}. Cannot deal with NON TID-1400 SCOORD group with RelationshipType !== "INFERRED FROM."`
|
||||
// );
|
||||
// return;
|
||||
// }
|
||||
|
||||
const getCoordsFromSCOORDOrSCOORD3D = graphicItem => {
|
||||
const { ValueType, GraphicType, GraphicData } = graphicItem;
|
||||
const coords = { ValueType, GraphicType, GraphicData };
|
||||
|
||||
// ContentSequence has length of 1 as RelationshipType === 'INFERRED FROM'
|
||||
if (ValueType === 'SCOORD') {
|
||||
const { ReferencedSOPSequence } = graphicItem.ContentSequence;
|
||||
coords.ReferencedSOPSequence = ReferencedSOPSequence;
|
||||
} else if (ValueType === 'SCOORD3D') {
|
||||
if (graphicItem.ReferencedFrameOfReferenceUID) {
|
||||
coords.ReferencedFrameOfReferenceSequence = graphicItem.ReferencedFrameOfReferenceUID;
|
||||
coords.ReferencedFrameOfReferenceSequence =
|
||||
graphicItem.ReferencedFrameOfReferenceUID;
|
||||
} else if (graphicItem.ContentSequence) {
|
||||
const {
|
||||
ReferencedFrameOfReferenceSequence,
|
||||
|
||||
@@ -3,10 +3,7 @@ import getSequenceAsArray from './getSequenceAsArray';
|
||||
import getMergedContentSequencesByTrackingUniqueIdentifiers from './getMergedContentSequencesByTrackingUniqueIdentifiers';
|
||||
import processMeasurement from './processMeasurement';
|
||||
|
||||
const getMeasurements = (
|
||||
ImagingMeasurementReportContentSequence,
|
||||
displaySet
|
||||
) => {
|
||||
const getMeasurements = ImagingMeasurementReportContentSequence => {
|
||||
const ImagingMeasurements = ImagingMeasurementReportContentSequence.find(
|
||||
item =>
|
||||
item.ConceptNameCodeSequence.CodeValue ===
|
||||
@@ -21,25 +18,19 @@ const getMeasurements = (
|
||||
CodeNameCodeSequenceValues.MeasurementGroup
|
||||
);
|
||||
|
||||
const mergedContentSequencesByTrackingUniqueIdentifiers = getMergedContentSequencesByTrackingUniqueIdentifiers(
|
||||
/* const mergedContentSequencesByTrackingUniqueIdentifiers = getMergedContentSequencesByTrackingUniqueIdentifiers(
|
||||
MeasurementGroups
|
||||
);
|
||||
);*/
|
||||
|
||||
let measurements = [];
|
||||
|
||||
Object.keys(mergedContentSequencesByTrackingUniqueIdentifiers).forEach(
|
||||
trackingUniqueIdentifier => {
|
||||
const mergedContentSequence =
|
||||
mergedContentSequencesByTrackingUniqueIdentifiers[
|
||||
trackingUniqueIdentifier
|
||||
];
|
||||
|
||||
const measurement = processMeasurement(mergedContentSequence, displaySet);
|
||||
if (measurement) {
|
||||
measurements.push(measurement);
|
||||
}
|
||||
MeasurementGroups.forEach(MeasurementGroup => {
|
||||
const contentSequence = MeasurementGroup.ContentSequence;
|
||||
const measurement = processMeasurement(contentSequence);
|
||||
if (measurement) {
|
||||
measurements.push(measurement);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
return measurements;
|
||||
};
|
||||
|
||||
@@ -57,6 +57,10 @@ const getRenderableData = (
|
||||
|
||||
// https://dicom.innolitics.com/ciods/procedure-log/sr-document-content/00700023
|
||||
switch (GraphicType) {
|
||||
case SCOORD_TYPES.TEXT:
|
||||
renderableData = [{ x: GraphicData[0], y: GraphicData[1] }];
|
||||
|
||||
break;
|
||||
case SCOORD_TYPES.POINT:
|
||||
renderableData = [];
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import processTID1410Measurement from './processTID1410Measurement';
|
||||
import processNonGeometricallyDefinedMeasurement from './processNonGeometricallyDefinedMeasurement';
|
||||
|
||||
const processMeasurement = (mergedContentSequence, displaySet) => {
|
||||
const processMeasurement = contentSequence => {
|
||||
if (
|
||||
mergedContentSequence.some(
|
||||
contentSequence.some(
|
||||
group => group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D'
|
||||
)
|
||||
) {
|
||||
return processTID1410Measurement(mergedContentSequence, displaySet);
|
||||
return processTID1410Measurement(contentSequence);
|
||||
}
|
||||
|
||||
return processNonGeometricallyDefinedMeasurement(mergedContentSequence);
|
||||
return processNonGeometricallyDefinedMeasurement(contentSequence);
|
||||
};
|
||||
|
||||
export default processMeasurement;
|
||||
+46
-6
@@ -1,31 +1,40 @@
|
||||
import getLabelFromMeasuredValueSequence from './getLabelFromMeasuredValueSequence';
|
||||
import getCoordsFromSCOORDOrSCOORD3D from './getCoordsFromSCOORDOrSCOORD3D';
|
||||
import { CodeNameCodeSequenceValues, CodingSchemeDesignators } from '../enums';
|
||||
import SCOORD_TYPES from '../constants/scoordTypes';
|
||||
|
||||
const CORNERSTONE_FREETEXT_CODE_VALUE = 'CORNERSTONEFREETEXT';
|
||||
|
||||
const processNonGeometricallyDefinedMeasurement = mergedContentSequence => {
|
||||
const NUMContentItems = mergedContentSequence.filter(
|
||||
const processNonGeometricallyDefinedMeasurement = contentSequence => {
|
||||
const NUMContentItems = contentSequence.filter(
|
||||
group => group.ValueType === 'NUM'
|
||||
);
|
||||
|
||||
const UIDREFContentItem = mergedContentSequence.find(
|
||||
const CODEContentItems = contentSequence.filter(
|
||||
group => group.ValueType === 'CODE'
|
||||
);
|
||||
|
||||
const UIDREFContentItem = contentSequence.find(
|
||||
group => group.ValueType === 'UIDREF'
|
||||
);
|
||||
|
||||
const TrackingIdentifierContentItem = mergedContentSequence.find(
|
||||
const IMAGEContentItem = contentSequence.find(
|
||||
group => group.ValueType === 'IMAGE'
|
||||
);
|
||||
|
||||
const TrackingIdentifierContentItem = contentSequence.find(
|
||||
item =>
|
||||
item.ConceptNameCodeSequence.CodeValue ===
|
||||
CodeNameCodeSequenceValues.TrackingIdentifier
|
||||
);
|
||||
|
||||
const Finding = mergedContentSequence.find(
|
||||
const Finding = contentSequence.find(
|
||||
item =>
|
||||
item.ConceptNameCodeSequence.CodeValue ===
|
||||
CodeNameCodeSequenceValues.Finding
|
||||
);
|
||||
|
||||
const FindingSites = mergedContentSequence.filter(
|
||||
const FindingSites = contentSequence.filter(
|
||||
item =>
|
||||
item.ConceptNameCodeSequence.CodingSchemeDesignator ===
|
||||
CodingSchemeDesignators.SRT &&
|
||||
@@ -111,6 +120,37 @@ const processNonGeometricallyDefinedMeasurement = mergedContentSequence => {
|
||||
}
|
||||
});
|
||||
|
||||
if (NUMContentItems.length === 0 && IMAGEContentItem) {
|
||||
CODEContentItems.forEach(item => {
|
||||
const { ConceptCodeSequence, ConceptNameCodeSequence } = item;
|
||||
|
||||
if (!ConceptCodeSequence || !ConceptNameCodeSequence) {
|
||||
console.warn(`Graphic missing, skipping annotation.`);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const GraphicData = [0, 0];
|
||||
const GraphicType = SCOORD_TYPES.TEXT;
|
||||
const { ValueType } = item;
|
||||
const ReferencedSOPSequence = IMAGEContentItem.ReferencedSOPSequence;
|
||||
const coord = {
|
||||
ValueType,
|
||||
GraphicType,
|
||||
GraphicData,
|
||||
ReferencedSOPSequence,
|
||||
};
|
||||
measurement.coords.push(coord);
|
||||
measurement.labels.push({
|
||||
label: ConceptNameCodeSequence.CodeMeaning,
|
||||
labelCodingSchemeDesignator:
|
||||
ConceptNameCodeSequence.CodingSchemeDesignator,
|
||||
value: ConceptCodeSequence.CodeMeaning,
|
||||
valueCodingSchemeDesignator: ConceptCodeSequence.CodingSchemeDesignator,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
return measurement;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,14 +5,14 @@ import { RELATIONSHIP_TYPE, CodeNameCodeSequenceValues } from '../enums';
|
||||
/**
|
||||
* TID 1410 Planar ROI Measurements and Qualitative Evaluations.
|
||||
*
|
||||
* @param {*} mergedContentSequence
|
||||
* @param {*} contentSequence
|
||||
* @returns
|
||||
*/
|
||||
const processTID1410Measurement = (mergedContentSequence, displaySet) => {
|
||||
const processTID1410Measurement = contentSequence => {
|
||||
// Need to deal with TID 1410 style measurements, which will have a SCOORD or SCOORD3D at the top level,
|
||||
// And non-geometric representations where each NUM has "INFERRED FROM" SCOORD/SCOORD3D
|
||||
|
||||
const graphicItem = mergedContentSequence.find(
|
||||
const graphicItem = contentSequence.find(
|
||||
group => group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D'
|
||||
);
|
||||
|
||||
@@ -23,24 +23,24 @@ const processTID1410Measurement = (mergedContentSequence, displaySet) => {
|
||||
return;
|
||||
}
|
||||
|
||||
const UIDREFContentItem = mergedContentSequence.find(
|
||||
const UIDREFContentItem = contentSequence.find(
|
||||
group => group.ValueType === 'UIDREF'
|
||||
);
|
||||
|
||||
const TrackingIdentifierContentItem = mergedContentSequence.find(
|
||||
const TrackingIdentifierContentItem = contentSequence.find(
|
||||
item =>
|
||||
item.ConceptNameCodeSequence.CodeValue ===
|
||||
CodeNameCodeSequenceValues.TrackingIdentifier
|
||||
);
|
||||
|
||||
const NUMContentItems = mergedContentSequence.filter(
|
||||
const NUMContentItems = contentSequence.filter(
|
||||
group => group.ValueType === 'NUM'
|
||||
);
|
||||
|
||||
const measurement = {
|
||||
loaded: false,
|
||||
labels: [],
|
||||
coords: [getCoordsFromSCOORDOrSCOORD3D(graphicItem, displaySet)],
|
||||
coords: [getCoordsFromSCOORDOrSCOORD3D(graphicItem)],
|
||||
TrackingUniqueIdentifier: UIDREFContentItem.UID,
|
||||
TrackingIdentifier: TrackingIdentifierContentItem.TextValue,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user