* added utilities to get frameNumber from imageId and add frameNumber to per-frame instance copy * Fix measurements' display texts on the Measurements Panel to have the correct instance number and frame number * fixed minor React bugs (errors on console) * fixed React's console bugs that are logged for some series that doesn't have "description" * bug fix - multi-frame files was not loading frames correctly. It was loading Frame 1 twice, and not loading the last frame. Due to wrong frame number indexing (frame number begins with 1, not 0) * metadata parser fix - providing default values of imagePlaneModule * measurement SR support on multi-frame DICOM * bug fix - jumping to the selected measurment on multi-frame DICOM * upgrade dcmjs dependency to 2.8.1 * StudySummary component - allow "description" to be null * make getUIDsFromImageID() method public from MetadataProvider * imageId usage fixes to be more stable * change the variable name to be more meaningful * fix metaProvider importing * for(...of) instead of for(i=0;i<length;..) as that doesn't assume anything about the layout/design and just gets next until done. * use Array.findIndex instead of plain for loop * use ReferencedSOPSequence[0] - because the ReferencedSOPSequence is an array that happens to have attributes of child zero when of length 1, but you shouldn't count on that. * DisplaySetService.getDisplaySetForSOPInstanceUID() - added optional frameNumber parameter for future usage : now they are just ignored as we are not supporting multiframe splits * simple code refactoring * refactoring for checking undefined values - mappedAnnotations * remove unreachable code * code refactoring - prefer conditional chaining * fix how we access imageIds of viewport (StackViewport)
209 lines
5.2 KiB
JavaScript
209 lines
5.2 KiB
JavaScript
import { annotation } from '@cornerstonejs/tools';
|
|
|
|
import SUPPORTED_TOOLS from './constants/supportedTools';
|
|
import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
|
|
import { utils } from '@ohif/core';
|
|
|
|
const Bidirectional = {
|
|
toAnnotation: measurement => {},
|
|
toMeasurement: (
|
|
csToolsEventDetail,
|
|
DisplaySetService,
|
|
CornerstoneViewportService,
|
|
getValueTypeFromToolType
|
|
) => {
|
|
const { annotation, viewportId } = csToolsEventDetail;
|
|
const { metadata, data, annotationUID } = annotation;
|
|
|
|
if (!metadata || !data) {
|
|
console.warn('Length tool: Missing metadata or data');
|
|
return null;
|
|
}
|
|
|
|
const { toolName, referencedImageId, FrameOfReferenceUID } = metadata;
|
|
const validToolType = SUPPORTED_TOOLS.includes(toolName);
|
|
|
|
if (!validToolType) {
|
|
throw new Error('Tool not supported');
|
|
}
|
|
|
|
const {
|
|
SOPInstanceUID,
|
|
SeriesInstanceUID,
|
|
StudyInstanceUID,
|
|
} = getSOPInstanceAttributes(
|
|
referencedImageId,
|
|
CornerstoneViewportService,
|
|
viewportId
|
|
);
|
|
|
|
let displaySet;
|
|
|
|
if (SOPInstanceUID) {
|
|
displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
|
|
SOPInstanceUID,
|
|
SeriesInstanceUID
|
|
);
|
|
} else {
|
|
displaySet = DisplaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
|
|
}
|
|
|
|
const { points } = data.handles;
|
|
|
|
const mappedAnnotations = getMappedAnnotations(
|
|
annotation,
|
|
DisplaySetService
|
|
);
|
|
|
|
const displayText = getDisplayText(mappedAnnotations, displaySet);
|
|
const getReport = () =>
|
|
_getReport(mappedAnnotations, points, FrameOfReferenceUID);
|
|
|
|
return {
|
|
uid: annotationUID,
|
|
SOPInstanceUID,
|
|
FrameOfReferenceUID,
|
|
points,
|
|
metadata,
|
|
referenceSeriesUID: SeriesInstanceUID,
|
|
referenceStudyUID: StudyInstanceUID,
|
|
frameNumber: mappedAnnotations[0]?.frameNumber || 1,
|
|
toolName: metadata.toolName,
|
|
displaySetInstanceUID: displaySet.displaySetInstanceUID,
|
|
label: data.label,
|
|
displayText: displayText,
|
|
data: data.cachedStats,
|
|
type: getValueTypeFromToolType(toolName),
|
|
getReport,
|
|
};
|
|
},
|
|
};
|
|
|
|
function getMappedAnnotations(annotation, DisplaySetService) {
|
|
const { metadata, data } = annotation;
|
|
const { cachedStats } = data;
|
|
const { referencedImageId, referencedSeriesInstanceUID } = metadata;
|
|
const targets = Object.keys(cachedStats);
|
|
|
|
if (!targets.length) {
|
|
return;
|
|
}
|
|
|
|
const annotations = [];
|
|
Object.keys(cachedStats).forEach(targetId => {
|
|
const targetStats = cachedStats[targetId];
|
|
|
|
if (!referencedImageId) {
|
|
throw new Error(
|
|
'Non-acquisition plane measurement mapping not supported'
|
|
);
|
|
}
|
|
|
|
const {
|
|
SOPInstanceUID,
|
|
SeriesInstanceUID,
|
|
frameNumber,
|
|
} = getSOPInstanceAttributes(referencedImageId);
|
|
|
|
const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
|
|
SOPInstanceUID,
|
|
SeriesInstanceUID,
|
|
frameNumber
|
|
);
|
|
|
|
const { SeriesNumber } = displaySet;
|
|
const { length, width } = targetStats;
|
|
const unit = 'mm';
|
|
|
|
annotations.push({
|
|
SeriesInstanceUID,
|
|
SOPInstanceUID,
|
|
SeriesNumber,
|
|
frameNumber,
|
|
unit,
|
|
length,
|
|
width,
|
|
});
|
|
});
|
|
|
|
return annotations;
|
|
}
|
|
|
|
/*
|
|
This function is used to convert the measurement data to a format that is
|
|
suitable for the report generation (e.g. for the csv report). The report
|
|
returns a list of columns and corresponding values.
|
|
*/
|
|
function _getReport(mappedAnnotations, points, FrameOfReferenceUID) {
|
|
const columns = [];
|
|
const values = [];
|
|
|
|
// Add Type
|
|
columns.push('AnnotationType');
|
|
values.push('Cornerstone:Bidirectional');
|
|
|
|
mappedAnnotations.forEach(annotation => {
|
|
const { length, width } = annotation;
|
|
columns.push(`Length (mm)`, `Width (mm)`);
|
|
values.push(length, width);
|
|
});
|
|
|
|
if (FrameOfReferenceUID) {
|
|
columns.push('FrameOfReferenceUID');
|
|
values.push(FrameOfReferenceUID);
|
|
}
|
|
|
|
if (points) {
|
|
columns.push('points');
|
|
// points has the form of [[x1, y1, z1], [x2, y2, z2], ...]
|
|
// convert it to string of [[x1 y1 z1];[x2 y2 z2];...]
|
|
// so that it can be used in the csv report
|
|
values.push(points.map(p => p.join(' ')).join(';'));
|
|
}
|
|
|
|
return {
|
|
columns,
|
|
values,
|
|
};
|
|
}
|
|
|
|
function getDisplayText(mappedAnnotations, displaySet) {
|
|
if (!mappedAnnotations || !mappedAnnotations.length) {
|
|
return '';
|
|
}
|
|
|
|
const displayText = [];
|
|
|
|
// Area is the same for all series
|
|
const {
|
|
length,
|
|
width,
|
|
SeriesNumber,
|
|
SOPInstanceUID,
|
|
frameNumber,
|
|
} = mappedAnnotations[0];
|
|
const roundedLength = utils.roundNumber(length, 2);
|
|
const roundedWidth = utils.roundNumber(width, 2);
|
|
|
|
const instance = displaySet.images.find(
|
|
image => image.SOPInstanceUID === SOPInstanceUID
|
|
);
|
|
|
|
let InstanceNumber;
|
|
if (instance) {
|
|
InstanceNumber = instance.InstanceNumber;
|
|
}
|
|
|
|
const instanceText = InstanceNumber ? ` I: ${InstanceNumber}` : '';
|
|
const frameText = displaySet.isMultiFrame ? ` F: ${frameNumber}` : '';
|
|
|
|
displayText.push(
|
|
`L: ${roundedLength} mm (S: ${SeriesNumber}${instanceText}${frameText})`
|
|
);
|
|
displayText.push(`W: ${roundedWidth} mm`);
|
|
|
|
return displayText;
|
|
}
|
|
|
|
export default Bidirectional;
|