* feat: 🎸 DICOM SR STOW on MeasurementAPI Closes: #758 * feat: 🎸 Adding the dataExchance from DICOM SR * feat: 🎸 Fix some issues and get the retrieve measurements working * feat: 🎸 Preventing measurement tool helpers to broke because the data is not Number (it comes as string from dcmjs) * feat: 🎸 Adding a button to start testing SATE functionality * feat: 🎸Small fixes into the code * feat: 🎸 MAke sure we get latest SR in the study, even on lazyLoad mode * Revert "feat: 🎸 Preventing measurement tool helpers to broke because the data is not Number (it comes as string from dcmjs)" This reverts commit 4b3a1efb5810487d2319826fd59c03d779882b5e. * feat: 🎸 Make sure after sync we update the viewports and also that annotation tools are set to passive, so it can be drawn in the viewports * feat: 🎸 Remove console logs and start using OHIF.log * feat: 🎸 Refactor measurement table to use Snackbar service of messages and make sure we only show save button if server type is dicomWeb * feat: 🎸 Refactor to remove mocked wadoRoot and use server * Fix to expose error once we can't save the SR * Update DCMJS into latest dev version * Update dcmjs with latest fixes * Fix PR callouts * Logging error on MeasurementReport creation * Preventing from breaking on non supported tools and also warning that some toolType is not sopported * Small error message update * Expose better the errors and when we have unsopported tools into the measurements * Renaming variable * Expose dcmjs tool support check * Change the way we warn the unsupportedTools * Adding style to the button * Small change on button style * Fix git conflicts * Fix after merge with latest master * Fix after merge with master, btn was not clickable * Fixing callouts * Adding util functions into files and refactor with JSDocs * Refactoring code, adding some basic JSDocs * Bump dcmjs with latest version and fixes * JSDocs and small refactors * yarn lock file after dcmjs update * Remove unused parameters * Registering a plain copy of server into measurementAPI * Small refactor * Start changing from toolType to toolName * Rename a function to get instanceMetadata * Adding error if server is not DICOMWeb on retrieve * Move snackbar outside of UI component and use UINotificationService * Refactor and JSDocs * Small fixes on JSDocs (style) * Remove unused import * Improve JSDocs on MeasurementApi * Remove refactor leftover * Improve JSDocs and propTypes * JSDocs and small refactors
56 lines
1.5 KiB
JavaScript
56 lines
1.5 KiB
JavaScript
import * as dcmjs from 'dcmjs';
|
|
import { log, measurements } from '@ohif/core';
|
|
import cornerstone from 'cornerstone-core';
|
|
import isToolSupported from './utils/isToolSupported';
|
|
|
|
/**
|
|
* Function to parse OHIF viewer measurementData into a dcmjs MeasurementReport
|
|
*
|
|
* @param {Object} measurementsData - OHIF measurementData object
|
|
* @returns {Object} Dataset: measurement report from dcmjs
|
|
*/
|
|
const parseMeasurementsData = measurementsData => {
|
|
const { MeasurementReport } = dcmjs.adapters.Cornerstone;
|
|
const { getImageIdForImagePath } = measurements;
|
|
|
|
const toolState = {};
|
|
const unsupportedTools = [];
|
|
|
|
Object.keys(measurementsData).forEach(measurementType => {
|
|
const annotations = measurementsData[measurementType];
|
|
|
|
annotations.forEach(annotation => {
|
|
const { toolType, imagePath } = annotation;
|
|
|
|
if (isToolSupported(toolType)) {
|
|
const imageId = getImageIdForImagePath(imagePath);
|
|
toolState[imageId] = toolState[imageId] || {};
|
|
toolState[imageId][toolType] = toolState[imageId][toolType] || {
|
|
data: [],
|
|
};
|
|
|
|
toolState[imageId][toolType].data.push(annotation);
|
|
} else {
|
|
unsupportedTools.push(toolType);
|
|
}
|
|
});
|
|
});
|
|
|
|
if (unsupportedTools.length > 0) {
|
|
log.warn(
|
|
`[DICOMSR] Tooltypes not supported: ${unsupportedTools.join(', ')}`
|
|
);
|
|
}
|
|
|
|
const report = MeasurementReport.generateReport(
|
|
toolState,
|
|
cornerstone.metaData
|
|
);
|
|
|
|
return {
|
|
dataset: report.dataset,
|
|
};
|
|
};
|
|
|
|
export default parseMeasurementsData;
|