* feat: add initial sop class handler for SEG * feat: move segmentation service * update segmentation service methods * fix: viewport data structure * feat: Add initial render for the DICOM SEG for each displaySet * fix: various wrong architectural dependencies between services * feat: initial separate SEG display in each viewport * feat: refactore viewport action bar * initial work for SEG hydration * fix: various bugs regarding drag and dropping different viewports * fix: rendering issues for multiple seg displaysets * fix: bugs for thumbnail and hydration * feat: fix the initial segment color * update after rebase * feat: initial design for the segmentation group table * feat: initial new design for the segmentation panel * feat: segmentation panel * feat: make segmentation appear on all related viewports * fix: segmentation load bug based on functional groups * initial work for segmentation crosshairs * fix: various stylings and functionality * fix: various stylings for the seg panel * fix: overflow styles * feat: add more ui components * feat: added segmentation config * feat: add jump to segment * feat: add jump to segment for DICOM SEG viewport * fix: bugs after rebase * feat: jump in segmentation viewport * fix: mpr support for seg * feat: add more icons * feat: new icons * feat: add new side panel * feat: add segmentation config * feat: add loading indicator to ohif * feat: make hanging protocols follow matching rules for viewports * feat: enhance drag and drop to be hanging protocol aware * fix: mpr restore previous layout * fix: crosshairs toggle * fix: add auth headers to the dicom loader via dicomwebclient * fix: bug for crosshairs toggle in mpr * fix: seg viewport reusing old toolGroup * feat: add loading animation with lottie * fix: various bugs for Segmentation hydration in mpr * feat: change outline alpha to outline opacity * feat: loading indicator for seg viewport * fix: various segmentation group styles * fix: local mode for seg * feat: add animation for the highlight * fix: loading indicatro to show segment indices * feat: enhance modality drop down ui * fix: panels * fix: download form * fix: layout shift in loading indicator * fix: loading indicator to have correct values * fix: update software number * fix: image jump between MPR and default * fix: segmentation cleanup and cine service cleanup * fix: segmentation toolgroup clena up * fix: highlight interval should not trigger again * fix: issue with multiframe sorting * rename: change onSeriesChange to onArrowsClick * fix: buttons for tmtv and layout shift * fix: various bugs wrt crosshairs * fix: crosshairs re init on reset camera * fix: middle slice calculation different from cs middle reset camera * fix: reset camera should reset viewport camera * fix: loading segments in MPR mode * fix: tmtv hp back to before * fix: layout shift * feat: orientation markers for volume viewport * fix: capture for volume viewports * fix: memory leak for back to worklist * fix: loading bar bg color * fix: side panel for only one panel * fix: react select style in production * fix: various styling for segmentation groups * fix: various ui styles * feat: add new segmentation config styles * fix: hover state for segmentation item * fix: side panel layout shift * temp add panels * try to fix scrollbar for thimbnail * fix: scroll not appearing for side panels * feat: changed styles for scrollbar * feat: add cpu fallback warning * fix: webworker destroy * fix: select styles * fix: orientation marker color and position * fix: capture screenshot for volume viewports * fix: hide segment visibility on mpr * fix: reloading an already loaded seg displayset * feat: add is equal * fix: mpr jump to measurements * apply review comments * fix: optimization for the segmentation load * fix: remove unnecessary context menu and hp service reset * fix: segmentation service wrt brush settings * feat: initial work for the stack synchronization * fix: add validateDisplaySetSelectorsForNewDisplaySets to make sure drag and drop can follow requirements * fix: various react proptypes * fix: thumbnails for the tmtv and change default props to default params * feat: make showing loading indicator configurable and add docs * bump versions and add more docs * fix demo * update cornerstone versions * apply review comments * feat: add reference lines * fix build * fix unit tests * add reference lines icon * fix: e2e tests * fix static wado config * docs: add segmentation service docs * fix: docker build * fix: keep camera and bump versions * Try re-enabling minification to fix deploy previews Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
140 lines
4.6 KiB
TypeScript
140 lines
4.6 KiB
TypeScript
import { cache, imageLoadPoolManager, Enums } from '@cornerstonejs/core';
|
|
import { compact, flatten, zip } from 'lodash';
|
|
|
|
// Map of volumeId and SeriesInstanceId
|
|
const volumeIdMapsToLoad = new Map<string, string>();
|
|
const viewportIdVolumeInputArrayMap = new Map<string, unknown[]>();
|
|
|
|
/**
|
|
* This function caches the volumeIds until all the volumes inside the
|
|
* hanging protocol are initialized. Then it goes through the imageIds
|
|
* of the volumes, and interleave them, in order for the volumes to be loaded
|
|
* together from middle to the start and the end.
|
|
* @param {Object} {viewportData, displaySetMatchDetails}
|
|
* @returns
|
|
*/
|
|
export default function interleaveTopToBottom({
|
|
data: { viewportId, volumeInputArray },
|
|
displaySetsMatchDetails,
|
|
viewportMatchDetails: matchDetails,
|
|
}) {
|
|
viewportIdVolumeInputArrayMap.set(viewportId, volumeInputArray);
|
|
|
|
// Based on the volumeInputs store the volumeIds and SeriesInstanceIds
|
|
// to keep track of the volumes being loaded
|
|
for (const volumeInput of volumeInputArray) {
|
|
const { volumeId } = volumeInput;
|
|
const volume = cache.getVolume(volumeId);
|
|
|
|
if (!volume) {
|
|
return;
|
|
}
|
|
|
|
// if the volumeUID is not in the volumeUIDs array, add it
|
|
if (!volumeIdMapsToLoad.has(volumeId)) {
|
|
const { metadata } = volume;
|
|
volumeIdMapsToLoad.set(volumeId, metadata.SeriesInstanceUID);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The following is checking if all the viewports that were matched in the HP has been
|
|
* successfully created their cornerstone viewport or not. Todo: This can be
|
|
* improved by not checking it, and as soon as the matched DisplaySets have their
|
|
* volume loaded, we start the loading, but that comes at the cost of viewports
|
|
* not being created yet (e.g., in a 10 viewport ptCT fusion, when one ct viewport and one
|
|
* pt viewport are created we have a guarantee that the volumes are created in the cache
|
|
* but the rest of the viewports (fusion, mip etc.) are not created yet. So
|
|
* we can't initiate setting the volumes for those viewports. One solution can be
|
|
* to add an event when a viewport is created (not enabled element event) and then
|
|
* listen to it and as the other viewports are created we can set the volumes for them
|
|
* since volumes are already started loading.
|
|
*/
|
|
if (matchDetails.size !== viewportIdVolumeInputArrayMap.size) {
|
|
return;
|
|
}
|
|
|
|
// Check if all the matched volumes are loaded
|
|
for (const [_, details] of displaySetsMatchDetails.entries()) {
|
|
const { SeriesInstanceUID } = details;
|
|
|
|
// HangingProtocol has matched, but don't have all the volumes created yet, so return
|
|
if (!Array.from(volumeIdMapsToLoad.values()).includes(SeriesInstanceUID)) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
const volumeIds = Array.from(volumeIdMapsToLoad.keys()).slice();
|
|
// get volumes from cache
|
|
const volumes = volumeIds.map(volumeId => {
|
|
return cache.getVolume(volumeId);
|
|
});
|
|
|
|
// iterate over all volumes, and get their imageIds, and interleave
|
|
// the imageIds and save them in AllRequests for later use
|
|
const AllRequests = [];
|
|
volumes.forEach(volume => {
|
|
const requests = volume.getImageLoadRequests();
|
|
|
|
if (!requests.length || !requests[0] || !requests[0].imageId) {
|
|
return;
|
|
}
|
|
|
|
// reverse the requests
|
|
AllRequests.push(requests.reverse());
|
|
});
|
|
|
|
// flatten the AllRequests array, which will result in a list of all the
|
|
// imageIds for all the volumes but interleaved
|
|
const interleavedRequests = compact(flatten(zip(...AllRequests)));
|
|
|
|
// set the finalRequests to the imageLoadPoolManager
|
|
const finalRequests = [];
|
|
interleavedRequests.forEach(request => {
|
|
const { imageId } = request;
|
|
|
|
AllRequests.forEach(volumeRequests => {
|
|
const volumeImageIdRequest = volumeRequests.find(
|
|
req => req.imageId === imageId
|
|
);
|
|
if (volumeImageIdRequest) {
|
|
finalRequests.push(volumeImageIdRequest);
|
|
}
|
|
});
|
|
});
|
|
|
|
const requestType = Enums.RequestType.Prefetch;
|
|
const priority = 0;
|
|
|
|
finalRequests.forEach(
|
|
({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
|
|
const callLoadImageBound = callLoadImage.bind(
|
|
null,
|
|
imageId,
|
|
imageIdIndex,
|
|
options
|
|
);
|
|
|
|
imageLoadPoolManager.addRequest(
|
|
callLoadImageBound,
|
|
requestType,
|
|
additionalDetails,
|
|
priority
|
|
);
|
|
}
|
|
);
|
|
|
|
// clear the volumeIdMapsToLoad
|
|
volumeIdMapsToLoad.clear();
|
|
|
|
// copy the viewportIdVolumeInputArrayMap
|
|
const viewportIdVolumeInputArrayMapCopy = new Map(
|
|
viewportIdVolumeInputArrayMap
|
|
);
|
|
|
|
// reset the viewportIdVolumeInputArrayMap
|
|
viewportIdVolumeInputArrayMap.clear();
|
|
|
|
return viewportIdVolumeInputArrayMapCopy;
|
|
}
|