* feat: cs3d working stack viewport and tools (#19) * Squashed everything * fix weird react issue * fix eslint / prettier stuff * thumbnails work now with cpu rendering * feat: use new loadImageToCanvas in cs3d * make jump to measurement work * fix active thumbnail * fix measurement delete * fix window level presets * remove segmentation and sync groups for now * fix the dicom pdf and dicom video * fix cornerstone window assignment for cypress * apply review comments Co-authored-by: Erik <erik.sweed@gmail.com> * feat: cs3d tools and toolGroups (#20) * add more tools to work with cs3d mode * fix hotkeys * add stack manager usage for stach viewports * add image scrollbar * wip viewport overlay * fix toAnnotation schema for tools * fix the unnecessary size change that triggered resize * hanging protocol improvement to allow unmatched errors * study description matching for hanging protocol * fix the displaysetOptions to work * fix handle the active tool when a new viewport is added * fix separate toolGroups for mode * apply review comments * apply review comments * yarn lock * feat: overlay component (#21) * fix default displayset options * add viewport overlay * apply review comments * feat: loading and orientation indicators (#22) * add loading indicator * add orientation marker initial work * apply review comments * fix: orientation markers (#23) * finished the orientation markers * fix various broken cypress tests * apply review comments * update yarn lock * feat: re-working measurement tracking mode with cornerstone3d (#2805) * feat: cs3d working stack viewport and tools (#19) * Squashed everything * fix weird react issue * fix eslint / prettier stuff * thumbnails work now with cpu rendering * feat: use new loadImageToCanvas in cs3d * make jump to measurement work * fix active thumbnail * fix measurement delete * fix window level presets * remove segmentation and sync groups for now * fix the dicom pdf and dicom video * fix cornerstone window assignment for cypress * apply review comments Co-authored-by: Erik <erik.sweed@gmail.com> * feat: Add Measurement tracking mode with cs3D (#2789) * feat: first render for cornerstone3d tracked viewport * make tool active work * wip for SR extension * renamed dicom sr to cornerstone dicom sr * remove cornerstone from dicom pdf and video * move dicom sr logic to sr extension * feat: Add hydration for the length tool * fix SR display tool for length using cs3d * fix default config * fix: various bugs with sr viewport and tracking * fix promptying to continue tracking for when SR is created * feat: add keep trackign of unique identifiers * fix hydration for same imageIds * feat: Add SR toolGroup creation on modeEnter * feat: remove the need for separate mapper for SR hydration * add SR display for ellipse * handle hydration of elliptical ROI tool * remove cornerstone extension * add arrow mapping * feat: Add ArrowAnnotate SR display and hydration * apply review comments * apply review comments * move viewport labels to the viewportData * apply review comments * fix: integration cypress tests with cornerstone3D and add CINE tool (#2795) * fix: integration cypress tests with cornerstone3D * revert to addOrUpdate as it makes more sense * fix local drag and drop * fix tests * move dicomLoaderService to cornerstone extension * fix various import bugs * fix bug for local PT series * fix various unit tests * bump cs3d versions * add angle and magnify tool * bump dependencies to avoid broken peerDeps * feat: add initial work for capture using cs3d * feat: show annotations on the image capture * feat: add svg layer export * feat: Add CINE Tool * feat: remove unnecessary viewport rendering for cine state changes Co-authored-by: Erik Ziegler <erik.sweed@gmail.com> * docs: modify and improve documentation (#2800) * cleanup docs versionings * feat: Add all version explanations * version docs for 3.0 * wip for changing docs * wip for updated docs * add utility module documentation * fix demo with nohoisting of history * add slides and video to resources * apply review comments * fix: drag and drop SR into SR viewport (#2803) * update yarn lock Co-authored-by: Erik <erik.sweed@gmail.com> * update pathnames to match v3-stable * update the e2e pathname * fix: various bugs with regard to tracking workflow (#2811) * fix: various issues with measurement panel * fix: update default tool style for annotations * fix: annotatoin label getting removed * feat: Add backward compatibility for SR hydration with legacy cornerstone * fix: cursors and ellipse ROI max style * fix: ArrowAnnotate SRDisplay * apply review comments * bump package versions * fix: bugin rehydration of SR * fix: e2e tests * fix active viewport thickness and arrowTool ui * add readme for measurement tracking * use uploaded image for readme * add back images * try to fix e2e test * fix: window level presets hotkeys * Update README.md * update yarn lock * feat: volume api and TMTV mode (#2817) * feat: volumeAPI and TMTV mode * feat: use cs3d cache service to obtain viewportData * wip for volume api * wip: fusion viewport * feat: add blend mode option * wip for image scrollbar * fix drag and drop thumbnail * wip for image scrollbar for voluems * fix: element mismatch bug for scroll * feat: Add image scrollbar to volumes * feat: add syncGroups to volume api * feat: add tmtv mode initial setup * feat: add initial image options for the stack viewports * feat: Add custom load strategy for volume viewports via HP * apply review comments fix: Jump presets cs3d (#2812) * feat: Add JumpPreset to OHIF for Cornerstone3D * fix: accessing viewport service from servicesManager feat: volume API and TMTV mode (#2814) * fix: do not display overlays on mip viewports * feat: add optional disableCommands for toggle buttons * fix: toggleCrossharis * feat: config the crosshairs * feat: add PetSUV Panel for changing metadata * feat: initial work for the rectangleROIThreshold panel * wip: measurement service * roi threshold working * feat: Add displayText to segmentations * feat: add remove segmentation * feat: add csv export * feat: add RT export for annotations in tmtv mode * fix: fusion to use pt in tmtv mode and measuremet mappings * fix: various bugs * apply review comments * apply review comments * feat: add fusion color maps * add readme to tmtv mode * Update README.md * fix: try to fix build * fix unit tests * Update README.md * feat: add about to the panel * fix: changing strategy in roi panel * apply review comments * update package versions * wip for stackPrefetch * fix: cornerstone3d hydration and renaming (#2818) * update readme * renamed cornerstone extension * wip for renaming cornerstone3D variables * wip for renaming cornerstone3D variables * wip for fixing bugs for SR viewport * fix: jumpToMeasurement and initial label after hydration * fix: fileName capitalization * feat: use the new prefetch stack in the cs3d (#2820) * feat: use the new prefetch stack in the cs3d * use viewport scroll api for stack viewport * fix cine stop when scrollbar changes * feat: use new prefetch events * fix loading state to not show repeatedly * fix: various bugs for tmtv mode thresholding and new icons (#2823) * feat: make tmtv mode available in worklist * feat: add new icons for tmtv mode * feat: add fusion color icon * fix: parallel scale calculation * fix: bump Cornerstone to get large image support working * fix: Fix issues with CPU viewport flipping, including config files * fix: bump cornerstone to fix magnify tool * fix: Bump Cornerstone version to fix resetCamera issue in StackViewport * ci: Add _headers file to enable CORS headers for Netlify Drag/Drop deploys * fix: WADO-URI was not working. PET Metadata was coming from the wrong place. Fixed some minor React errors * feat(OHIF):Allow modes and extensions to be added after commpile time. (#2838) Also works with the compile time add that the existing cli uses, so that both build types work. Eric and I agreed this doesn't change existing functionality, but is almost entirely build issues/fixes. * bump: dependency versions to fix hydration bugs (#2848) * bump: dcmjs version to fix hydration bugs * try to fix tests * bump dependency versions Co-authored-by: Alireza <ar.sedghi@gmail.com> Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
144 lines
3.9 KiB
JavaScript
144 lines
3.9 KiB
JavaScript
import { metaData, utilities } from '@cornerstonejs/core';
|
|
|
|
import OHIF from '@ohif/core';
|
|
import dcmjs from 'dcmjs';
|
|
|
|
import getFilteredCornerstoneToolState from './utils/getFilteredCornerstoneToolState';
|
|
|
|
const { MeasurementReport } = dcmjs.adapters.Cornerstone3D;
|
|
const { log } = OHIF;
|
|
|
|
/**
|
|
*
|
|
* @param measurementData An array of measurements from the measurements service
|
|
* that you wish to serialize.
|
|
* @param additionalFindingTypes toolTypes that should be stored with labels as Findings
|
|
* @param options Naturalized DICOM JSON headers to merge into the displaySet.
|
|
*
|
|
*/
|
|
const _generateReport = (
|
|
measurementData,
|
|
additionalFindingTypes,
|
|
options = {}
|
|
) => {
|
|
const filteredToolState = getFilteredCornerstoneToolState(
|
|
measurementData,
|
|
additionalFindingTypes
|
|
);
|
|
|
|
const report = MeasurementReport.generateReport(
|
|
filteredToolState,
|
|
metaData,
|
|
utilities.worldToImageCoords
|
|
);
|
|
|
|
const { dataset } = report;
|
|
|
|
// Add in top level series options
|
|
Object.assign(dataset, options);
|
|
|
|
return dataset;
|
|
};
|
|
|
|
const commandsModule = ({}) => {
|
|
const actions = {
|
|
/**
|
|
*
|
|
* @param measurementData An array of measurements from the measurements service
|
|
* @param additionalFindingTypes toolTypes that should be stored with labels as Findings
|
|
* @param options Naturalized DICOM JSON headers to merge into the displaySet.
|
|
* as opposed to Finding Sites.
|
|
* that you wish to serialize.
|
|
*/
|
|
downloadReport: ({
|
|
measurementData,
|
|
additionalFindingTypes,
|
|
options = {},
|
|
}) => {
|
|
const srDataset = actions.generateReport(
|
|
measurementData,
|
|
additionalFindingTypes,
|
|
options
|
|
);
|
|
const reportBlob = dcmjs.data.datasetToBlob(srDataset);
|
|
|
|
//Create a URL for the binary.
|
|
var objectUrl = URL.createObjectURL(reportBlob);
|
|
window.location.assign(objectUrl);
|
|
},
|
|
|
|
/**
|
|
*
|
|
* @param measurementData An array of measurements from the measurements service
|
|
* that you wish to serialize.
|
|
* @param dataSource The dataSource that you wish to use to persist the data.
|
|
* @param additionalFindingTypes toolTypes that should be stored with labels as Findings
|
|
* @param options Naturalized DICOM JSON headers to merge into the displaySet.
|
|
* @return The naturalized report
|
|
*/
|
|
storeMeasurements: async ({
|
|
measurementData,
|
|
dataSource,
|
|
additionalFindingTypes,
|
|
options = {},
|
|
}) => {
|
|
// TODO -> Eventually use the measurements directly and not the dcmjs adapter,
|
|
// But it is good enough for now whilst we only have cornerstone as a datasource.
|
|
log.info('[DICOMSR] storeMeasurements');
|
|
|
|
if (!dataSource || !dataSource.store || !dataSource.store.dicom) {
|
|
log.error(
|
|
'[DICOMSR] datasource has no dataSource.store.dicom endpoint!'
|
|
);
|
|
return Promise.reject({});
|
|
}
|
|
|
|
try {
|
|
const naturalizedReport = _generateReport(
|
|
measurementData,
|
|
additionalFindingTypes,
|
|
options
|
|
);
|
|
const { StudyInstanceUID } = naturalizedReport;
|
|
|
|
await dataSource.store.dicom(naturalizedReport);
|
|
|
|
if (StudyInstanceUID) {
|
|
dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
|
|
}
|
|
|
|
return naturalizedReport;
|
|
} catch (error) {
|
|
console.warn(error);
|
|
log.error(
|
|
`[DICOMSR] Error while saving the measurements: ${error.message}`
|
|
);
|
|
throw new Error(
|
|
error.message || 'Error while saving the measurements.'
|
|
);
|
|
}
|
|
},
|
|
};
|
|
|
|
const definitions = {
|
|
downloadReport: {
|
|
commandFn: actions.downloadReport,
|
|
storeContexts: [],
|
|
options: {},
|
|
},
|
|
storeMeasurements: {
|
|
commandFn: actions.storeMeasurements,
|
|
storeContexts: [],
|
|
options: {},
|
|
},
|
|
};
|
|
|
|
return {
|
|
actions,
|
|
definitions,
|
|
defaultContext: 'CORNERSTONE_STRUCTURED_REPORT',
|
|
};
|
|
};
|
|
|
|
export default commandsModule;
|